diff --git a/README b/README index 13ba973..d6b4eec 100644 --- a/README +++ b/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 diff --git a/TODO b/TODO index 5264992..03750a5 100644 --- a/TODO +++ b/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: diff --git a/examples/dvb_gen_si.c b/examples/dvb_gen_si.c index 6ff8866..504bc81 100644 --- a/examples/dvb_gen_si.c +++ b/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); diff --git a/examples/dvb_print_si.output.txt b/examples/dvb_print_si.output.txt index e975568..6ded40f 100644 --- a/examples/dvb_print_si.output.txt +++ b/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" diff --git a/examples/dvb_print_si.output.xml b/examples/dvb_print_si.output.xml index c867417..e235251 100644 --- a/examples/dvb_print_si.output.xml +++ b/examples/dvb_print_si.output.xml @@ -547,6 +547,12 @@ + + + + + + diff --git a/mpeg/psi/desc_26.h b/mpeg/psi/desc_26.h new file mode 100644 index 0000000..1efe8ba --- /dev/null +++ b/mpeg/psi/desc_26.h @@ -0,0 +1,329 @@ +/***************************************************************************** + * desc_26.h: ISO/IEC 13818-1 Descriptor 0x26 (Metadata descriptor) + ***************************************************************************** + * Copyright (C) 2011 Unix Solutions Ltd. + * + * Authors: Georgi Chorbadzhiyski + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject + * to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + *****************************************************************************/ + +/* + * Normative references: + * - ISO/IEC 13818-1:2007(E) (MPEG-2 Systems) + */ + +#ifndef __BITSTREAM_MPEG_DESC_26_H__ +#define __BITSTREAM_MPEG_DESC_26_H__ + +#include +#include +#include + +#ifdef __cplusplus +extern "C" +{ +#endif + +/***************************************************************************** + * Descriptor 0x26 (Metadata descriptor) + *****************************************************************************/ +#define DESC26_HEADER_SIZE (DESC_HEADER_SIZE + 5) + +static inline void desc26_init(uint8_t *p_desc) +{ + desc_set_tag(p_desc, 0x26); +} + +#define desc26_get_metadata_application_format desc25_get_metadata_application_format +#define desc26_set_metadata_application_format desc25_set_metadata_application_format +#define desc26_get_metadata_application_format_identifier desc25_get_metadata_application_format_identifier +#define desc26_set_metadata_application_format_identifier desc25_set_metadata_application_format_identifier + +#define __ofs1 \ + (4 + (desc26_get_metadata_application_format(p_desc) == 0xffff ? 4 : 0)) + +#define desc26_get_metadata_format desc25_get_metadata_format +#define desc26_set_metadata_format desc25_set_metadata_format +#define desc26_get_metadata_format_identifier desc25_get_metadata_format_identifier +#define desc26_set_metadata_format_identifier desc25_set_metadata_format_identifier + +#define __ofs2 \ + (__ofs1 + 1 + (desc26_get_metadata_format(p_desc) == 0xff ? 4 : 0)) + +#define desc26_get_metadata_service_id desc25_get_metadata_service_id +#define desc26_set_metadata_service_id desc25_set_metadata_service_id + +static inline uint8_t desc26_get_decoder_config_flags(const uint8_t *p_desc) +{ + return (p_desc[__ofs2 + 1] & 0xe0) >> 5; +} + +static inline void desc26_set_decoder_config_flags(uint8_t *p_desc, uint8_t i_flags) +{ + uint8_t ofs = __ofs2; + p_desc[ofs + 1] = ((i_flags & 0x07) << 5) | (p_desc[ofs + 1] & 0x1f) | 0x0f; +} + +static inline bool desc26_get_dsm_cc_flag(const uint8_t *p_desc) +{ + return (p_desc[__ofs2 + 1] & 0x10) == 0x10; +} + +static inline void desc26_set_dsm_cc_flag(uint8_t *p_desc, bool b_flag) +{ + uint8_t ofs = __ofs2; + p_desc[ofs + 1] = (b_flag ? (p_desc[ofs + 1] | 0x10) : (p_desc[ofs + 1] &~ 0x10)) | 0x0f; +} + + + +static inline uint8_t desc26_get_service_identification_record_length(const uint8_t *p_desc) +{ + return desc26_get_dsm_cc_flag(p_desc) ? p_desc[__ofs2 + 2] : 0; +} + +static inline const uint8_t *desc26_get_service_identification_record_data(const uint8_t *p_desc) +{ + return desc26_get_dsm_cc_flag(p_desc) ? p_desc + __ofs2 + 3 : NULL; +} + +static inline const uint8_t *desc26_get_service_identification_record(const uint8_t *p_desc, uint8_t *i_length) +{ + *i_length = desc26_get_service_identification_record_length(p_desc); + return desc26_get_service_identification_record_data(p_desc); +} + +static inline void desc26_set_service_identification_record(uint8_t *p_desc, uint8_t i_length, uint8_t *p_data) +{ + if (desc26_get_dsm_cc_flag(p_desc)) { + uint8_t ofs = __ofs2; + p_desc[ofs + 2] = i_length; + memcpy(p_desc + ofs + 3, p_data, i_length); + } +} + + +#define __ofs3 \ + (__ofs2 + 1 + \ + (desc26_get_dsm_cc_flag(p_desc) \ + ? 1 + desc26_get_service_identification_record_length(p_desc) \ + : 0 \ + ) + 1 \ + ) + +static inline uint8_t desc26_get_decoder_config_length(const uint8_t *p_desc) +{ + return (desc26_get_decoder_config_flags(p_desc) == 1) ? p_desc[__ofs3] : 0; +} + +static inline const uint8_t *desc26_get_decoder_config_data(const uint8_t *p_desc) +{ + return (desc26_get_decoder_config_flags(p_desc) == 1) ? p_desc + __ofs3 + 1 : NULL; +} + +static inline const uint8_t *desc26_get_decoder_config(const uint8_t *p_desc, uint8_t *i_length) +{ + *i_length = desc26_get_decoder_config_length(p_desc); + return desc26_get_decoder_config_data(p_desc); +} + +static inline void desc26_set_decoder_config(uint8_t *p_desc, uint8_t i_length, uint8_t *p_data) +{ + if (desc26_get_decoder_config_flags(p_desc) == 1) { + uint8_t ofs = __ofs3; + p_desc[ofs] = i_length; + memcpy(p_desc + ofs + 1, p_data, i_length); + } +} + + +static inline uint8_t desc26_get_dec_config_identification_record_length(const uint8_t *p_desc) +{ + return (desc26_get_decoder_config_flags(p_desc) == 3) ? p_desc[__ofs3] : 0; +} + +static inline const uint8_t *desc26_get_dec_config_identification_record_data(const uint8_t *p_desc) +{ + return (desc26_get_decoder_config_flags(p_desc) == 3) ? p_desc + __ofs3 + 1 : NULL; +} + +static inline const uint8_t *desc26_get_dec_config_identification_record(const uint8_t *p_desc, uint8_t *i_length) +{ + *i_length = desc26_get_dec_config_identification_record_length(p_desc); + return desc26_get_dec_config_identification_record_data(p_desc); +} + +static inline void desc26_set_dec_config_identification_record(uint8_t *p_desc, uint8_t i_length, uint8_t *p_data) +{ + if (desc26_get_decoder_config_flags(p_desc) == 3) { + uint8_t ofs = __ofs3; + p_desc[ofs] = i_length; + memcpy(p_desc + ofs + 1, p_data, i_length); + } +} + + +static inline uint8_t desc26_get_decoder_config_metadata_service_id(const uint8_t *p_desc) +{ + if (desc26_get_decoder_config_flags(p_desc) == 4) + return p_desc[__ofs3]; + else + return 0; +} + +static inline void desc26_set_decoder_config_metadata_service_id(uint8_t *p_desc, uint8_t i_service) +{ + if (desc26_get_decoder_config_flags(p_desc) == 4) + p_desc[__ofs3] = i_service; +} + +#undef __ofs1 +#undef __ofs2 +#undef __ofs3 + +static inline int desc26_calc_length(const uint8_t *p_desc) +{ + int i_length = DESC26_HEADER_SIZE - DESC_HEADER_SIZE; + uint8_t i_flags = desc26_get_decoder_config_flags(p_desc); + + if (desc26_get_metadata_application_format(p_desc) == 0xffff) + i_length += 4; + if (desc26_get_metadata_format(p_desc) == 0xff) + i_length += 4; + if (desc26_get_dsm_cc_flag(p_desc)) + i_length += 1 + desc26_get_service_identification_record_length(p_desc); + if (i_flags == 1) + i_length += 1 + desc26_get_decoder_config_length(p_desc); + if (i_flags == 3) + i_length += 1 + desc26_get_dec_config_identification_record_length(p_desc); + if (i_flags == 4) + i_length += 1; + return i_length; +} + +static inline bool desc26_validate(const uint8_t *p_desc) +{ + return desc26_calc_length(p_desc) <= desc_get_length(p_desc); +} + +static inline void desc26_set_length(uint8_t *p_desc) +{ + desc_set_length(p_desc, desc26_calc_length(p_desc)); +} + +static inline void desc26_print(const uint8_t *p_desc, f_print pf_print, + void *opaque, print_type_t i_print_type) +{ + uint8_t i, i_service_identification_record_length; + const uint8_t *p_service_identification_record = desc26_get_service_identification_record(p_desc, &i_service_identification_record_length); + char psz_service_identification_record[2 * 256 + 1]; + char *extra_str = "decoder_config"; + const uint8_t *p_extra = NULL; + uint8_t i_extra_length = 0; + char psz_extra[2 * 256 + 1]; + + for (i = 0; i < i_service_identification_record_length; i++) + sprintf(psz_service_identification_record + 2 * i, "%02x", p_service_identification_record[i]); + psz_service_identification_record[2 * i] = '\0'; + + if (desc26_get_decoder_config_flags(p_desc) == 1) { + p_extra = desc26_get_decoder_config(p_desc, &i_extra_length); + } + if (desc26_get_decoder_config_flags(p_desc) == 3) { + extra_str = "dec_config_identification_record"; + p_extra = desc26_get_dec_config_identification_record(p_desc, &i_extra_length); + } + for (i = 0; i < i_extra_length; i++) + sprintf(psz_extra + 2 * i, "%02x", p_extra[i]); + psz_extra[2 * i] = '\0'; + + switch (i_print_type) { + case PRINT_XML: + pf_print(opaque, + "", + desc26_get_metadata_application_format(p_desc), + desc26_get_metadata_application_format_identifier(p_desc), + desc26_get_metadata_format(p_desc), + desc26_get_metadata_format_identifier(p_desc), + desc26_get_metadata_service_id(p_desc), + desc26_get_dsm_cc_flag(p_desc), + + desc26_get_service_identification_record_length(p_desc), + psz_service_identification_record, + + desc26_get_decoder_config_flags(p_desc), + extra_str, i_extra_length, + extra_str, psz_extra, + desc26_get_decoder_config_metadata_service_id(p_desc) + ); + break; + default: + pf_print(opaque, + " - desc 26 metadata metadata_application_format=0x%04x" + " metadata_application_format_identifier=0x%08x" + " metadata_format=0x%02x" + " metadata_format_identifier=0x%08x" + " metadata_service_id=0x%02x" + + " dsm_cc_flag=%u" + " service_identification_record_length=%u" + " service_identification_record=\"%s\"" + + " decoder_config_flags=%u" + " %s_length=%u" + " %s_data=\"%s\"" + " decoder_config_metadata_service_id=%u", + desc26_get_metadata_application_format(p_desc), + desc26_get_metadata_application_format_identifier(p_desc), + desc26_get_metadata_format(p_desc), + desc26_get_metadata_format_identifier(p_desc), + desc26_get_metadata_service_id(p_desc), + desc26_get_dsm_cc_flag(p_desc), + + desc26_get_service_identification_record_length(p_desc), + psz_service_identification_record, + + desc26_get_decoder_config_flags(p_desc), + extra_str, i_extra_length, + extra_str, psz_extra, + desc26_get_decoder_config_metadata_service_id(p_desc) + ); + } +} + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/mpeg/psi/descs_list.h b/mpeg/psi/descs_list.h index 52cfefb..35138d3 100644 --- a/mpeg/psi/descs_list.h +++ b/mpeg/psi/descs_list.h @@ -62,6 +62,7 @@ #include #include #include +#include #include #include #include diff --git a/mpeg/psi/descs_print.h b/mpeg/psi/descs_print.h index d4f2439..39104df 100644 --- a/mpeg/psi/descs_print.h +++ b/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)