From 0699c3b1b65535000c7b5185030f1c017fc745d0 Mon Sep 17 00:00:00 2001 From: Georgi Chorbadzhiyski Date: Tue, 11 Oct 2011 01:25:03 +0300 Subject: [PATCH] dvb/si: Add support for descriptor 0x5c (Multilingual bouquet name). --- README | 1 + TODO | 1 - dvb/si/desc_5b.h | 9 +++- dvb/si/desc_5c.h | 72 ++++++++++++++++++++++++++++++++ dvb/si/descs_list.h | 1 + examples/dvb_gen_si.c | 29 ++++++++++++- examples/dvb_print_si.output.txt | 3 ++ examples/dvb_print_si.output.xml | 5 +++ mpeg/psi/descs_print.h | 1 + 9 files changed, 118 insertions(+), 4 deletions(-) create mode 100644 dvb/si/desc_5c.h diff --git a/README b/README index 7dd9692..16152e5 100644 --- a/README +++ b/README @@ -125,6 +125,7 @@ Supported DVB descriptors * Descriptor 0x59: Subtitling descriptor * Descriptor 0x5a: Terrestrial delivery system descriptor * Descriptor 0x5b: Multilingual network name descriptor + * Descriptor 0x5c: Multilingual bouquet name descriptor * Descriptor 0x5f: Private data specifier descriptor * Descriptor 0x6a: AC-3 descriptor [p] diff --git a/TODO b/TODO index f06b298..c59c3c2 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 0x5c: multilingual_bouquet_name_descriptor - Descriptor 0x5d: multilingual_service_name_descriptor - Descriptor 0x5e: multilingual_component_descriptor - Descriptor 0x60: service_move_descriptor diff --git a/dvb/si/desc_5b.h b/dvb/si/desc_5b.h index cf9c41c..343647d 100644 --- a/dvb/si/desc_5b.h +++ b/dvb/si/desc_5b.h @@ -110,6 +110,7 @@ static inline void desc5b_print(const uint8_t *p_desc, print_type_t i_print_type) { const uint8_t *p_desc_n; + bool b_bouquet = desc_get_tag(p_desc) == 0x5c; uint8_t j = 0; while ((p_desc_n = desc5b_get_data(p_desc, j++)) != NULL) { @@ -120,14 +121,18 @@ static inline void desc5b_print(const uint8_t *p_desc, case PRINT_XML: psz_network_name = dvb_string_xml_escape(psz_network_name); pf_print(print_opaque, - "", + !b_bouquet + ? "" + : "", desc5bn_get_code(p_desc_n), psz_network_name ); break; default: pf_print(print_opaque, - " - desc 5b multilingual_network_name code=\"%3.3s\" networkname=\"%s\"", + !b_bouquet + ? " - desc 5b multilingual_network_name code=\"%3.3s\" networkname=\"%s\"" + : " - desc 5c multilingual_bouquet_name code=\"%3.3s\" bouquetname=\"%s\"", desc5bn_get_code(p_desc_n), psz_network_name ); diff --git a/dvb/si/desc_5c.h b/dvb/si/desc_5c.h new file mode 100644 index 0000000..7df61e6 --- /dev/null +++ b/dvb/si/desc_5c.h @@ -0,0 +1,72 @@ +/***************************************************************************** + * desc_5c.h: ETSI EN 300 468 Descriptor 0x5c: Multilingual bouquet name + ***************************************************************************** + * 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_5C_H__ +#define __BITSTREAM_DVB_DESC_5C_H__ + +#include +#include +#include +#include +#include + +#ifdef __cplusplus +extern "C" +{ +#endif + +/***************************************************************************** + * Descriptor 0x5c: Multilingual bouquet name + *****************************************************************************/ +#define DESC5C_HEADER_SIZE DESC_HEADER_SIZE +#define DESC5C_DATA_SIZE 4 + +static inline void desc5c_init(uint8_t *p_desc) +{ + desc_set_tag(p_desc, 0x5c); +} + +#define desc5cn_set_code desc0an_set_code +#define desc5cn_get_code desc0an_get_code +#define desc5cn_get bouquetname_length desc5bn_get_networkname_length +#define desc5cn_get_bouquetname desc5bn_get_networkname +#define desc5cn_set_bouquetname desc5bn_set_networkname +#define desc5c_get_data desc5b_get_data +#define desc5c_validate desc5b_validate +#define desc5c_print desc5b_print + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/dvb/si/descs_list.h b/dvb/si/descs_list.h index 26d2feb..f4d699a 100644 --- a/dvb/si/descs_list.h +++ b/dvb/si/descs_list.h @@ -62,6 +62,7 @@ #include #include #include +#include #include #include #include diff --git a/examples/dvb_gen_si.c b/examples/dvb_gen_si.c index 248ccf1..4124405 100644 --- a/examples/dvb_gen_si.c +++ b/examples/dvb_gen_si.c @@ -912,7 +912,31 @@ static void build_desc5b(uint8_t *desc) { desc_set_length(desc, data_n - desc - DESC_HEADER_SIZE); } -/* --- Descriptor 0x5c: multilingual_bouquet_name_descriptor */ +/* DVB Descriptor 0x5c: Multilingual bouquet name descriptor */ +static void build_desc5c(uint8_t *desc) { + char *bouquet_name = "M Bouquet"; + uint8_t k = 0; + uint8_t *data_n; + + desc5c_init(desc); + desc_set_length(desc, 255); + + data_n = desc5c_get_data(desc, k++); + desc5cn_set_code(data_n, (uint8_t *)"eng"); + desc5cn_set_bouquetname(data_n, (uint8_t *)bouquet_name, strlen(bouquet_name)); + + data_n = desc5c_get_data(desc, k++); + desc5cn_set_code(data_n, (uint8_t *)"fre"); + desc5cn_set_bouquetname(data_n, (uint8_t *)bouquet_name, strlen(bouquet_name)); + + data_n = desc5c_get_data(desc, k++); + desc5cn_set_code(data_n, (uint8_t *)"bul"); + desc5cn_set_bouquetname(data_n, (uint8_t *)bouquet_name, strlen(bouquet_name)); + + data_n = desc5c_get_data(desc, k); + desc_set_length(desc, data_n - desc - DESC_HEADER_SIZE); +} + /* --- Descriptor 0x5d: multilingual_service_name_descriptor */ /* --- Descriptor 0x5e: multilingual_component_descriptor */ /* DVB Descriptor 0x5f: Private data specifier descriptor */ @@ -1309,6 +1333,9 @@ static void generate_bat(void) { desc = descs_get_desc(desc_loop, desc_counter++); build_desc47(desc); + desc = descs_get_desc(desc_loop, desc_counter++); + build_desc5c(desc); + // Finish descriptor generation desc = descs_get_desc(desc_loop, desc_counter); // Get next descriptor pos bat_set_desclength(bat, desc - desc_loop - DESCS_HEADER_SIZE); diff --git a/examples/dvb_print_si.output.txt b/examples/dvb_print_si.output.txt index 024fd45..7abc51c 100644 --- a/examples/dvb_print_si.output.txt +++ b/examples/dvb_print_si.output.txt @@ -50,6 +50,9 @@ new BAT networkid=40000 version=0 end BAT new BAT networkid=40000 version=1 - desc 47 bouquetname="Test Bouquet Name" + - desc 5c multilingual_bouquet_name code="eng" bouquetname="M Bouquet" + - desc 5c multilingual_bouquet_name code="fre" bouquetname="M Bouquet" + - desc 5c multilingual_bouquet_name code="bul" bouquetname="M Bouquet" * ts tsid=10000 onid=40000 - desc 41 service_list sid=20000 type=0x01 - desc 41 service_list sid=20100 type=0x02 diff --git a/examples/dvb_print_si.output.xml b/examples/dvb_print_si.output.xml index ca11cd4..3bf1139 100644 --- a/examples/dvb_print_si.output.xml +++ b/examples/dvb_print_si.output.xml @@ -80,6 +80,11 @@ + + + + + diff --git a/mpeg/psi/descs_print.h b/mpeg/psi/descs_print.h index af3b439..41aeb0f 100644 --- a/mpeg/psi/descs_print.h +++ b/mpeg/psi/descs_print.h @@ -157,6 +157,7 @@ static inline void descl_print(uint8_t *p_descl, uint16_t i_length, CASE_DESC(59) CASE_DESC(5a) CASE_DESC_ICONV(5b) + CASE_DESC_ICONV(5c) CASE_DESC(6a) #undef CASE_DESC