mpeg/psi: Add support for descriptor 0x24 (Content labeling descriptor).

README

@@ -88,6 +88,7 @@ Supported MPEG descriptors
  * Descriptor 0x21: MuxCode descriptor
  * Descriptor 0x22: FmxBufferSize descriptor
  * Descriptor 0x23: MultiplexBuffer descriptor
+ * Descriptor 0x24: Content labeling descriptor
  * Descriptor 0x27: Metadata STD descriptor
  * Descriptor 0x28: AVC video descriptor
  * Descriptor 0x2a: AVC timing and HRD descriptor

TODO

@@ -2,7 +2,6 @@ TODO items for biTStream. The items are not ordered by importance
 so if you like something just do it and send a patch.
 
 - Add support (parser, generator, example) for these MPEG descriptors:
-  - Descriptor 0x24 content_labeling_descriptor
   - Descriptor 0x25 metadata_pointer_descriptor
   - Descriptor 0x26 metadata_descriptor
   - Descriptor 0x29 IPMP_descriptor (defined in ISO/IEC 13818-11, MPEG-2 IPMP)

examples/dvb_gen_si.c

@@ -397,6 +397,55 @@ static void build_desc23(uint8_t *desc) {
     desc23_set_tb_leak_rate(desc, 445566);
 }
 
+/* MPEG Descriptor 0x24: Content labeling descriptor */
+static void build_desc24_1(uint8_t *desc) {
+    desc24_init(desc);
+
+    desc24_set_metadata_application_format(desc, 0xabcd);
+    desc24_set_content_reference_id_record_flag(desc, false);
+    desc24_set_content_time_base_indicator(desc, 0);
+
+    desc24_set_length(desc);
+}
+
+static void build_desc24_2(uint8_t *desc) {
+    desc24_init(desc);
+
+    desc24_set_metadata_application_format(desc, 0xfff0);
+
+    desc24_set_content_reference_id_record_flag(desc, false);
+
+    desc24_set_content_time_base_indicator(desc, 3);
+    desc24_set_time_base_association(desc, 3, (uint8_t *)"ABC");
+
+    desc24_set_length(desc);
+}
+
+static void build_desc24_3(uint8_t *desc) {
+    desc24_init(desc);
+
+    desc24_set_metadata_application_format(desc, 0xffff);
+    // Needs desc24_set_metadata_application_format(desc, 0xffff);
+    desc24_set_metadata_application_format_identifier(desc, 0xaabbccdd);
+
+    desc24_set_content_reference_id_record_flag(desc, true);
+    // Needs desc24_set_content_reference_id_record_flag(desc, true);
+    desc24_set_content_reference_id_record(desc, 3, (uint8_t *)"abc");
+
+    desc24_set_content_time_base_indicator(desc, 2);
+    // Needs desc24_set_content_time_base_indicator(desc, 1..2);
+    desc24_set_content_time_base_value (desc, 0x1F0F0F0F0); // 8337289456
+    desc24_set_metadata_time_base_value(desc, 0x1F1F1F1F1); // 8354132465
+
+    // Needs desc24_set_content_time_base_indicator(desc, 2);
+    desc24_set_content_id(desc, 100);
+
+    // Needs desc24_set_content_time_base_indicator(desc, 3..7);
+    desc24_set_time_base_association(desc, 3, (uint8_t *)"ABC");
+
+    desc24_set_length(desc);
+}
+
 /* MPEG Descriptor 0x27: Metadata STD descriptor */
 static void build_desc27(uint8_t *desc) {
     desc27_init(desc);
@@ -2567,6 +2616,15 @@ static void generate_pmt(void) {
             desc_loop = pmtn_get_descs(pmt_n);
             descs_set_length(desc_loop, DESCS_MAX_SIZE); // This is needed so descs_get_desc(x, n) works
 
+            desc = descs_get_desc(desc_loop, desc_counter++);
+            build_desc24_1(desc);
+
+            desc = descs_get_desc(desc_loop, desc_counter++);
+            build_desc24_2(desc);
+
+            desc = descs_get_desc(desc_loop, desc_counter++);
+            build_desc24_3(desc);
+
             desc = descs_get_desc(desc_loop, desc_counter++);
             build_desc28(desc);
 

examples/dvb_print_si.output.txt

@@ -299,6 +299,9 @@ new PMT program=20000 version=1 pcrpid=110
     - desc 27 metadata_std input_leak_rate=12345 buffer_size=23456 output_leak_rate=34567
     - desc 2c flexmux_timing fcr_es_id=0x1234 fcr_resolution=123456789 fcr_length=55 fmx_rate_length=66
   * ES pid=126 streamtype=0x1b streamtype_txt="H.264/14496-10 video (MPEG-4/AVC)"
+    - desc 24 content_labeling metadata_application_format=0xabcd metadata_application_format_identifier=0x00000000 content_reference_id_record_flag=0 content_reference_id_record_length=0 content_reference_id_record="" content_time_base_indicator=0 content_time_base_value="0" metadata_time_base_value="0" content_id=0 time_base_association_data_length=0 time_base_association_data=""
+    - desc 24 content_labeling metadata_application_format=0xfff0 metadata_application_format_identifier=0x00000000 content_reference_id_record_flag=0 content_reference_id_record_length=0 content_reference_id_record="" content_time_base_indicator=3 content_time_base_value="0" metadata_time_base_value="0" content_id=0 time_base_association_data_length=3 time_base_association_data="414243"
+    - desc 24 content_labeling metadata_application_format=0xffff metadata_application_format_identifier=0xaabbccdd content_reference_id_record_flag=1 content_reference_id_record_length=3 content_reference_id_record="616263" content_time_base_indicator=2 content_time_base_value="8337289456" metadata_time_base_value="8354132465" content_id=100 time_base_association_data_length=0 time_base_association_data=""
     - desc 28 avc_video profile_idc=0x12 constraint_set0_flag=1 constraint_set1_flag=1 constraint_set2_flag=0 AVC_compatible_flags=0x0a level_idc=0x34 AVC_still_present=0 AVC_24_hour_picture_flag=0
     - desc 2a avc_timing_and_hrd hrd_management_valid_flag=0 picture_and_timing_info_present=1 flag_90khz=0 N=12345678 K=34567890 num_units_in_tick=456789 fixed_frame_rate_flag=1 temporal_poc_flag=0 picture_to_display_conversion_flag=1
   * ES pid=127 streamtype=0x0f streamtype_txt="13818-7 Audio with ADTS transport syntax"

examples/dvb_print_si.output.xml

@@ -535,6 +535,15 @@
 </DESC>
 </ES>
 <ES pid="126" streamtype="0x1b" streamtype_txt="H.264/14496-10 video (MPEG-4/AVC)">
+<DESC id="0x24" length="3" value="abcd07">
+<CONTENT_LABELING_DESC metadata_application_format="0xabcd" metadata_application_format_identifier="0x00000000" content_reference_id_record_flag="0" content_reference_id_record_length="0" content_reference_id_record="" content_time_base_indicator="0" content_time_base_value="0" metadata_time_base_value="0" content_id="0" time_base_association_data_length="0" time_base_association_data=""/>
+</DESC>
+<DESC id="0x24" length="7" value="fff01f03414243">
+<CONTENT_LABELING_DESC metadata_application_format="0xfff0" metadata_application_format_identifier="0x00000000" content_reference_id_record_flag="0" content_reference_id_record_length="0" content_reference_id_record="" content_time_base_indicator="3" content_time_base_value="0" metadata_time_base_value="0" content_id="0" time_base_association_data_length="3" time_base_association_data="414243"/>
+</DESC>
+<DESC id="0x24" length="22" value="ffffaabbccdd9703616263fff0f0f0f0fff1f1f1f1e4">
+<CONTENT_LABELING_DESC metadata_application_format="0xffff" metadata_application_format_identifier="0xaabbccdd" content_reference_id_record_flag="1" content_reference_id_record_length="3" content_reference_id_record="616263" content_time_base_indicator="2" content_time_base_value="8337289456" metadata_time_base_value="8354132465" content_id="100" time_base_association_data_length="0" time_base_association_data=""/>
+</DESC>
 <DESC id="0x28" length="4" value="12ca343f">
 <AVC_VIDEO_DESC profile_idc="0x12" constraint_set0_flag="1" constraint_set1_flag="1" constraint_set2_flag="0" AVC_compatible_flags="0x0a" level_idc="0x34" AVC_still_present="0" AVC_24_hour_picture_flag="0"/>
 </DESC>

mpeg/psi/descs_list.h

@@ -60,6 +60,7 @@
 #include <bitstream/mpeg/psi/desc_21.h>
 #include <bitstream/mpeg/psi/desc_22.h>
 #include <bitstream/mpeg/psi/desc_23.h>
+#include <bitstream/mpeg/psi/desc_24.h>
 #include <bitstream/mpeg/psi/desc_27.h>
 #include <bitstream/mpeg/psi/desc_28.h>
 #include <bitstream/mpeg/psi/desc_2a.h>

mpeg/psi/descs_print.h

@@ -126,6 +126,7 @@ static inline void descl_print(uint8_t *p_descl, uint16_t i_length,
         CASE_DESC(21)
         CASE_DESC(22)
         CASE_DESC(23)
+        CASE_DESC(24)
         CASE_DESC(27)
         CASE_DESC(28)
         CASE_DESC(2a)