diff --git a/README b/README index aea4e1d..8929035 100644 --- a/README +++ b/README @@ -116,6 +116,7 @@ Supported DVB descriptors * Descriptor 0x50: Component descriptor * Descriptor 0x51: Mosaic descriptor * Descriptor 0x52: Stream identifier descriptor + * Descriptor 0x53: CA identifier descriptor * Descriptor 0x54: Content descriptor * Descriptor 0x55: Parental rating descriptor * Descriptor 0x56: Teletext descriptor diff --git a/TODO b/TODO index 9995d00..b696734 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 0x53: CA_identifier_descriptor - Descriptor 0x57: telephone_descriptor - Descriptor 0x5b: multilingual_network_name_descriptor - Descriptor 0x5c: multilingual_bouquet_name_descriptor diff --git a/dvb/si/desc_53.h b/dvb/si/desc_53.h new file mode 100644 index 0000000..9cbdfe5 --- /dev/null +++ b/dvb/si/desc_53.h @@ -0,0 +1,105 @@ +/***************************************************************************** + * desc_53.h: ETSI EN 300 468 Descriptor 0x53: CA identifier 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_53_H__ +#define __BITSTREAM_DVB_DESC_53_H__ + +#include +#include + +#ifdef __cplusplus +extern "C" +{ +#endif + +/***************************************************************************** + * Descriptor 0x53: CA identifier descriptor + *****************************************************************************/ +#define DESC53_HEADER_SIZE DESC_HEADER_SIZE +#define DESC53_CA_SIZE 2 + +static inline void desc53_init(uint8_t *p_desc) +{ + desc_set_tag(p_desc, 0x53); +} + +static inline void desc53n_set_ca_sysid(uint8_t *p_desc_n, uint16_t i_ca_sysid) +{ + p_desc_n[0] = i_ca_sysid >> 8; + p_desc_n[1] = i_ca_sysid & 0xff; +} + +static inline uint16_t desc53n_get_ca_sysid(const uint8_t *p_desc_n) +{ + return (p_desc_n[0] << 8) | p_desc_n[1]; +} + +static inline uint8_t *desc53_get_ca(uint8_t *p_desc, uint8_t n) +{ + uint8_t *p_desc_n = p_desc + DESC53_HEADER_SIZE + n * DESC53_CA_SIZE; + if (p_desc_n + DESC53_CA_SIZE - p_desc + > desc_get_length(p_desc) + DESC53_HEADER_SIZE) + return NULL; + return p_desc_n; +} + +static inline bool desc53_validate(const uint8_t *p_desc) +{ + return (desc_get_length(p_desc) % DESC53_CA_SIZE) == 0; +} + +static inline void desc53_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 = desc53_get_ca(p_desc, j)) != NULL) { + j++; + switch (i_print_type) { + case PRINT_XML: + pf_print(opaque, "", + desc53n_get_ca_sysid(p_desc_n)); + break; + default: + pf_print(opaque," - desc 53 ca_identifier ca_sysid=0x%04x", + desc53n_get_ca_sysid(p_desc_n)); + } + } +} + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/dvb/si/descs_list.h b/dvb/si/descs_list.h index f234178..9540056 100644 --- a/dvb/si/descs_list.h +++ b/dvb/si/descs_list.h @@ -53,6 +53,7 @@ #include #include #include +#include #include #include #include diff --git a/examples/dvb_gen_si.c b/examples/dvb_gen_si.c index b6c19f0..795914b 100644 --- a/examples/dvb_gen_si.c +++ b/examples/dvb_gen_si.c @@ -712,7 +712,27 @@ static void build_desc52(uint8_t *desc) { desc52_set_component_tag(desc, 46); } -/* --- Descriptor 0x53: CA_identifier_descriptor */ +/* DVB Descriptor 0x53: CA_identifier_descriptor */ +static void build_desc53(uint8_t *desc) { + uint8_t k = 0; + uint8_t *cas_n; + + desc53_init(desc); + desc_set_length(desc, 255); + + cas_n = desc53_get_ca(desc, k++); + desc53n_set_ca_sysid(cas_n, 0xaabb); + + cas_n = desc53_get_ca(desc, k++); + desc53n_set_ca_sysid(cas_n, 0xccdd); + + cas_n = desc53_get_ca(desc, k++); + desc53n_set_ca_sysid(cas_n, 0xeeff); + + cas_n = desc53_get_ca(desc, k); + desc_set_length(desc, cas_n - desc - DESC_HEADER_SIZE); +} + /* DVB Descriptor 0x54: Content descriptor */ static void build_desc54(uint8_t *desc) { uint8_t k = 0; @@ -1560,6 +1580,9 @@ static void generate_eit(void) { desc = descs_get_desc(desc_loop, desc_counter++); build_desc54(desc); + desc = descs_get_desc(desc_loop, desc_counter++); + build_desc53(desc); + desc = descs_get_desc(desc_loop, desc_counter++); build_desc55(desc); diff --git a/mpeg/psi/descs_print.h b/mpeg/psi/descs_print.h index f99039c..4dda9a3 100644 --- a/mpeg/psi/descs_print.h +++ b/mpeg/psi/descs_print.h @@ -148,6 +148,7 @@ static inline void descl_print(uint8_t *p_descl, uint16_t i_length, CASE_DESC_ICONV(50) CASE_DESC(51) CASE_DESC(52) + CASE_DESC(53) CASE_DESC(54) CASE_DESC(55) CASE_DESC(56)