diff --git a/README b/README index ffccbef..68f4518 100644 --- a/README +++ b/README @@ -113,6 +113,7 @@ Supported DVB descriptors * Descriptor 0x4d: Short event descriptor * Descriptor 0x4e: Extended event descriptor * Descriptor 0x4f: Time shifted event descriptor + * Descriptor 0x50: Component descriptor * Descriptor 0x52: Stream identifier descriptor * Descriptor 0x54: Content descriptor * Descriptor 0x55: Parental rating descriptor diff --git a/TODO b/TODO index 7eb2528..55e748e 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 0x50: component_descriptor - Descriptor 0x51: mosaic_descriptor - Descriptor 0x53: CA_identifier_descriptor - Descriptor 0x57: telephone_descriptor diff --git a/dvb/si/desc_50.h b/dvb/si/desc_50.h new file mode 100644 index 0000000..cdd10af --- /dev/null +++ b/dvb/si/desc_50.h @@ -0,0 +1,157 @@ +/***************************************************************************** + * desc_50.h: ETSI EN 300 468 Descriptor 0x50: Component 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.11.1 (2010-04) (SI in DVB systems) + */ + +#ifndef __BITSTREAM_DVB_DESC_50_H__ +#define __BITSTREAM_DVB_DESC_50_H__ + +#include +#include +#include + +#ifdef __cplusplus +extern "C" +{ +#endif + +/***************************************************************************** + * Descriptor 0x50: Component descriptor + *****************************************************************************/ +#define DESC50_HEADER_SIZE (DESC_HEADER_SIZE + 6) + +static inline void desc50_init(uint8_t *p_desc) +{ + desc_set_tag(p_desc, 0x50); + p_desc[2] = 0xf0; + desc_set_length(p_desc, DESC50_HEADER_SIZE - DESC_HEADER_SIZE); +} + +static inline uint8_t desc50_get_stream_content(const uint8_t *p_desc) +{ + return p_desc[2] & 0x0f; +} + +static inline void desc50_set_stream_content(uint8_t *p_desc, uint8_t i_stream_content) +{ + p_desc[2] = 0xf0 | (i_stream_content & 0x0f); +} + +static inline uint8_t desc50_get_component_type(const uint8_t *p_desc) +{ + return p_desc[3]; +} + +static inline void desc50_set_component_type(uint8_t *p_desc, uint8_t i_component_type) +{ + p_desc[3] = i_component_type; +} + +static inline uint8_t desc50_get_component_tag(const uint8_t *p_desc) +{ + return p_desc[4]; +} + +static inline void desc50_set_component_tag(uint8_t *p_desc, uint8_t i_component_tag) +{ + p_desc[4] = i_component_tag; +} + +static inline void desc50_set_language(uint8_t *p_desc, const uint8_t p_language[3]) +{ + p_desc[5] = p_language[0]; + p_desc[6] = p_language[1]; + p_desc[7] = p_language[2]; +} + +static inline const uint8_t *desc50_get_language(const uint8_t *p_desc) +{ + return p_desc + 5; +} + +static inline const uint8_t *desc50_get_text(const uint8_t *p_desc, uint8_t *pi_length) +{ + *pi_length = desc_get_length(p_desc) - (DESC50_HEADER_SIZE - DESC_HEADER_SIZE); + return p_desc + DESC50_HEADER_SIZE; +} + +static inline void desc50_set_text(uint8_t *p_desc, const uint8_t *p_text, uint8_t i_length) +{ + desc_set_length(p_desc, DESC50_HEADER_SIZE - DESC_HEADER_SIZE + i_length); + memcpy(p_desc + DESC50_HEADER_SIZE, p_text, i_length); +} + +static inline bool desc50_validate(const uint8_t *p_desc) +{ + return desc_get_length(p_desc) >= DESC50_HEADER_SIZE - DESC_HEADER_SIZE; +} + +static inline void desc50_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) +{ + uint8_t i_text_len; + const uint8_t *p_text = desc50_get_text(p_desc, &i_text_len); + char *psz_text = dvb_string_get(p_text, i_text_len, pf_iconv, iconv_opaque); + + switch (i_print_type) { + case PRINT_XML: + psz_text = dvb_string_xml_escape(psz_text); + pf_print(print_opaque, + "", + desc50_get_stream_content(p_desc), + desc50_get_component_type(p_desc), + desc50_get_component_tag(p_desc), + (char *)desc50_get_language(p_desc), + psz_text + ); + break; + default: + pf_print(print_opaque, + " - desc 50 component stream_content=0x%02x component_type=0x%02x" + " component_tag=%u language=%3.3s text=\"%s\"/>", + desc50_get_stream_content(p_desc), + desc50_get_component_type(p_desc), + desc50_get_component_tag(p_desc), + (char *)desc50_get_language(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 29cbade..78ef607 100644 --- a/dvb/si/descs_list.h +++ b/dvb/si/descs_list.h @@ -50,6 +50,7 @@ #include #include #include +#include #include #include #include diff --git a/examples/dvb_gen_si.c b/examples/dvb_gen_si.c index 349d7ff..4a54272 100644 --- a/examples/dvb_gen_si.c +++ b/examples/dvb_gen_si.c @@ -632,7 +632,17 @@ static void build_desc4f(uint8_t *desc) { desc4f_set_reference_event_id(desc, event_id + 2000); } -/* --- Descriptor 0x50: component_descriptor */ +/* DVB Descriptor 0x50: Component descriptor */ +static void build_desc50(uint8_t *desc) { + char *text = "Stereo"; + desc50_init(desc); + desc50_set_stream_content(desc, 0x02); + desc50_set_component_type(desc, 0x03); + desc50_set_component_tag(desc, 46); + desc50_set_language(desc, (uint8_t *)"eng"); + desc50_set_text(desc, (uint8_t *)text, strlen(text)); // Not required +} + /* --- Descriptor 0x51: mosaic_descriptor */ /* DVB Descriptor 0x52: Stream identifier descriptor */ static void build_desc52(uint8_t *desc) { @@ -1792,6 +1802,9 @@ static void generate_pmt(void) { desc = descs_get_desc(desc_loop, desc_counter++); build_desc1c(desc); + desc = descs_get_desc(desc_loop, desc_counter++); + build_desc50(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/mpeg/psi/descs_print.h b/mpeg/psi/descs_print.h index 0ab4c65..42ca3cc 100644 --- a/mpeg/psi/descs_print.h +++ b/mpeg/psi/descs_print.h @@ -145,6 +145,7 @@ static inline void descl_print(uint8_t *p_descl, uint16_t i_length, CASE_DESC_ICONV(4d) CASE_DESC_ICONV(4e) CASE_DESC(4f) + CASE_DESC_ICONV(50) CASE_DESC(52) CASE_DESC(54) CASE_DESC(55)