From 16ca82ff734a96aa6d888e97add56e83126b2aef Mon Sep 17 00:00:00 2001 From: Georgi Chorbadzhiyski Date: Thu, 13 Oct 2011 13:26:08 +0300 Subject: [PATCH] dvb/si: Add support for descriptor 0x7b (DTS descriptor). --- README | 1 + TODO | 2 - dvb/si/desc_7b.h | 174 +++++++++++++++++++++++++++++++ dvb/si/descs_list.h | 1 + examples/dvb_gen_si.c | 16 ++- examples/dvb_print_si.output.txt | 1 + examples/dvb_print_si.output.xml | 3 + mpeg/psi/descs_print.h | 1 + 8 files changed, 196 insertions(+), 3 deletions(-) create mode 100644 dvb/si/desc_7b.h diff --git a/README b/README index 285ba0b..9a9ac23 100644 --- a/README +++ b/README @@ -141,6 +141,7 @@ Supported DVB descriptors * Descriptor 0x69: PDC descriptor * Descriptor 0x6a: AC-3 descriptor * Descriptor 0x7a: Enhanced AC-3 descriptor + * Descriptor 0x7b: DTS descriptor To see what is unsupported look in the TODO file. diff --git a/TODO b/TODO index 90645fc..a7885ae 100644 --- a/TODO +++ b/TODO @@ -28,8 +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 0x7a: enhanced_AC-3_descriptor - - Descriptor 0x7b: DTS descriptor - Descriptor 0x7c: AAC descriptor - Descriptor 0x7d: XAIT location descriptor - Descriptor 0x7e: FTA_content_management_descriptor diff --git a/dvb/si/desc_7b.h b/dvb/si/desc_7b.h new file mode 100644 index 0000000..f5e0f7a --- /dev/null +++ b/dvb/si/desc_7b.h @@ -0,0 +1,174 @@ +/***************************************************************************** + * desc_7b.h: ETSI EN 300 468 Descriptor 0x7b: DTS 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_7B_H__ +#define __BITSTREAM_DVB_DESC_7B_H__ + +#include +#include + +#ifdef __cplusplus +extern "C" +{ +#endif + +/***************************************************************************** + * Descriptor 0x7b: DTS descriptor + *****************************************************************************/ +#define DESC7B_HEADER_SIZE (DESC_HEADER_SIZE + 5) + +static inline void desc7b_init(uint8_t *p_desc) +{ + desc_set_tag(p_desc, 0x7b); + desc_set_length(p_desc, (DESC7B_HEADER_SIZE - DESC_HEADER_SIZE)); +} + +static inline uint8_t desc7b_get_sample_rate_code(const uint8_t *p_desc) +{ + return ((p_desc[2] & 0xf0) >> 4); // 1111xxxx +} + +static inline void desc7b_set_sample_rate_code(uint8_t *p_desc, uint8_t i_sample_rate_code) +{ + p_desc[2] = (p_desc[2] & 0x0f) | (i_sample_rate_code << 4); // 1111xxxx +} + +static inline uint8_t desc7b_get_bit_rate_code(const uint8_t *p_desc) +{ + return ((p_desc[2] & 0x0f) << 2) | ((p_desc[3] & 0xc0) >> 6); // xxxx1111 11xxxxxx +} + +static inline void desc7b_set_bit_rate_code(uint8_t *p_desc, uint8_t i_bit_rate_code) +{ + p_desc[2] = (p_desc[2] & 0xf0) | ((i_bit_rate_code >> 2) & 0x0f); // xxxx1111 + p_desc[3] = (i_bit_rate_code << 6) | (p_desc[2] & 0x3f); // 11xxxxxx +} + +static inline uint8_t desc7b_get_nblks(const uint8_t *p_desc) +{ + return ((p_desc[3] & 0x3f) << 1) | ((p_desc[4] & 0x80) >> 7); // xx111111 1xxxxxxx +} + +static inline void desc7b_set_nblks(uint8_t *p_desc, uint8_t i_nblks) +{ + p_desc[3] = (p_desc[3] & 0xc0) | ((i_nblks >> 1) & 0x3f); // xx111111 + p_desc[4] = (i_nblks << 7) | (p_desc[4] & 0x7f); // 1xxxxxxx +} + +static inline uint16_t desc7b_get_fsize(const uint8_t *p_desc) +{ + return ((p_desc[4] & 0x7f) << 7) | ((p_desc[5] & 0xfe) >> 1); // x1111111 1111111x +} + +static inline void desc7b_set_fsize(uint8_t *p_desc, uint16_t i_fsize) +{ + i_fsize &= 0x3fff; + p_desc[4] = (p_desc[4] & 0x80) | (i_fsize >> 7); // x1111111 + p_desc[5] = ((i_fsize & 0x7f) << 1) | (p_desc[5] & 0x01); // 1111111x +} + +static inline uint8_t desc7b_get_surround_mode(const uint8_t *p_desc) +{ + return ((p_desc[5] & 0x01) << 5) | ((p_desc[6] & 0xf8) >> 3); // xxxxxxx1 11111xxx +} + +static inline void desc7b_set_surround_mode(uint8_t *p_desc, uint8_t i_surround_mode) +{ + i_surround_mode &= 0x3f; + p_desc[5] = (p_desc[5] & 0xfe) | (i_surround_mode >> 5); // xxxxxxx1 + p_desc[6] = ((i_surround_mode & 0x1f) << 3) | (p_desc[6] & 0x07); // 11111xxx +} + +static inline bool desc7b_get_lfe_flag(const uint8_t *p_desc) +{ + return (p_desc[6] & 0x04) == 0x04; // xxxxx1xx +} + +static inline void desc7b_set_lfe_flag(uint8_t *p_desc, bool b_lfe_flag) +{ + p_desc[6] = b_lfe_flag ? (p_desc[6] | 0x04) : (p_desc[6] &~ 0x04); // xxxxx1xx +} + +static inline uint8_t desc7b_get_extended_surround_flag(const uint8_t *p_desc) +{ + return p_desc[6] & 0x03; // xxxxxx11 +} + +static inline void desc7b_set_extended_surround_flag(uint8_t *p_desc, uint8_t i_extended_surround_flag) +{ + p_desc[6] = (p_desc[6] & 0xfc) | (i_extended_surround_flag & 0x03); // xxxxxx11 +} + +static inline bool desc7b_validate(const uint8_t *p_desc) +{ + return desc_get_length(p_desc) >= (DESC7B_HEADER_SIZE - DESC_HEADER_SIZE); +} + +static inline void desc7b_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, + "", + desc7b_get_sample_rate_code(p_desc), + desc7b_get_bit_rate_code(p_desc), + desc7b_get_nblks(p_desc), + desc7b_get_fsize(p_desc), + desc7b_get_surround_mode(p_desc), + desc7b_get_lfe_flag(p_desc), + desc7b_get_extended_surround_flag(p_desc) + ); + break; + default: + pf_print(opaque, + " - desc 7b dts sample_rate_code=%u bit_rate_code=%u" + " nblks=%u fsize=%u surround_mode=%u" + " lfe_flag=%u extended_surround_flag=%u", + desc7b_get_sample_rate_code(p_desc), + desc7b_get_bit_rate_code(p_desc), + desc7b_get_nblks(p_desc), + desc7b_get_fsize(p_desc), + desc7b_get_surround_mode(p_desc), + desc7b_get_lfe_flag(p_desc), + desc7b_get_extended_surround_flag(p_desc) + ); + } +} + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/dvb/si/descs_list.h b/dvb/si/descs_list.h index fd96731..b68060a 100644 --- a/dvb/si/descs_list.h +++ b/dvb/si/descs_list.h @@ -78,6 +78,7 @@ #include #include #include +#include #include #include diff --git a/examples/dvb_gen_si.c b/examples/dvb_gen_si.c index a193cf1..b3e9a48 100644 --- a/examples/dvb_gen_si.c +++ b/examples/dvb_gen_si.c @@ -1166,7 +1166,18 @@ static void build_desc7a(uint8_t *desc) { desc7a_set_length(desc); } -/* --- Descriptor 0x7b: DTS descriptor */ +/* DVB Descriptor 0x7b: DTS descriptor */ +static void build_desc7b(uint8_t *desc) { + desc7b_init(desc); + desc7b_set_sample_rate_code(desc, 8); + desc7b_set_bit_rate_code(desc, 11); + desc7b_set_nblks(desc, 5); + desc7b_set_fsize(desc, 95); + desc7b_set_surround_mode(desc, 3); + desc7b_set_lfe_flag(desc, true); + desc7b_set_extended_surround_flag(desc, 2); +} + /* --- Descriptor 0x7c: AAC descriptor */ /* --- Descriptor 0x7d: XAIT location descriptor */ /* --- Descriptor 0x7e: FTA_content_management_descriptor */ @@ -2197,6 +2208,9 @@ static void generate_pmt(void) { desc = descs_get_desc(desc_loop, desc_counter++); build_desc7a(desc); + desc = descs_get_desc(desc_loop, desc_counter++); + build_desc7b(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 c1a6262..dc21bdb 100644 --- a/examples/dvb_print_si.output.txt +++ b/examples/dvb_print_si.output.txt @@ -215,6 +215,7 @@ new PMT program=20000 version=1 pcrpid=110 - desc 5e multilingual_component code="bul" component_tag=46 text="Stereo" - desc 6a ac3 component_type_flag=1 component_type=10 bsid_flag=1 bsid=20 mainid_flag=1 mainid=30 asvc_flag=1 asvc=40 - desc 7a ac3 component_type_flag=1 component_type=10 bsid_flag=1 bsid=20 mainid_flag=1 mainid=30 asvc_flag=1 asvc=40 mixinfoexists=1 substream1_flag=1 substream1=50 substream2_flag=1 substream2=60 substream3_flag=1 substream3=70 + - desc 7b dts sample_rate_code=8 bit_rate_code=11 nblks=5 fsize=95 surround_mode=3 lfe_flag=1 extended_surround_flag=2 * ES pid=122 streamtype=0x06 streamtype_txt="13818-1 PES private data" - desc 46 vbi_telx language=eng type=0x1 type_txt="Initial teletext page" mag=3 page=0x255x - desc 46 vbi_telx language=bul type=0x2 type_txt="Teletext subtitle page" mag=2 page=0x127x diff --git a/examples/dvb_print_si.output.xml b/examples/dvb_print_si.output.xml index b1eaf8f..6b935e7 100644 --- a/examples/dvb_print_si.output.xml +++ b/examples/dvb_print_si.output.xml @@ -384,6 +384,9 @@ + + + diff --git a/mpeg/psi/descs_print.h b/mpeg/psi/descs_print.h index 8d47a95..02c7068 100644 --- a/mpeg/psi/descs_print.h +++ b/mpeg/psi/descs_print.h @@ -172,6 +172,7 @@ static inline void descl_print(uint8_t *p_descl, uint16_t i_length, CASE_DESC(69) CASE_DESC(6a) CASE_DESC(7a) + CASE_DESC(7b) #undef CASE_DESC #undef CASE_DESC_ICONV