Skip to content

Commit 5323c98

Browse files
EricBerendsenEricBerendsen
committed
refactoring & cleanup, use KVP
1 parent dc24293 commit 5323c98

File tree

5 files changed

+58
-74
lines changed

5 files changed

+58
-74
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -682,13 +682,13 @@ private static Descriptor getSCTE35Descriptor(final byte[] data, final TableSect
682682

683683
switch (toUnsignedInt(data[0])) {
684684
case 0x00:
685-
return new AvailDescriptor(data, 0, tableSection);
685+
return new AvailDescriptor(data, tableSection);
686686
case 0x02:
687-
return new SegmentationDescriptor(data, 0, tableSection);
687+
return new SegmentationDescriptor(data, tableSection);
688688
case 0x03:
689-
return new TimeDescriptor(data, 0, tableSection);
689+
return new TimeDescriptor(data, tableSection);
690690
default:
691-
Descriptor d = new SCTE35Descriptor(data, 0, tableSection);
691+
Descriptor d = new SCTE35Descriptor(data, tableSection);
692692
logger.info("Not implemented SCTE35Descriptor:" + toUnsignedInt(data[0]) + " ("
693693
+ SCTE35Descriptor.getDescriptorname(toUnsignedInt(data[0]), tableSection)
694694
+ ")in section " + TableSection.getTableType(tableSection.getTableId()) + " (" + tableSection

‎src/main/java/nl/digitalekabeltelevisie/data/mpeg/descriptors/scte35/AvailDescriptor.java‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,22 @@
22

33
import static nl.digitalekabeltelevisie.util.Utils.getBytes;
44

5-
import javax.swing.tree.DefaultMutableTreeNode;
6-
75
import nl.digitalekabeltelevisie.controller.KVP;
86
import nl.digitalekabeltelevisie.data.mpeg.psi.TableSection;
97

108
public class AvailDescriptor extends SCTE35Descriptor {
119

1210
private byte[] provider_avail_id;
1311

14-
15-
public AvailDescriptor(byte[] b, int offset, TableSection parent) {
16-
super(b, offset, parent);
17-
provider_avail_id = getBytes(b,offset+6,4);
12+
public AvailDescriptor(byte[] b, TableSection parent) {
13+
super(b, parent);
14+
provider_avail_id = getBytes(b, 6, 4);
1815
}
1916

20-
2117
@Override
22-
public DefaultMutableTreeNode getJTreeNode(final int modus){
23-
final DefaultMutableTreeNode t = super.getJTreeNode(modus);
24-
t.add(new DefaultMutableTreeNode(new KVP("provider_avail_id",provider_avail_id ,null)));
18+
public KVP getJTreeNode(final int modus) {
19+
final KVP t = super.getJTreeNode(modus);
20+
t.add(new KVP("provider_avail_id", provider_avail_id));
2521
return t;
2622
}
2723

‎src/main/java/nl/digitalekabeltelevisie/data/mpeg/descriptors/scte35/SCTE35Descriptor.java‎

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

3030
import static nl.digitalekabeltelevisie.util.Utils.getBytes;
3131

32-
import javax.swing.tree.DefaultMutableTreeNode;
33-
3432
import nl.digitalekabeltelevisie.controller.KVP;
3533
import nl.digitalekabeltelevisie.data.mpeg.descriptors.Descriptor;
3634
import nl.digitalekabeltelevisie.data.mpeg.psi.TableSection;
@@ -49,9 +47,9 @@ public class SCTE35Descriptor extends Descriptor {
4947
* @param offset
5048
* @param parent
5149
*/
52-
public SCTE35Descriptor(final byte[] b, final int offset, final TableSection parent) {
53-
super(b, offset, parent);
54-
identifier = getBytes(b,offset+2,4);
50+
public SCTE35Descriptor(byte[] b, TableSection parent) {
51+
super(b, parent);
52+
identifier = getBytes(b, 2,4);
5553
}
5654

5755
@Override
@@ -75,9 +73,9 @@ public static String getDescriptorname(final int tag, final TableSection tableSe
7573
}
7674

7775
@Override
78-
public DefaultMutableTreeNode getJTreeNode(final int modus){
79-
final DefaultMutableTreeNode t = super.getJTreeNode(modus);
80-
t.add(new DefaultMutableTreeNode(new KVP("identifier",identifier ,null)));
76+
public KVP getJTreeNode(final int modus){
77+
final KVP t = (KVP) super.getJTreeNode(modus);
78+
t.add(new KVP("identifier",identifier));
8179
return t;
8280
}
8381

‎src/main/java/nl/digitalekabeltelevisie/data/mpeg/descriptors/scte35/SegmentationDescriptor.java‎

Lines changed: 32 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@
3131

3232
import java.util.*;
3333

34-
import javax.swing.tree.DefaultMutableTreeNode;
35-
3634
import nl.digitalekabeltelevisie.controller.*;
3735
import nl.digitalekabeltelevisie.data.mpeg.psi.TableSection;
3836
import nl.digitalekabeltelevisie.util.*;
@@ -152,14 +150,14 @@ public KVP getJTreeNode(int modus) {
152150
private int sub_segments_expected;
153151

154152

155-
public SegmentationDescriptor(byte[] b, int offset, TableSection parent) {
156-
super(b, offset, parent);
157-
segmentation_event_id = getBytes(b,offset+6,4);
158-
segmentation_event_cancel_indicator = getInt(b,offset+10,1,0b1000_0000)>>7;
159-
reserved = getInt(b,offset+10,1,0b0111_1111);
153+
public SegmentationDescriptor(byte[] b, TableSection parent) {
154+
super(b, parent);
155+
segmentation_event_id = getBytes(b,6,4);
156+
segmentation_event_cancel_indicator = getInt(b,10,1,0b1000_0000)>>7;
157+
reserved = getInt(b,10,1,0b0111_1111);
160158
if(segmentation_event_cancel_indicator == 0) {
161159

162-
int localOffset = offset+11;
160+
int localOffset = 11;
163161
program_segmentation_flag = getInt(b,localOffset,1,0b1000_0000)>>7;
164162
segmentation_duration_flag = getInt(b,localOffset,1,0b0100_0000)>>6;
165163
delivery_not_restricted_flag = getInt(b,localOffset,1,0b0010_0000)>>5;
@@ -218,51 +216,47 @@ public SegmentationDescriptor(byte[] b, int offset, TableSection parent) {
218216

219217

220218
@Override
221-
public DefaultMutableTreeNode getJTreeNode(final int modus) {
222-
final DefaultMutableTreeNode t = super.getJTreeNode(modus);
223-
t.add(new DefaultMutableTreeNode(new KVP("segmentation_event_id", segmentation_event_id, null)));
224-
t.add(new DefaultMutableTreeNode(
225-
new KVP("segmentation_event_cancel_indicator", segmentation_event_cancel_indicator,
226-
segmentation_event_cancel_indicator == 1
227-
? "a previously sent segmentation event has been cancelled"
228-
: "no previously sent segmentation event has been cancelled")));
229-
t.add(new DefaultMutableTreeNode(new KVP("reserved", reserved, null)));
219+
public KVP getJTreeNode(final int modus) {
220+
final KVP t = super.getJTreeNode(modus);
221+
t.add(new KVP("segmentation_event_id", segmentation_event_id));
222+
t.add(new KVP("segmentation_event_cancel_indicator", segmentation_event_cancel_indicator,
223+
segmentation_event_cancel_indicator == 1 ? "a previously sent segmentation event has been cancelled"
224+
: "no previously sent segmentation event has been cancelled"));
225+
t.add(new KVP("reserved", reserved));
230226
if (segmentation_event_cancel_indicator == 0) {
231-
t.add(new DefaultMutableTreeNode(new KVP("program_segmentation_flag", program_segmentation_flag, null)));
232-
t.add(new DefaultMutableTreeNode(new KVP("segmentation_duration_flag", segmentation_duration_flag, null)));
233-
t.add(new DefaultMutableTreeNode(new KVP("delivery_not_restricted_flag", delivery_not_restricted_flag, null)));
227+
t.add(new KVP("program_segmentation_flag", program_segmentation_flag));
228+
t.add(new KVP("segmentation_duration_flag", segmentation_duration_flag));
229+
t.add(new KVP("delivery_not_restricted_flag", delivery_not_restricted_flag));
234230

235231
if (delivery_not_restricted_flag == 0) {
236-
t.add(new DefaultMutableTreeNode(
237-
new KVP("web_delivery_allowed_flag", web_delivery_allowed_flag, null)));
238-
t.add(new DefaultMutableTreeNode(
239-
new KVP("no_regional_blackout_flag", no_regional_blackout_flag, null)));
240-
t.add(new DefaultMutableTreeNode(new KVP("archive_allowed_flag", archive_allowed_flag, null)));
241-
t.add(new DefaultMutableTreeNode(new KVP("device_restrictions", device_restrictions, null)));
232+
t.add(new KVP("web_delivery_allowed_flag", web_delivery_allowed_flag));
233+
t.add(new KVP("no_regional_blackout_flag", no_regional_blackout_flag));
234+
t.add(new KVP("archive_allowed_flag", archive_allowed_flag));
235+
t.add(new KVP("device_restrictions", device_restrictions));
242236

243237
} else {
244-
t.add(new DefaultMutableTreeNode(new KVP("reserved", reserved2, null)));
238+
t.add(new KVP("reserved", reserved2));
245239

246240
}
247241
if (program_segmentation_flag == 0) {
248-
t.add(new DefaultMutableTreeNode(new KVP("component_count", component_count, null)));
249-
Utils.addListJTree(t, componentOffsetList, modus, "Component Offsets");
242+
t.add(new KVP("component_count", component_count));
243+
addListJTree(t, componentOffsetList, modus, "Component Offsets");
250244
}
251245
if (segmentation_duration_flag == 1) {
252-
t.add(new DefaultMutableTreeNode(new KVP("segmentation_duration", segmentation_duration, Utils.printTimebase90kHz(segmentation_duration))));
246+
t.add(new KVP("segmentation_duration", segmentation_duration, Utils.printTimebase90kHz(segmentation_duration)));
253247
}
254-
t.add(new DefaultMutableTreeNode(new KVP("segmentation_upid_type", segmentation_upid_type, getSegmentationUpidTypeString(segmentation_upid_type))));
255-
t.add(new DefaultMutableTreeNode(new KVP("segmentation_upid_length", segmentation_upid_length, null)));
248+
t.add(new KVP("segmentation_upid_type", segmentation_upid_type, getSegmentationUpidTypeString(segmentation_upid_type)));
249+
t.add(new KVP("segmentation_upid_length", segmentation_upid_length));
256250

257251
if (segmentation_upid_length > 0) {
258-
t.add(new DefaultMutableTreeNode(new KVP("segmentation_upid", segmentation_upid, null)));
252+
t.add(new KVP("segmentation_upid", segmentation_upid));
259253
}
260-
t.add(new DefaultMutableTreeNode(new KVP("segmentation_type_id", segmentation_type_id, getSegmentationTypeIdString(segmentation_type_id))));
261-
t.add(new DefaultMutableTreeNode(new KVP("segment_num", segment_num, null)));
262-
t.add(new DefaultMutableTreeNode(new KVP("segments_expected", segments_expected, null)));
254+
t.add(new KVP("segmentation_type_id", segmentation_type_id, getSegmentationTypeIdString(segmentation_type_id)));
255+
t.add(new KVP("segment_num", segment_num));
256+
t.add(new KVP("segments_expected", segments_expected));
263257
if (segmentation_type_id == 0x34 || segmentation_type_id == 0x36) {
264-
t.add(new DefaultMutableTreeNode(new KVP("sub_segment_num", sub_segment_num, null)));
265-
t.add(new DefaultMutableTreeNode(new KVP("sub_segments_expected", sub_segments_expected, null)));
258+
t.add(new KVP("sub_segment_num", sub_segment_num));
259+
t.add(new KVP("sub_segments_expected", sub_segments_expected));
266260
}
267261

268262
}

‎src/main/java/nl/digitalekabeltelevisie/data/mpeg/descriptors/scte35/TimeDescriptor.java‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package nl.digitalekabeltelevisie.data.mpeg.descriptors.scte35;
22

3-
import javax.swing.tree.DefaultMutableTreeNode;
4-
53
import nl.digitalekabeltelevisie.controller.KVP;
64
import nl.digitalekabeltelevisie.data.mpeg.psi.TableSection;
75

@@ -13,22 +11,20 @@ public class TimeDescriptor extends SCTE35Descriptor {
1311
private long TAI_ns;
1412
private int UTC_offset;
1513

16-
17-
public TimeDescriptor(byte[] b, int offset, TableSection parent) {
18-
super(b, offset, parent);
19-
TAI_seconds = getLong(b,offset+6,6, 0xFFFFFFFFFFFFL);
20-
TAI_ns = getLong(b,offset+12,4, 0xFFFFFFFFL);
21-
UTC_offset = getInt(b,offset+16, 2, 0xFFFF);
14+
public TimeDescriptor(byte[] b, TableSection parent) {
15+
super(b, parent);
16+
TAI_seconds = getLong(b, 6, 6, 0xFFFFFFFFFFFFL);
17+
TAI_ns = getLong(b, 12, 4, 0xFFFFFFFFL);
18+
UTC_offset = getInt(b, 16, 2, 0xFFFF);
2219

2320
}
2421

25-
2622
@Override
27-
public DefaultMutableTreeNode getJTreeNode(final int modus){
28-
final DefaultMutableTreeNode t = super.getJTreeNode(modus);
29-
t.add(new DefaultMutableTreeNode(new KVP("TAI_seconds",TAI_seconds ,null)));
30-
t.add(new DefaultMutableTreeNode(new KVP("TAI_ns",TAI_ns ,null)));
31-
t.add(new DefaultMutableTreeNode(new KVP("UTC_offset",UTC_offset ,null)));
23+
public KVP getJTreeNode(final int modus) {
24+
final KVP t = super.getJTreeNode(modus);
25+
t.add(new KVP("TAI_seconds", TAI_seconds));
26+
t.add(new KVP("TAI_ns", TAI_ns));
27+
t.add(new KVP("UTC_offset", UTC_offset));
3228
return t;
3329
}
3430

0 commit comments

Comments
 (0)