Skip to content

Commit 903f521

Browse files
EricBerendsenEricBerendsen
committed
remove DefaultMutableTreeNode
1 parent df5540e commit 903f521

File tree

19 files changed

+344
-294
lines changed

19 files changed

+344
-294
lines changed

‎src/main/java/nl/digitalekabeltelevisie/data/mpeg/descriptors/Descriptor.java‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,19 @@
3030
import static java.lang.Byte.toUnsignedInt;
3131
import static nl.digitalekabeltelevisie.util.Utils.stripLeadingZeros;
3232

33-
import java.util.*;
33+
import java.util.ArrayList;
34+
import java.util.Arrays;
35+
import java.util.List;
3436
import java.util.function.Function;
3537

36-
import javax.swing.tree.DefaultMutableTreeNode;
37-
38-
import nl.digitalekabeltelevisie.controller.*;
39-
import nl.digitalekabeltelevisie.data.mpeg.*;
38+
import nl.digitalekabeltelevisie.controller.KVP;
39+
import nl.digitalekabeltelevisie.controller.TreeNode;
40+
import nl.digitalekabeltelevisie.data.mpeg.PID;
41+
import nl.digitalekabeltelevisie.data.mpeg.PSI;
42+
import nl.digitalekabeltelevisie.data.mpeg.TransportStream;
4043
import nl.digitalekabeltelevisie.data.mpeg.psi.TableSection;
41-
import nl.digitalekabeltelevisie.util.*;
44+
import nl.digitalekabeltelevisie.util.LookUpList;
45+
import nl.digitalekabeltelevisie.util.Utils;
4246

4347
/**
4448
* @author Eric Berendsen
@@ -363,7 +367,7 @@ public KVP getJTreeNode(int modus) {
363367
* @param modus
364368
* @param t
365369
*/
366-
protected void addGeneralDescriptorInfo(int modus, DefaultMutableTreeNode t) {
370+
protected void addGeneralDescriptorInfo(int modus, KVP t) {
367371
if (!Utils.simpleModus(modus)) { // not simple layout, so show
368372
// details
369373
t.add(new KVP("descriptor_tag", descriptorTag, getDescriptorname()));

‎src/main/java/nl/digitalekabeltelevisie/data/mpeg/descriptors/ExtensionDescriptor.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@ public ExtensionDescriptor(byte[] b, TableSection parent) {
4545
selector_byte=getBytes(b, PRIVATE_DATA_OFFSET + 1, descriptorLength-1);
4646
}
4747

48-
/**
49-
* This will always return a KVP, but to not break interface it still is declared as DefaultMutableTreeNode
50-
*/
5148
@Override
5249
public KVP getJTreeNode(int modus){
5350

‎src/main/java/nl/digitalekabeltelevisie/data/mpeg/descriptors/aitable/SimpleApplicationLocationDescriptor.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@
2929

3030
import static java.util.Arrays.copyOfRange;
3131

32-
import javax.swing.tree.DefaultMutableTreeNode;
33-
3432
import nl.digitalekabeltelevisie.controller.KVP;
3533
import nl.digitalekabeltelevisie.data.mpeg.psi.TableSection;
3634

@@ -58,7 +56,7 @@ public SimpleApplicationLocationDescriptor(byte[] b, TableSection parent) {
5856
@Override
5957
public KVP getJTreeNode(int modus) {
6058
KVP t = super.getJTreeNode(modus);
61-
t.add(new DefaultMutableTreeNode(new KVP("initial_path_bytes", initial_path_bytes, null)));
59+
t.add(new KVP("initial_path_bytes", initial_path_bytes));
6260
return t;
6361
}
6462
}

‎src/main/java/nl/digitalekabeltelevisie/data/mpeg/descriptors/extension/mpeg/JpegXsVideoDescriptor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
/**
3535
* Class responsible for decoding a JPEG-XS video descriptor from a byte array
36-
* into a {@link DefaultMutableTreeNode}.
36+
* into a {@link KVP}.
3737
*
3838
* @author Simon Provost
3939
*/

‎src/main/java/nl/digitalekabeltelevisie/data/mpeg/dsmcc/ServiceDSMCC.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
import java.util.zip.Inflater;
4343

4444
import javax.swing.JMenuItem;
45-
import javax.swing.tree.DefaultMutableTreeNode;
4645

4746
import nl.digitalekabeltelevisie.controller.KVP;
4847
import nl.digitalekabeltelevisie.controller.TreeNode;
@@ -175,7 +174,7 @@ public ObjectCarousel(int associationTag, int dataBroadCastId) {
175174
private CarouselIdentifierDescriptor carouselIdentifierDesc;
176175

177176
// recursive find all biopMessagases, and add as flat list
178-
private void addToTree(BIOPMessage biopMessage, String label, DefaultMutableTreeNode s, int modus){
177+
private void addToTree(BIOPMessage biopMessage, String label, KVP s, int modus){
179178
if(biopMessage!=null){
180179
if(biopMessage instanceof BIOPDirectoryMessage dir){
181180
s.add(dir.getJTreeNode(modus,label));

‎src/main/java/nl/digitalekabeltelevisie/data/mpeg/pes/audio/ac4/EmdfInfo.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727

2828
package nl.digitalekabeltelevisie.data.mpeg.pes.audio.ac4;
2929

30-
import javax.swing.tree.DefaultMutableTreeNode;
31-
3230
import nl.digitalekabeltelevisie.controller.KVP;
3331
import nl.digitalekabeltelevisie.controller.TreeNode;
3432
import nl.digitalekabeltelevisie.util.BitSource;
@@ -121,7 +119,7 @@ public KVP getJTreeNode(int modus) {
121119
emdf_info_node.add(new KVP("substream_index", substream_index));
122120
}
123121

124-
DefaultMutableTreeNode emdf_protection_node = new KVP("emdf_protection");
122+
KVP emdf_protection_node = new KVP("emdf_protection");
125123
emdf_protection_node.add(new KVP("protection_length_primary", protection_length_primary, protection_length_list.get(protection_length_primary)));
126124
emdf_protection_node.add(new KVP("protection_length_secondary", protection_length_secondary, protection_length_list.get(protection_length_secondary)));
127125

‎src/main/java/nl/digitalekabeltelevisie/data/mpeg/pes/video264/Mvc_vui_parameters_extension.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package nl.digitalekabeltelevisie.data.mpeg.pes.video264;
22

33
import static nl.digitalekabeltelevisie.data.mpeg.pes.video.common.VideoHandler.getClockTickString;
4-
import javax.swing.tree.DefaultMutableTreeNode;
54

65
import nl.digitalekabeltelevisie.controller.KVP;
6+
import nl.digitalekabeltelevisie.controller.TreeNode;
77
import nl.digitalekabeltelevisie.util.BitSource;
88

9-
public class Mvc_vui_parameters_extension {
9+
public class Mvc_vui_parameters_extension implements TreeNode{
1010

1111
private int vui_mvc_num_ops_minus1;
1212
private int[] vui_mvc_temporal_id;
@@ -75,42 +75,42 @@ public Mvc_vui_parameters_extension(BitSource bitSource) {
7575
}
7676
}
7777

78-
public DefaultMutableTreeNode getJTreeNode(int modus){
79-
final DefaultMutableTreeNode t = new DefaultMutableTreeNode(new KVP("mvc_vui_parameters_extension"));
80-
DefaultMutableTreeNode vui_mvc_num_ops_minus1Node = new DefaultMutableTreeNode(new KVP("vui_mvc_num_ops_minus1",vui_mvc_num_ops_minus1,null));
78+
public KVP getJTreeNode(int modus){
79+
KVP t = new KVP("mvc_vui_parameters_extension");
80+
KVP vui_mvc_num_ops_minus1Node = new KVP("vui_mvc_num_ops_minus1",vui_mvc_num_ops_minus1);
8181
t.add(vui_mvc_num_ops_minus1Node);
8282

8383
for (int i = 0; i <= vui_mvc_num_ops_minus1; i++) {
84-
vui_mvc_num_ops_minus1Node.add(new DefaultMutableTreeNode(new KVP("vui_mvc_temporal_id["+i+"]",vui_mvc_temporal_id[ i ],null)));
85-
DefaultMutableTreeNode vui_mvc_num_target_output_views_minus1Node = new DefaultMutableTreeNode(new KVP("vui_mvc_num_target_output_views_minus1["+i+"]",vui_mvc_num_target_output_views_minus1[ i ],null));
84+
vui_mvc_num_ops_minus1Node.add(new KVP("vui_mvc_temporal_id["+i+"]",vui_mvc_temporal_id[ i ]));
85+
KVP vui_mvc_num_target_output_views_minus1Node = new KVP("vui_mvc_num_target_output_views_minus1["+i+"]",vui_mvc_num_target_output_views_minus1[ i ]);
8686
vui_mvc_num_ops_minus1Node.add(vui_mvc_num_target_output_views_minus1Node);
8787

8888
for (int j = 0; j <= vui_mvc_num_target_output_views_minus1[i]; j++) {
89-
vui_mvc_num_target_output_views_minus1Node.add(new DefaultMutableTreeNode(new KVP("vui_mvc_view_id["+i+","+j+"]",vui_mvc_view_id[i][j],null)));
89+
vui_mvc_num_target_output_views_minus1Node.add(new KVP("vui_mvc_view_id["+i+","+j+"]",vui_mvc_view_id[i][j]));
9090
}
91-
DefaultMutableTreeNode vui_mvc_timing_info_present_flagNode = new DefaultMutableTreeNode(new KVP("vui_mvc_timing_info_present_flag["+i+"]",vui_mvc_timing_info_present_flag[ i ],null));
91+
KVP vui_mvc_timing_info_present_flagNode = new KVP("vui_mvc_timing_info_present_flag["+i+"]",vui_mvc_timing_info_present_flag[ i ]);
9292
vui_mvc_num_ops_minus1Node.add(vui_mvc_timing_info_present_flagNode);
9393
if(vui_mvc_timing_info_present_flag[i]==1){
94-
vui_mvc_timing_info_present_flagNode.add(new DefaultMutableTreeNode(new KVP("vui_mvc_num_units_in_tick["+i+"]",vui_mvc_num_units_in_tick[i],null)));
95-
vui_mvc_timing_info_present_flagNode.add(new DefaultMutableTreeNode(new KVP("vui_mvc_time_scale["+i+"]",vui_mvc_time_scale[i],getClockTickString(vui_mvc_num_units_in_tick[i], vui_mvc_time_scale[i]))));
96-
vui_mvc_timing_info_present_flagNode.add(new DefaultMutableTreeNode(new KVP("vui_mvc_fixed_frame_rate_flag["+i+"]",vui_mvc_fixed_frame_rate_flag[i],null)));
94+
vui_mvc_timing_info_present_flagNode.add(new KVP("vui_mvc_num_units_in_tick["+i+"]",vui_mvc_num_units_in_tick[i]));
95+
vui_mvc_timing_info_present_flagNode.add(new KVP("vui_mvc_time_scale["+i+"]",vui_mvc_time_scale[i],getClockTickString(vui_mvc_num_units_in_tick[i], vui_mvc_time_scale[i])));
96+
vui_mvc_timing_info_present_flagNode.add(new KVP("vui_mvc_fixed_frame_rate_flag["+i+"]",vui_mvc_fixed_frame_rate_flag[i]));
9797
}
98-
DefaultMutableTreeNode vui_mvc_nal_hrd_parameters_present_flagNode = new DefaultMutableTreeNode(new KVP("vui_mvc_nal_hrd_parameters_present_flag["+i+"]",vui_mvc_nal_hrd_parameters_present_flag[ i ],null));
98+
KVP vui_mvc_nal_hrd_parameters_present_flagNode = new KVP("vui_mvc_nal_hrd_parameters_present_flag["+i+"]",vui_mvc_nal_hrd_parameters_present_flag[ i ]);
9999
vui_mvc_num_ops_minus1Node.add(vui_mvc_nal_hrd_parameters_present_flagNode);
100100
if(vui_mvc_nal_hrd_parameters_present_flag[ i ]==1){
101101
vui_mvc_nal_hrd_parameters_present_flagNode.add(mvc_nal_hrd_parameters[i].getJTreeNode(modus));
102102
}
103-
DefaultMutableTreeNode vui_mvc_vcl_hrd_parameters_present_flagNode = new DefaultMutableTreeNode(new KVP("vui_mvc_vcl_hrd_parameters_present_flag["+i+"]",vui_mvc_vcl_hrd_parameters_present_flag[ i ],null));
103+
KVP vui_mvc_vcl_hrd_parameters_present_flagNode = new KVP("vui_mvc_vcl_hrd_parameters_present_flag["+i+"]",vui_mvc_vcl_hrd_parameters_present_flag[ i ]);
104104
vui_mvc_num_ops_minus1Node.add(vui_mvc_vcl_hrd_parameters_present_flagNode);
105105
if(vui_mvc_vcl_hrd_parameters_present_flag[ i ]==1){
106106
vui_mvc_vcl_hrd_parameters_present_flagNode.add(mvc_vcl_hrd_parameters[i].getJTreeNode(modus));
107107
}
108108

109109
if ((vui_mvc_nal_hrd_parameters_present_flag[i] == 1)
110110
|| (vui_mvc_vcl_hrd_parameters_present_flag[i] == 1)) {
111-
vui_mvc_num_ops_minus1Node.add(new DefaultMutableTreeNode(new KVP("vui_mvc_low_delay_hrd_flag["+i+"]",vui_mvc_low_delay_hrd_flag[i],null)));
111+
vui_mvc_num_ops_minus1Node.add(new KVP("vui_mvc_low_delay_hrd_flag["+i+"]",vui_mvc_low_delay_hrd_flag[i]));
112112
}
113-
vui_mvc_num_ops_minus1Node.add(new DefaultMutableTreeNode(new KVP("vui_mvc_pic_struct_present_flag["+i+"]",vui_mvc_pic_struct_present_flag[i],null)));
113+
vui_mvc_num_ops_minus1Node.add(new KVP("vui_mvc_pic_struct_present_flag["+i+"]",vui_mvc_pic_struct_present_flag[i]));
114114
}
115115

116116
return t;

‎src/main/java/nl/digitalekabeltelevisie/data/mpeg/pes/video264/Seq_parameter_set_data.java‎

Lines changed: 35 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@
2929

3030
import java.util.logging.Logger;
3131

32-
import javax.swing.tree.DefaultMutableTreeNode;
33-
3432
import nl.digitalekabeltelevisie.controller.KVP;
3533
import nl.digitalekabeltelevisie.data.mpeg.pes.video26x.RBSP;
3634
import nl.digitalekabeltelevisie.gui.utils.GuiUtils;
@@ -156,33 +154,33 @@ public Seq_parameter_set_data(BitSource bitSource) {
156154
}
157155
}
158156

159-
public void addToJTree(DefaultMutableTreeNode t, int modus) {
160-
t.add(new DefaultMutableTreeNode(new KVP("profile_idc",profile_idc,getProfileIdcString(profile_idc))));
161-
t.add(new DefaultMutableTreeNode(new KVP("constraint_set0_flag",constraint_set0_flag,null)));
162-
t.add(new DefaultMutableTreeNode(new KVP("constraint_set1_flag",constraint_set1_flag,null)));
163-
t.add(new DefaultMutableTreeNode(new KVP("constraint_set2_flag",constraint_set2_flag,null)));
164-
t.add(new DefaultMutableTreeNode(new KVP("constraint_set3_flag",constraint_set3_flag,null)));
165-
t.add(new DefaultMutableTreeNode(new KVP("constraint_set4_flag",constraint_set4_flag,null)));
166-
t.add(new DefaultMutableTreeNode(new KVP("constraint_set5_flag",constraint_set5_flag,null)));
167-
t.add(new DefaultMutableTreeNode(new KVP("reserved_zero_2bits",reserved_zero_2bits,null)));
168-
t.add(new DefaultMutableTreeNode(new KVP("level_idc",level_idc,null)));
169-
t.add(new DefaultMutableTreeNode(new KVP("seq_parameter_set_id",seq_parameter_set_id,null)));
157+
public void addToJTree(KVP t, int modus) {
158+
t.add(new KVP("profile_idc",profile_idc,getProfileIdcString(profile_idc)));
159+
t.add(new KVP("constraint_set0_flag",constraint_set0_flag));
160+
t.add(new KVP("constraint_set1_flag",constraint_set1_flag));
161+
t.add(new KVP("constraint_set2_flag",constraint_set2_flag));
162+
t.add(new KVP("constraint_set3_flag",constraint_set3_flag));
163+
t.add(new KVP("constraint_set4_flag",constraint_set4_flag));
164+
t.add(new KVP("constraint_set5_flag",constraint_set5_flag));
165+
t.add(new KVP("reserved_zero_2bits",reserved_zero_2bits));
166+
t.add(new KVP("level_idc",level_idc));
167+
t.add(new KVP("seq_parameter_set_id",seq_parameter_set_id));
170168
if( (profile_idc == 100) || (profile_idc == 110) ||
171169
(profile_idc == 122) || (profile_idc == 244) || (profile_idc == 44) ||
172170
(profile_idc == 83) || (profile_idc == 86) || (profile_idc == 118) ||
173171
(profile_idc == 128) ) {
174-
t.add(new DefaultMutableTreeNode(new KVP("chroma_format_idc",chroma_format_idc,RBSP.getChroma_format_idcString(chroma_format_idc))));
172+
t.add(new KVP("chroma_format_idc",chroma_format_idc,RBSP.getChroma_format_idcString(chroma_format_idc)));
175173
if( chroma_format_idc == 3 ){
176-
t.add(new DefaultMutableTreeNode(new KVP("separate_colour_plane_flag",separate_colour_plane_flag,null)));
174+
t.add(new KVP("separate_colour_plane_flag",separate_colour_plane_flag));
177175
}
178-
t.add(new DefaultMutableTreeNode(new KVP("bit_depth_luma_minus8",bit_depth_luma_minus8,null)));
179-
t.add(new DefaultMutableTreeNode(new KVP("bit_depth_chroma_minus8",bit_depth_chroma_minus8,null)));
180-
t.add(new DefaultMutableTreeNode(new KVP("qpprime_y_zero_transform_bypass_flag",qpprime_y_zero_transform_bypass_flag,null)));
181-
t.add(new DefaultMutableTreeNode(new KVP("seq_scaling_matrix_present_flag",seq_scaling_matrix_present_flag,null)));
176+
t.add(new KVP("bit_depth_luma_minus8",bit_depth_luma_minus8));
177+
t.add(new KVP("bit_depth_chroma_minus8",bit_depth_chroma_minus8));
178+
t.add(new KVP("qpprime_y_zero_transform_bypass_flag",qpprime_y_zero_transform_bypass_flag));
179+
t.add(new KVP("seq_scaling_matrix_present_flag",seq_scaling_matrix_present_flag));
182180

183181
if( seq_scaling_matrix_present_flag==1 ){
184182
for( int i = 0; i < ( ( chroma_format_idc != 3 ) ? 8 : 12 ); i++ ) { // Rec. ITU-T H.264 (03/2010) 7.3.2.1.1 Sequence parameter set data syntax
185-
t.add(new DefaultMutableTreeNode(new KVP("seq_scaling_list_present_flag["+i+"]",seq_scaling_list_present_flag[ i ],null)));
183+
t.add(new KVP("seq_scaling_list_present_flag["+i+"]",seq_scaling_list_present_flag[ i ]));
186184
if( seq_scaling_list_present_flag[ i ]!=0 ){
187185
if( i < 6 ){
188186
t.add(RBSP.getScalingListJTree( delta_scale[i], i, 16,deltas_read[i]));
@@ -193,35 +191,35 @@ public void addToJTree(DefaultMutableTreeNode t, int modus) {
193191
}
194192
}
195193
}
196-
t.add(new DefaultMutableTreeNode(new KVP("log2_max_frame_num_minus4",log2_max_frame_num_minus4,"MaxFrameNum="+BitSource.powerOf2[log2_max_frame_num_minus4+4])));
197-
t.add(new DefaultMutableTreeNode(new KVP("pic_order_cnt_type",pic_order_cnt_type,null)));
194+
t.add(new KVP("log2_max_frame_num_minus4",log2_max_frame_num_minus4,"MaxFrameNum="+BitSource.powerOf2[log2_max_frame_num_minus4+4]));
195+
t.add(new KVP("pic_order_cnt_type",pic_order_cnt_type));
198196

199197
if(pic_order_cnt_type == 0){
200-
t.add(new DefaultMutableTreeNode(new KVP("log2_max_pic_order_cnt_lsb_minus4",log2_max_pic_order_cnt_lsb_minus4,null)));
198+
t.add(new KVP("log2_max_pic_order_cnt_lsb_minus4",log2_max_pic_order_cnt_lsb_minus4));
201199
}else if( pic_order_cnt_type == 1 ) {
202-
t.add(new DefaultMutableTreeNode(GuiUtils.getNotImplementedKVP("pic_order_cnt_type == 1")));
200+
t.add(GuiUtils.getNotImplementedKVP("pic_order_cnt_type == 1"));
203201

204202
}
205203

206-
t.add(new DefaultMutableTreeNode(new KVP("max_num_ref_frames",max_num_ref_frames,null)));
207-
t.add(new DefaultMutableTreeNode(new KVP("gaps_in_frame_num_value_allowed_flag",gaps_in_frame_num_value_allowed_flag,null)));
208-
t.add(new DefaultMutableTreeNode(new KVP("pic_width_in_mbs_minus1",pic_width_in_mbs_minus1,"PicWidthInSamples="+(16*(pic_width_in_mbs_minus1+1)))));
209-
t.add(new DefaultMutableTreeNode(new KVP("pic_height_in_map_units_minus1",pic_height_in_map_units_minus1,"PicHeightInSamples="+(( 2-frame_mbs_only_flag ) * (pic_height_in_map_units_minus1 + 1)*16))));
210-
t.add(new DefaultMutableTreeNode(new KVP("frame_mbs_only_flag",frame_mbs_only_flag,frame_mbs_only_flag==0?"coded pictures of the coded video sequence may either be coded fields or coded frames":"every coded picture of the coded video sequence is a coded frame containing only frame macroblocks")));
204+
t.add(new KVP("max_num_ref_frames",max_num_ref_frames));
205+
t.add(new KVP("gaps_in_frame_num_value_allowed_flag",gaps_in_frame_num_value_allowed_flag));
206+
t.add(new KVP("pic_width_in_mbs_minus1",pic_width_in_mbs_minus1,"PicWidthInSamples="+(16*(pic_width_in_mbs_minus1+1))));
207+
t.add(new KVP("pic_height_in_map_units_minus1",pic_height_in_map_units_minus1,"PicHeightInSamples="+(( 2-frame_mbs_only_flag ) * (pic_height_in_map_units_minus1 + 1)*16)));
208+
t.add(new KVP("frame_mbs_only_flag",frame_mbs_only_flag,frame_mbs_only_flag==0?"coded pictures of the coded video sequence may either be coded fields or coded frames":"every coded picture of the coded video sequence is a coded frame containing only frame macroblocks"));
211209
if(frame_mbs_only_flag==0 ){
212-
t.add(new DefaultMutableTreeNode(new KVP("mb_adaptive_frame_field_flag",mb_adaptive_frame_field_flag,mb_adaptive_frame_field_flag==0?"no switching between frame and field macroblocks within a picture":"possible use of switching between frame and field macroblocks within frames" )));
210+
t.add(new KVP("mb_adaptive_frame_field_flag",mb_adaptive_frame_field_flag,mb_adaptive_frame_field_flag==0?"no switching between frame and field macroblocks within a picture":"possible use of switching between frame and field macroblocks within frames" ));
213211
}
214212

215-
t.add(new DefaultMutableTreeNode(new KVP("direct_8x8_inference_flag",direct_8x8_inference_flag,null)));
216-
t.add(new DefaultMutableTreeNode(new KVP("frame_cropping_flag",frame_cropping_flag,null)));
213+
t.add(new KVP("direct_8x8_inference_flag",direct_8x8_inference_flag));
214+
t.add(new KVP("frame_cropping_flag",frame_cropping_flag));
217215

218216
if( frame_cropping_flag!=0 ) {
219-
t.add(new DefaultMutableTreeNode(new KVP("frame_crop_left_offset",frame_crop_left_offset,null)));
220-
t.add(new DefaultMutableTreeNode(new KVP("frame_crop_right_offset",frame_crop_right_offset,null)));
221-
t.add(new DefaultMutableTreeNode(new KVP("frame_crop_top_offset",frame_crop_top_offset,null)));
222-
t.add(new DefaultMutableTreeNode(new KVP("frame_crop_bottom_offset",frame_crop_bottom_offset,null)));
217+
t.add(new KVP("frame_crop_left_offset",frame_crop_left_offset));
218+
t.add(new KVP("frame_crop_right_offset",frame_crop_right_offset));
219+
t.add(new KVP("frame_crop_top_offset",frame_crop_top_offset));
220+
t.add(new KVP("frame_crop_bottom_offset",frame_crop_bottom_offset));
223221
}
224-
t.add(new DefaultMutableTreeNode(new KVP("vui_parameters_present_flag",vui_parameters_present_flag,null)));
222+
t.add(new KVP("vui_parameters_present_flag",vui_parameters_present_flag));
225223
if(vui_parameters_present_flag!=0){
226224
t.add(vui_parameters.getJTreeNode(modus));
227225
}

0 commit comments

Comments
 (0)