mpeg/psi: Add support for descriptor 0x26 (Metadata descriptor).

README

@@ -90,6 +90,7 @@ Supported MPEG descriptors
  * Descriptor 0x23: MultiplexBuffer descriptor
  * Descriptor 0x24: Content labeling descriptor
  * Descriptor 0x25: Metadata pointer descriptor
+ * Descriptor 0x26: Metadata 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 0x26 metadata_descriptor
   - Descriptor 0x29 IPMP_descriptor (defined in ISO/IEC 13818-11, MPEG-2 IPMP)
 
 - Add support (parser, generator, example) for these DVB descriptors:

examples/dvb_gen_si.c

@@ -474,6 +474,49 @@ static void build_desc25(uint8_t *desc) {
     desc25_set_length(desc);
 }
 
+/* MPEG Descriptor 0x26: Metadata descriptor */
+static void build_desc26_1(uint8_t *desc) {
+    desc26_init(desc);
+
+    desc26_set_metadata_application_format(desc, 0xfff0);
+    desc26_set_metadata_format(desc, 0xf0);
+    desc26_set_metadata_service_id(desc, 0x88);
+    desc26_set_dsm_cc_flag(desc, false);
+    desc26_set_decoder_config_flags(desc, 0);
+
+    desc26_set_length(desc);
+}
+
+static void build_desc26_2(uint8_t *desc) {
+    desc26_init(desc);
+
+    desc26_set_metadata_application_format(desc, 0xffff);
+    // Needs desc26_set_metadata_application_format(desc, 0xffff);
+    desc26_set_metadata_application_format_identifier(desc, 0x00112233);
+
+    desc26_set_metadata_format(desc, 0xff);
+    // Needs desc26_set_metadata_format(desc, 0xff);
+    desc26_set_metadata_format_identifier(desc, 0xdeadbeaf);
+
+    desc26_set_metadata_service_id(desc, 0x88);
+
+    desc26_set_dsm_cc_flag(desc, true);
+    // Needs desc26_set_dsm_cc_flag(desc, true);
+    desc26_set_service_identification_record(desc, 3, (uint8_t *)"abc");
+
+    desc26_set_decoder_config_flags(desc, 3);
+    // Needs desc26_set_decoder_config_flags(desc, 1);
+    desc26_set_decoder_config(desc, 3, (uint8_t *)"123");
+
+    // Needs desc26_set_decoder_config_flags(desc, 3);
+    desc26_set_dec_config_identification_record(desc, 3, (uint8_t *)"ABC");
+
+    // Needs desc26_set_mpeg_carriage_flags(desc, 4);
+    desc26_set_decoder_config_metadata_service_id(desc, 100);
+
+    desc26_set_length(desc);
+}
+
 /* MPEG Descriptor 0x27: Metadata STD descriptor */
 static void build_desc27(uint8_t *desc) {
     desc27_init(desc);
@@ -2656,6 +2699,12 @@ static void generate_pmt(void) {
             desc = descs_get_desc(desc_loop, desc_counter++);
             build_desc25(desc);
 
+            desc = descs_get_desc(desc_loop, desc_counter++);
+            build_desc26_1(desc);
+
+            desc = descs_get_desc(desc_loop, desc_counter++);
+            build_desc26_2(desc);
+
             desc = descs_get_desc(desc_loop, desc_counter++);
             build_desc28(desc);
 

examples/dvb_print_si.output.txt

@@ -303,6 +303,8 @@ new PMT program=20000 version=1 pcrpid=110
     - 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 25 metadata_pointer_desc metadata_application_format=0xffff metadata_application_format_identifier=0x00112233 metadata_format=0xff metadata_format_identifier=0xdeadbeaf metadata_service_id=0x88 metadata_locator_record_flag=1 metadata_locator_record_length=3 metadata_locator_record="616263" mpeg_carriage_flags=1 program_number=1000 ts_location=2000 ts_id=3000
+    - desc 26 metadata metadata_application_format=0xfff0 metadata_application_format_identifier=0x00000000 metadata_format=0xf0 metadata_format_identifier=0x00000000 metadata_service_id=0x88 dsm_cc_flag=0 service_identification_record_length=0 service_identification_record="" decoder_config_flags=0 decoder_config_length=0 decoder_config_data="" decoder_config_metadata_service_id=0
+    - desc 26 metadata metadata_application_format=0xffff metadata_application_format_identifier=0x00112233 metadata_format=0xff metadata_format_identifier=0xdeadbeaf metadata_service_id=0x88 dsm_cc_flag=1 service_identification_record_length=3 service_identification_record="616263" decoder_config_flags=3 dec_config_identification_record_length=3 dec_config_identification_record_data="414243" decoder_config_metadata_service_id=0
     - 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

@@ -547,6 +547,12 @@
 <DESC id="0x25" length="23" value="ffff00112233ffdeadbeaf88bf0361626303e807d00bb8">
 <METADATA_POINTER_DESC metadata_application_format="0xffff" metadata_application_format_identifier="0x00112233" metadata_format="0xff" metadata_format_identifier="0xdeadbeaf" metadata_service_id="0x88" metadata_locator_record_flag="1" metadata_locator_record_length="3" metadata_locator_record="616263" mpeg_carriage_flags="1" program_number="1000" ts_location="2000" ts_id="3000"/>
 </DESC>
+<DESC id="0x26" length="5" value="fff0f0880f">
+<METADATA_DESC metadata_application_format="0xfff0" metadata_application_format_identifier="0x00000000" metadata_format="0xf0" metadata_format_identifier="0x00000000" metadata_service_id="0x88" dsm_cc_flag="0" service_identification_record_length="0" service_identification_record="" decoder_config_flags="0" decoder_config_length="0" decoder_config_data="" decoder_config_metadata_service_id="0"/>
+</DESC>
+<DESC id="0x26" length="21" value="ffff00112233ffdeadbeaf887f0361626303414243">
+<METADATA_DESC metadata_application_format="0xffff" metadata_application_format_identifier="0x00112233" metadata_format="0xff" metadata_format_identifier="0xdeadbeaf" metadata_service_id="0x88" dsm_cc_flag="1" service_identification_record_length="3" service_identification_record="616263" decoder_config_flags="3" dec_config_identification_record_length="3" dec_config_identification_record_data="414243" decoder_config_metadata_service_id="0"/>
+</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

@@ -62,6 +62,7 @@
 #include <bitstream/mpeg/psi/desc_23.h>
 #include <bitstream/mpeg/psi/desc_24.h>
 #include <bitstream/mpeg/psi/desc_25.h>
+#include <bitstream/mpeg/psi/desc_26.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

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