diff --git a/README b/README index 9a9ac23..86d3a54 100644 --- a/README +++ b/README @@ -142,6 +142,7 @@ Supported DVB descriptors * Descriptor 0x6a: AC-3 descriptor * Descriptor 0x7a: Enhanced AC-3 descriptor * Descriptor 0x7b: DTS descriptor + * Descriptor 0x7c: AAC descriptor To see what is unsupported look in the TODO file. diff --git a/TODO b/TODO index a7885ae..6bff590 100644 --- a/TODO +++ b/TODO @@ -28,7 +28,6 @@ so if you like something just do it and send a patch. - Descriptor 0x77: time_slice_fec_identifier_descriptor - Descriptor 0x78: ECM_repetition_rate_descriptor - Descriptor 0x79: S2_satellite_delivery_system_descriptor - - Descriptor 0x7c: AAC descriptor - Descriptor 0x7d: XAIT location descriptor - Descriptor 0x7e: FTA_content_management_descriptor - Descriptor 0x7f: extension descriptor diff --git a/dvb/si/desc_7c.h b/dvb/si/desc_7c.h new file mode 100644 index 0000000..2472d3a --- /dev/null +++ b/dvb/si/desc_7c.h @@ -0,0 +1,139 @@ +/***************************************************************************** + * desc_7c.h: ETSI EN 300 468 Descriptor 0x7c: AAC 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: + * - ETSI EN 300 468 V1.12.1 (2011-06) (SI in DVB systems) + */ + +#ifndef __BITSTREAM_DVB_DESC_7C_H__ +#define __BITSTREAM_DVB_DESC_7C_H__ + +#include +#include + +#ifdef __cplusplus +extern "C" +{ +#endif + +/***************************************************************************** + * Descriptor 0x7c: AAC descriptor + *****************************************************************************/ +#define DESC7C_HEADER_SIZE (DESC_HEADER_SIZE + 1) +#define DESC7C_HEADER_SIZE2 (DESC_HEADER_SIZE + 3) + +static inline void desc7c_init(uint8_t *p_desc) +{ + desc_set_tag(p_desc, 0x7c); + desc_set_length(p_desc, (DESC7C_HEADER_SIZE - DESC_HEADER_SIZE)); +} + +static inline uint8_t desc7c_get_profile_and_level(const uint8_t *p_desc) +{ + return p_desc[2]; +} + +static inline void desc7c_set_profile_and_level(uint8_t *p_desc, uint8_t i_profile_and_level) +{ + p_desc[2] = i_profile_and_level; +} + +static inline bool desc7c_get_aac_type_flag(const uint8_t *p_desc) +{ + if (desc_get_length(p_desc) > 1) + return (p_desc[3] & 0x80) == 0x80; + else + return false; +} + +static inline void desc7c_set_aac_type_flag(uint8_t *p_desc, bool b_aac_type_flag) +{ + uint8_t i_desc_len = desc_get_length(p_desc); + if (i_desc_len == 1 && b_aac_type_flag) { + i_desc_len += 2; + desc_set_length(p_desc, i_desc_len); + } + if (i_desc_len > 1 && !b_aac_type_flag) { + i_desc_len -= 2; + desc_set_length(p_desc, i_desc_len); + } + if (i_desc_len > 1) + p_desc[3] = b_aac_type_flag ? 0xff : 0x7f; +} + +static inline uint8_t desc7c_get_aac_type(const uint8_t *p_desc) +{ + if (!desc7c_get_aac_type_flag(p_desc)) + return 0; + return p_desc[4]; +} + +static inline void desc7c_set_aac_type(uint8_t *p_desc, uint8_t i_aac_type) +{ + if (!desc7c_get_aac_type_flag(p_desc)) + return; + p_desc[4] = i_aac_type; +} + +static inline bool desc7c_validate(const uint8_t *p_desc) +{ + if (!desc7c_get_aac_type_flag(p_desc)) + return desc_get_length(p_desc) >= (DESC7C_HEADER_SIZE - DESC_HEADER_SIZE); + else + return desc_get_length(p_desc) >= (DESC7C_HEADER_SIZE2 - DESC_HEADER_SIZE); +} + +static inline void desc7c_print(const uint8_t *p_desc, f_print pf_print, + void *opaque, print_type_t i_print_type) +{ + switch (i_print_type) { + case PRINT_XML: + pf_print(opaque, + "", + desc7c_get_profile_and_level(p_desc), + desc7c_get_aac_type_flag(p_desc), + desc7c_get_aac_type(p_desc) + ); + break; + default: + pf_print(opaque, + " - desc 7c aac profile_and_level=\"0x%02x\"" + " aac_type_flag=\"%u\" aac_type=\"0x%02x\"", + desc7c_get_profile_and_level(p_desc), + desc7c_get_aac_type_flag(p_desc), + desc7c_get_aac_type(p_desc) + ); + } +} + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/dvb/si/descs_list.h b/dvb/si/descs_list.h index b68060a..bb70e99 100644 --- a/dvb/si/descs_list.h +++ b/dvb/si/descs_list.h @@ -79,6 +79,7 @@ #include #include #include +#include #include #include diff --git a/examples/dvb_gen_si.c b/examples/dvb_gen_si.c index b3e9a48..d512599 100644 --- a/examples/dvb_gen_si.c +++ b/examples/dvb_gen_si.c @@ -1178,7 +1178,14 @@ static void build_desc7b(uint8_t *desc) { desc7b_set_extended_surround_flag(desc, 2); } -/* --- Descriptor 0x7c: AAC descriptor */ +/* DVB Descriptor 0x7c: AAC descriptor */ +static void build_desc7c(uint8_t *desc) { + desc7c_init(desc); + desc7c_set_profile_and_level(desc, 0x14); + desc7c_set_aac_type_flag(desc, true); + desc7c_set_aac_type(desc, 0x1f); +} + /* --- Descriptor 0x7d: XAIT location descriptor */ /* --- Descriptor 0x7e: FTA_content_management_descriptor */ /* --- Descriptor 0x7f: extension descriptor */ @@ -2360,6 +2367,9 @@ static void generate_pmt(void) { desc = descs_get_desc(desc_loop, desc_counter++); build_desc2b(desc); + desc = descs_get_desc(desc_loop, desc_counter++); + build_desc7c(desc); + // Finish descriptor generation desc = descs_get_desc(desc_loop, desc_counter); // Get next descriptor pos descs_set_length(desc_loop, desc - desc_loop - DESCS_HEADER_SIZE); diff --git a/examples/dvb_print_si.output.txt b/examples/dvb_print_si.output.txt index dc21bdb..084164f 100644 --- a/examples/dvb_print_si.output.txt +++ b/examples/dvb_print_si.output.txt @@ -268,6 +268,7 @@ new PMT program=20000 version=1 pcrpid=110 * ES pid=127 streamtype=0x0f streamtype_txt="13818-7 Audio with ADTS transport syntax" - desc 42 stuffing length=4 - desc 2b mpeg2_aac_audio profile=0x12 channel_config=0x05 additional_info=0x00 + - desc 7c aac profile_and_level="0x14" aac_type_flag="1" aac_type="0x1f" end PMT new DIT transition_flag=1 end DIT diff --git a/examples/dvb_print_si.output.xml b/examples/dvb_print_si.output.xml index 6b935e7..7519b75 100644 --- a/examples/dvb_print_si.output.xml +++ b/examples/dvb_print_si.output.xml @@ -486,6 +486,9 @@ + + + diff --git a/mpeg/psi/descs_print.h b/mpeg/psi/descs_print.h index 02c7068..f48498e 100644 --- a/mpeg/psi/descs_print.h +++ b/mpeg/psi/descs_print.h @@ -173,6 +173,7 @@ static inline void descl_print(uint8_t *p_descl, uint16_t i_length, CASE_DESC(6a) CASE_DESC(7a) CASE_DESC(7b) + CASE_DESC(7c) #undef CASE_DESC #undef CASE_DESC_ICONV