From a68331b099551a2dddc7dad84967534627b52b6a Mon Sep 17 00:00:00 2001 From: Georgi Chorbadzhiyski Date: Fri, 7 Oct 2011 13:41:08 +0300 Subject: [PATCH] dvb/si: Add support for descriptor 0x49 (Country availability descriptor). --- README | 1 + TODO | 1 - dvb/si/desc_49.h | 115 +++++++++++++++++++++++++++++++++++++++++ dvb/si/descs_list.h | 1 + examples/dvb_gen_si.c | 30 ++++++++++- mpeg/psi/descs_print.h | 1 + 6 files changed, 147 insertions(+), 2 deletions(-) create mode 100644 dvb/si/desc_49.h diff --git a/README b/README index 1fdd5fa..32df316 100644 --- a/README +++ b/README @@ -106,6 +106,7 @@ Supported DVB descriptors * Descriptor 0x46: VBI teletext descriptor * Descriptor 0x47: Bouquet name descriptor * Descriptor 0x48: Service descriptor + * Descriptor 0x49: Country availability descriptor * Descriptor 0x4a: Linkage descriptor (partially implemented) * Descriptor 0x4d: Short event descriptor * Descriptor 0x4e: Extended event descriptor diff --git a/TODO b/TODO index 7940276..2b7515f 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 0x49: Country availability descriptor - Descriptor 0x4b: NVOD_reference_descriptor - Descriptor 0x4c: time_shifted_service_descriptor - Descriptor 0x4f: time_shifted_event_descriptor diff --git a/dvb/si/desc_49.h b/dvb/si/desc_49.h new file mode 100644 index 0000000..4059578 --- /dev/null +++ b/dvb/si/desc_49.h @@ -0,0 +1,115 @@ +/***************************************************************************** + * desc_49.h: ETSI EN 300 468 Descriptor 0x49: Country availability 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_49_H__ +#define __BITSTREAM_DVB_DESC_49_H__ + +#include +#include +#include + +#ifdef __cplusplus +extern "C" +{ +#endif + +/***************************************************************************** + * Descriptor 0x49: Country availability descriptor + *****************************************************************************/ +#define DESC49_HEADER_SIZE (DESC_HEADER_SIZE + 1) +#define DESC49_CODE_SIZE 3 + +static inline void desc49_init(uint8_t *p_desc) +{ + desc_set_tag(p_desc, 0x49); + p_desc[2] = 0x7f; +} + +static inline bool desc49_get_country_availability_flag(const uint8_t *p_desc) +{ + return (p_desc[2] & 0x80) == 0x80; +} + +static inline void desc49_set_country_availability_flag(uint8_t *p_desc, bool b_available) +{ + p_desc[2] = b_available ? (p_desc[2] | 0x80) : (p_desc[2] &~ 0x80); +} + +static inline uint8_t *desc49_get_code(uint8_t *p_desc, uint8_t n) +{ + uint8_t *p_desc_n = p_desc + DESC49_HEADER_SIZE + n * DESC49_CODE_SIZE; + if (p_desc_n + DESC49_CODE_SIZE - p_desc + > desc_get_length(p_desc) + DESC49_HEADER_SIZE) + return NULL; + return p_desc_n; +} + +#define desc49n_set_code desc0an_set_code +#define desc49n_get_code desc0an_get_code + +static inline bool desc49_validate(const uint8_t *p_desc) +{ + return ((desc_get_length(p_desc) - 1) % DESC49_CODE_SIZE) == 0; +} + +static inline void desc49_print(uint8_t *p_desc, f_print pf_print, + void *opaque, print_type_t i_print_type) +{ + uint8_t j = 0; + uint8_t *p_desc_n; + + while ((p_desc_n = desc49_get_code(p_desc, j)) != NULL) { + j++; + switch (i_print_type) { + case PRINT_XML: + pf_print(opaque, + "", + desc49_get_country_availability_flag(p_desc), + (const char *)desc49n_get_code(p_desc_n) + ); + break; + default: + pf_print(opaque, + " - desc 49 country_availability available=%u country=%3.3s", + desc49_get_country_availability_flag(p_desc), + (const char *)desc49n_get_code(p_desc_n) + ); + } + } +} + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/dvb/si/descs_list.h b/dvb/si/descs_list.h index 3540ecf..199568f 100644 --- a/dvb/si/descs_list.h +++ b/dvb/si/descs_list.h @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include diff --git a/examples/dvb_gen_si.c b/examples/dvb_gen_si.c index 5525be9..ca1424b 100644 --- a/examples/dvb_gen_si.c +++ b/examples/dvb_gen_si.c @@ -513,7 +513,29 @@ static void build_desc48(uint8_t *desc) { desc48_set_length(desc); } -/* --- Descriptor 0x49: Country availability descriptor */ +/* DVB Descriptor 0x49: Country availability descriptor */ +static void build_desc49(uint8_t *desc, bool b_available) { + uint8_t k = 0; + uint8_t *code_n; + + desc49_init(desc); + desc49_set_country_availability_flag(desc, b_available); + + desc_set_length(desc, 255); + + code_n = desc49_get_code(desc, k++); + desc49n_set_code(code_n, (uint8_t *)"GBR"); + + code_n = desc49_get_code(desc, k++); + desc49n_set_code(code_n, (uint8_t *)"FRA"); + + code_n = desc49_get_code(desc, k++); + desc49n_set_code(code_n, (uint8_t *)"BUL"); + + code_n = desc49_get_code(desc, k); + desc_set_length(desc, code_n - desc - DESC_HEADER_SIZE); +} + /* DVB Descriptor 0x4a: Linkage descriptor (partially implemented) */ /* --- Descriptor 0x4b: NVOD_reference_descriptor */ /* --- Descriptor 0x4c: time_shifted_service_descriptor */ @@ -1231,6 +1253,9 @@ static void generate_sdt(void) { desc = descs_get_desc(desc_loop, desc_counter++); build_desc48(desc); + desc = descs_get_desc(desc_loop, desc_counter++); + build_desc49(desc, true); + desc = descs_get_desc(desc_loop, desc_counter++); build_desc5f(desc); @@ -1254,6 +1279,9 @@ static void generate_sdt(void) { desc = descs_get_desc(desc_loop, desc_counter++); build_desc48(desc); + desc = descs_get_desc(desc_loop, desc_counter++); + build_desc49(desc, false); + desc = descs_get_desc(desc_loop, desc_counter++); build_desc5f(desc); diff --git a/mpeg/psi/descs_print.h b/mpeg/psi/descs_print.h index f9f1bbe..3d2cad7 100644 --- a/mpeg/psi/descs_print.h +++ b/mpeg/psi/descs_print.h @@ -138,6 +138,7 @@ static inline void descl_print(uint8_t *p_descl, uint16_t i_length, CASE_DESC(46) CASE_DESC_ICONV(47) CASE_DESC_ICONV(48) + CASE_DESC(49) CASE_DESC(4a) CASE_DESC_ICONV(4d) CASE_DESC_ICONV(4e)