From 1b8889c53bd1f3f119467a8f3065d462cdd4ffc8 Mon Sep 17 00:00:00 2001 From: Georgi Chorbadzhiyski Date: Tue, 11 Oct 2011 02:32:07 +0300 Subject: [PATCH] dvb/si: Add support for descriptor 0x5e (Multilingual component). --- README | 1 + TODO | 1 - dvb/si/desc_5e.h | 156 +++++++++++++++++++++++++++++++ dvb/si/descs_list.h | 1 + examples/dvb_gen_si.c | 31 +++++- examples/dvb_print_si.output.txt | 3 + examples/dvb_print_si.output.xml | 5 + mpeg/psi/descs_print.h | 1 + 8 files changed, 197 insertions(+), 2 deletions(-) create mode 100644 dvb/si/desc_5e.h diff --git a/README b/README index 3153904..f09b7dd 100644 --- a/README +++ b/README @@ -127,6 +127,7 @@ Supported DVB descriptors * Descriptor 0x5b: Multilingual network name descriptor * Descriptor 0x5c: Multilingual bouquet name descriptor * Descriptor 0x5d: Multilingual service name descriptor + * Descriptor 0x5e: Multilingual component descriptor * Descriptor 0x5f: Private data specifier descriptor * Descriptor 0x6a: AC-3 descriptor [p] diff --git a/TODO b/TODO index 55f330e..7dc0415 100644 --- a/TODO +++ b/TODO @@ -14,7 +14,6 @@ so if you like something just do it and send a patch. - Descriptor 0x6a: AC-3 descriptor - Add support (parser, generator, example) for these DVB descriptors: - - Descriptor 0x5e: multilingual_component_descriptor - Descriptor 0x60: service_move_descriptor - Descriptor 0x61: short_smoothing_buffer_descriptor - Descriptor 0x62: frequency_list_descriptor diff --git a/dvb/si/desc_5e.h b/dvb/si/desc_5e.h new file mode 100644 index 0000000..48aa108 --- /dev/null +++ b/dvb/si/desc_5e.h @@ -0,0 +1,156 @@ +/***************************************************************************** + * desc_5e.h: ETSI EN 300 468 Descriptor 0x5e: Multilingual component descriptor + ***************************************************************************** + * Copyright (C) 2009-2010 VideoLAN + * + * Authors: Christophe Massiot + * 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.11.1 (2010-04) (SI in DVB systems) + */ + +#ifndef __BITSTREAM_DVB_DESC_5E_H__ +#define __BITSTREAM_DVB_DESC_5E_H__ + +#include +#include +#include +#include + +#ifdef __cplusplus +extern "C" +{ +#endif + +/***************************************************************************** + * Descriptor 0x5e: Multilingual component descriptor + *****************************************************************************/ +#define DESC5E_HEADER_SIZE (DESC_HEADER_SIZE + 1) +#define DESC5E_DATA_SIZE 4 + +static inline void desc5e_init(uint8_t *p_desc) +{ + desc_set_tag(p_desc, 0x5e); + desc_set_length(p_desc, DESC5E_HEADER_SIZE - DESC_HEADER_SIZE); +} + +static inline uint8_t desc5e_get_component_tag(const uint8_t *p_desc) +{ + return p_desc[2]; +} + +static inline void desc5e_set_component_tag(uint8_t *p_desc, uint8_t i_component_tag) +{ + p_desc[2] = i_component_tag; +} + +#define desc5en_set_code desc0an_set_code +#define desc5en_get_code desc0an_get_code + +static inline uint8_t desc5en_get_text_length(const uint8_t *p_desc_n) +{ + return p_desc_n[3]; +} + +static inline const uint8_t *desc5en_get_text(const uint8_t *p_desc_n, uint8_t *pi_length) +{ + *pi_length = desc5en_get_text_length(p_desc_n); + return p_desc_n + 4; +} + +static inline void desc5en_set_text(uint8_t *p_desc_n, const uint8_t *p_text, uint8_t i_length) +{ + p_desc_n[3] = i_length; + memcpy(p_desc_n + 4, p_text, i_length); +} + +static inline uint8_t *desc5e_get_data(const uint8_t *p_desc, uint8_t n) +{ + const uint8_t *p_desc_n = p_desc + DESC5E_HEADER_SIZE; + uint8_t i_desc_size = desc_get_length(p_desc); + + while (n) { + if (p_desc_n + DESC5E_DATA_SIZE - p_desc > i_desc_size) + return NULL; + p_desc_n += DESC5E_DATA_SIZE + desc5en_get_text_length(p_desc_n); + n--; + } + if (p_desc_n - p_desc > i_desc_size) + return NULL; + return (uint8_t *)p_desc_n; +} + +static inline bool desc5e_validate(const uint8_t *p_desc) +{ + const uint8_t *p_desc_n = p_desc + DESC5E_HEADER_SIZE; + int i_desc_size = desc_get_length(p_desc); + while (i_desc_size > (DESC5E_HEADER_SIZE - DESC_HEADER_SIZE)) + { + uint8_t i_data_sz = DESC5E_DATA_SIZE + desc5en_get_text_length(p_desc_n); + i_desc_size -= i_data_sz; + p_desc_n += i_data_sz; + } + return i_desc_size == (DESC5E_HEADER_SIZE - DESC_HEADER_SIZE); +} + +static inline void desc5e_print(const uint8_t *p_desc, + f_print pf_print, void *print_opaque, + f_iconv pf_iconv, void *iconv_opaque, + print_type_t i_print_type) +{ + const uint8_t *p_desc_n; + uint8_t j = 0; + + while ((p_desc_n = desc5e_get_data(p_desc, j++)) != NULL) { + uint8_t i_text_length; + const uint8_t *p_text = desc5en_get_text(p_desc_n, &i_text_length); + char *psz_text = dvb_string_get(p_text, i_text_length, pf_iconv, iconv_opaque); + switch (i_print_type) { + case PRINT_XML: + psz_text = dvb_string_xml_escape(psz_text); + pf_print(print_opaque, + "", + desc5en_get_code(p_desc_n), + desc5e_get_component_tag(p_desc), + psz_text + ); + break; + default: + pf_print(print_opaque, + " - desc 5e multilingual_component code=\"%3.3s\" component_tag=%u text=\"%s\"", + desc5en_get_code(p_desc_n), + desc5e_get_component_tag(p_desc), + psz_text + ); + } + free(psz_text); + } +} + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/dvb/si/descs_list.h b/dvb/si/descs_list.h index 3965b95..2f4cfac 100644 --- a/dvb/si/descs_list.h +++ b/dvb/si/descs_list.h @@ -64,6 +64,7 @@ #include #include #include +#include #include #include #include diff --git a/examples/dvb_gen_si.c b/examples/dvb_gen_si.c index 9b48e08..76ab29c 100644 --- a/examples/dvb_gen_si.c +++ b/examples/dvb_gen_si.c @@ -967,7 +967,33 @@ static void build_desc5d(uint8_t *desc) { desc_set_length(desc, data_n - desc - DESC_HEADER_SIZE); } -/* --- Descriptor 0x5e: multilingual_component_descriptor */ +/* DVB Descriptor 0x5e: Multilingual component descriptor */ +static void build_desc5e(uint8_t *desc) { + char *text = "Stereo"; + uint8_t k = 0; + uint8_t *data_n; + + desc5e_init(desc); + desc5e_set_component_tag(desc, 46); + desc_set_length(desc, 255); + + data_n = desc5e_get_data(desc, k++); + desc5en_set_code(data_n, (uint8_t *)"eng"); + desc5en_set_text(data_n, (uint8_t *)text, strlen(text)); + + data_n = desc5e_get_data(desc, k++); + desc5en_set_code(data_n, (uint8_t *)"fre"); + desc5en_set_text(data_n, (uint8_t *)text, strlen(text)); + + data_n = desc5e_get_data(desc, k++); + desc5en_set_code(data_n, (uint8_t *)"bul"); + desc5en_set_text(data_n, (uint8_t *)text, strlen(text)); + + data_n = desc5e_get_data(desc, k); + desc_set_length(desc, data_n - desc - DESC_HEADER_SIZE); +} + + /* DVB Descriptor 0x5f: Private data specifier descriptor */ static void build_desc5f(uint8_t *desc) { desc5f_init(desc); @@ -2002,6 +2028,9 @@ static void generate_pmt(void) { desc = descs_get_desc(desc_loop, desc_counter++); build_desc50(desc); + desc = descs_get_desc(desc_loop, desc_counter++); + build_desc5e(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 2f6fdac..90ed4b8 100644 --- a/examples/dvb_print_si.output.txt +++ b/examples/dvb_print_si.output.txt @@ -199,6 +199,9 @@ new PMT program=20000 version=1 pcrpid=110 - desc 52 stream_identifier component_tag=46 - desc 1c mpeg4_audio audio_profile_and_level=0x13 - desc 50 component stream_content=0x02 component_type=0x03 component_tag=46 language=eng text="Stereo"/> + - desc 5e multilingual_component code="eng" component_tag=46 text="Stereo" + - desc 5e multilingual_component code="fre" component_tag=46 text="Stereo" + - desc 5e multilingual_component code="bul" component_tag=46 text="Stereo" * 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 9ad0d5f..e0f34a2 100644 --- a/examples/dvb_print_si.output.xml +++ b/examples/dvb_print_si.output.xml @@ -348,6 +348,11 @@ + + + + + diff --git a/mpeg/psi/descs_print.h b/mpeg/psi/descs_print.h index 32fe4d8..bf7b98c 100644 --- a/mpeg/psi/descs_print.h +++ b/mpeg/psi/descs_print.h @@ -159,6 +159,7 @@ static inline void descl_print(uint8_t *p_descl, uint16_t i_length, CASE_DESC_ICONV(5b) CASE_DESC_ICONV(5c) CASE_DESC_ICONV(5d) + CASE_DESC_ICONV(5e) CASE_DESC(6a) #undef CASE_DESC