Added SCTE35 TimeDescriptor, fixed segmentation descriptor without sub_segment_num and sub_segments_expected (#88)

* Added TimeDescriptor, fixed segmentation descriptor without sub_segment_num and sub_segments_expected

* Update TimeDescriptor

* Update TimeDescriptor

Author: stanislavpetkov

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

@@ -685,6 +685,8 @@ private static Descriptor getSCTE35Descriptor(final byte[] data, final TableSect
 			return new AvailDescriptor(data, 0, tableSection);
 		case 0x02:
 			return new SegmentationDescriptor(data, 0, tableSection);
+        case 0x03:
+            return new TimeDescriptor(data, 0, tableSection);			
 		default:
 			Descriptor d = new SCTE35Descriptor(data, 0, tableSection);
 			logger.info("Not implemented SCTE35Descriptor:" + toUnsignedInt(data[0]) + " ("

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

@@ -65,7 +65,7 @@ public static String getDescriptorname(final int tag, final TableSection tableSe
 		case 0x00: return "avail_descriptor"; 
 		case 0x01: return "DTMF_descriptor";
 		case 0x02: return "segmentation_descriptor"; 
-		case 0x03: return "DVB-time_descriptor";
+		case 0x03: return "time_descriptor";
 		case 0x04: return "audio_descriptor";
 		default:
 

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

@@ -184,10 +184,16 @@ public SegmentationDescriptor(byte[] b, int offset, TableSection parent) {
 			segmentation_type_id  = getInt(b,localOffset++,1,MASK_8BITS);
 			segment_num = getInt(b,localOffset++,1,MASK_8BITS);
 			segments_expected = getInt(b,localOffset++,1,MASK_8BITS);
-			if(segmentation_type_id == 0x34 ||segmentation_type_id == 0x36) {
-				sub_segment_num = getInt(b,localOffset++,1,MASK_8BITS);
-				sub_segments_expected = getInt(b,localOffset++,1,MASK_8BITS);
-			}
+
+            //10.3.3.1. Segmentation descriptor details
+            // Note: sub_segment_num and sub_segments_expected can form an optional appendix to the segmentation descriptor.
+            // The presence or absence of this optional data block is determined by the descriptor loop’s descriptor_length.
+            if (((b.length -localOffset) >= 2   ) &&
+                    (segmentation_type_id == 0x34 || segmentation_type_id == 0x36 ||
+                            segmentation_type_id == 0x38 || segmentation_type_id == 0x3A)) {
+                sub_segment_num = getInt(b, localOffset++, 1, MASK_8BITS);
+                sub_segments_expected = getInt(b, localOffset++, 1, MASK_8BITS);
+            }
 		}
 	}
 

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

@@ -0,0 +1,35 @@
+package nl.digitalekabeltelevisie.data.mpeg.descriptors.scte35;
+
+import javax.swing.tree.DefaultMutableTreeNode;
+
+import nl.digitalekabeltelevisie.controller.KVP;
+import nl.digitalekabeltelevisie.data.mpeg.psi.TableSection;
+
+import static nl.digitalekabeltelevisie.util.Utils.*;
+
+public class TimeDescriptor extends SCTE35Descriptor {
+
+	private long TAI_seconds;
+    private long TAI_ns;
+    private int UTC_offset;
+
+
+	public TimeDescriptor(byte[] b, int offset, TableSection parent) {
+		super(b, offset, parent);        
+        TAI_seconds = getLong(b,offset+6,6, 0xFFFFFFFFFFFFL);
+        TAI_ns = getLong(b,offset+12,4, 0xFFFFFFFFL);
+        UTC_offset = getInt(b,offset+16, 2, 0xFFFF);
+
+	}
+
+	
+	@Override
+	public DefaultMutableTreeNode getJTreeNode(final int modus){
+		final DefaultMutableTreeNode t = super.getJTreeNode(modus);		
+		t.add(new DefaultMutableTreeNode(new KVP("TAI_seconds",TAI_seconds ,null)));
+		t.add(new DefaultMutableTreeNode(new KVP("TAI_ns",TAI_ns ,null)));
+		t.add(new DefaultMutableTreeNode(new KVP("UTC_offset",UTC_offset ,null)));
+		return t;
+	}
+
+}