From cb5e47626f7be9b2eb05c4524683b4464e97571b Mon Sep 17 00:00:00 2001 From: Georgi Chorbadzhiyski Date: Wed, 12 Oct 2011 15:06:04 +0300 Subject: [PATCH] dvb/si: Add support for descriptor 0x67 (Transport stream descriptor). --- README | 1 + TODO | 1 - dvb/si/desc_67.h | 116 +++++++++++++++++++++++++++++++ dvb/si/descs_list.h | 1 + examples/dvb_gen_si.c | 12 +++- examples/dvb_print_si.output.txt | 3 +- examples/dvb_print_si.output.xml | 7 +- mpeg/psi/descs_print.h | 1 + 8 files changed, 136 insertions(+), 6 deletions(-) create mode 100644 dvb/si/desc_67.h diff --git a/README b/README index c04a0a8..4ac9b51 100644 --- a/README +++ b/README @@ -136,6 +136,7 @@ Supported DVB descriptors * Descriptor 0x64: Data broadcast descriptor * Descriptor 0x65: Scrambling descriptor * Descriptor 0x66: Data broadcast id descriptor + * Descriptor 0x67: Transport stream descriptor * Descriptor 0x6a: AC-3 descriptor [p] Legend: diff --git a/TODO b/TODO index 4ef5323..b5c23b8 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 0x67: transport_stream_descriptor - Descriptor 0x68: DSNG_descriptor - Descriptor 0x69: PDC_descriptor - Descriptor 0x6b: ancillary_data_descriptor diff --git a/dvb/si/desc_67.h b/dvb/si/desc_67.h new file mode 100644 index 0000000..b1affff --- /dev/null +++ b/dvb/si/desc_67.h @@ -0,0 +1,116 @@ +/***************************************************************************** + * desc_67.h: ETSI EN 300 468 Descriptor 0x67: Transport stream 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_67_H__ +#define __BITSTREAM_DVB_DESC_67_H__ + +#include +#include + +#ifdef __cplusplus +extern "C" +{ +#endif + +/***************************************************************************** + * Descriptor 0x67: Transport stream descriptor + *****************************************************************************/ +#define DESC67_HEADER_SIZE DESC_HEADER_SIZE + +static inline void desc67_init(uint8_t *p_desc) +{ + desc_set_tag(p_desc, 0x67); + desc_set_length(p_desc, 0); +} + +static inline uint8_t desc67_get_bytes_length(const uint8_t *p_desc) +{ + return desc_get_length(p_desc); +} + +static inline const uint8_t *desc67_get_bytes(const uint8_t *p_desc, uint8_t *pi_length) +{ + *pi_length = desc67_get_bytes_length(p_desc); + return p_desc + 2; +} + +static inline void desc67_set_bytes(uint8_t *p_desc, const uint8_t *p_bytes, uint8_t i_length) +{ + desc_set_length(p_desc, i_length); + memcpy(p_desc + 2, p_bytes, i_length); +} + +static inline bool desc67_validate(const uint8_t *p_desc) +{ + return true; +} + +static inline void desc67_print(const uint8_t *p_desc, f_print pf_print, + void *opaque, print_type_t i_print_type) +{ + uint8_t i_bytes_length, i; + const uint8_t *p_bytes = desc67_get_bytes(p_desc, &i_bytes_length); + char psz_bytes[2 * 255 + 1]; + char psz_bytes_txt[255 + 1]; + + for (i = 0; i < i_bytes_length; i++) { + sprintf(psz_bytes + 2 * i, "%02x", p_bytes[i]); + if (p_bytes[i] >= 32 && p_bytes[i] <= 127 && p_bytes[i] != '"') + psz_bytes_txt[i] = p_bytes[i]; + else + psz_bytes_txt[i] = '.'; + } + psz_bytes[2 * i] = '\0'; + psz_bytes_txt[i] = '\0'; + + switch (i_print_type) { + case PRINT_XML: + pf_print(opaque, + "", + psz_bytes, + psz_bytes_txt + ); + break; + default: + pf_print(opaque, + " - desc 67 transport_stream bytes=\"%s\" bytes_txt=\"%s\"", + psz_bytes, + psz_bytes_txt + ); + } +} + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/dvb/si/descs_list.h b/dvb/si/descs_list.h index ae35549..aaf7f41 100644 --- a/dvb/si/descs_list.h +++ b/dvb/si/descs_list.h @@ -73,6 +73,7 @@ #include #include #include +#include #include #include #include diff --git a/examples/dvb_gen_si.c b/examples/dvb_gen_si.c index 514d1ce..ebf6980 100644 --- a/examples/dvb_gen_si.c +++ b/examples/dvb_gen_si.c @@ -1078,7 +1078,12 @@ static void build_desc66(uint8_t *desc) { desc66_set_selector_byte(desc, (uint8_t *)selector_byte, strlen(selector_byte)); } -/* --- Descriptor 0x67: transport_stream_descriptor */ +/* DVB Descriptor 0x67: Transport stream descriptor */ +static void build_desc67(uint8_t *desc, char *bytes) { + desc67_init(desc); + desc67_set_bytes(desc, (uint8_t *)bytes, strlen(bytes)); +} + /* --- Descriptor 0x68: DSNG_descriptor */ /* --- Descriptor 0x69: PDC_descriptor */ /* DVB Descriptor 0x6a: AC-3 descriptor */ @@ -1270,7 +1275,10 @@ static void generate_tsdt(void) { desc_counter = 0; desc = descs_get_desc(desc_loop, desc_counter++); - build_desc0f(desc); + build_desc67(desc, "DVB"); + + desc = descs_get_desc(desc_loop, desc_counter++); + build_desc67(desc, "CONT"); // Finish descriptor generation desc = descs_get_desc(desc_loop, desc_counter); // Get next descriptor pos diff --git a/examples/dvb_print_si.output.txt b/examples/dvb_print_si.output.txt index 13adb81..c7c9f8e 100644 --- a/examples/dvb_print_si.output.txt +++ b/examples/dvb_print_si.output.txt @@ -21,7 +21,8 @@ end CAT new TSDT version=0 end TSDT new TSDT version=1 - - desc 0f private_data_indicator private_indicator=0xaabbccdd + - desc 67 transport_stream bytes="445642" bytes_txt="DVB" + - desc 67 transport_stream bytes="434f4e54" bytes_txt="CONT" end TSDT new NIT actual networkid=40000 version=0 end NIT diff --git a/examples/dvb_print_si.output.xml b/examples/dvb_print_si.output.xml index 9583851..73280fd 100644 --- a/examples/dvb_print_si.output.xml +++ b/examples/dvb_print_si.output.xml @@ -29,8 +29,11 @@ - - + + + + + diff --git a/mpeg/psi/descs_print.h b/mpeg/psi/descs_print.h index 0b295d2..1bbafbc 100644 --- a/mpeg/psi/descs_print.h +++ b/mpeg/psi/descs_print.h @@ -167,6 +167,7 @@ static inline void descl_print(uint8_t *p_descl, uint16_t i_length, CASE_DESC_ICONV(64) CASE_DESC(65) CASE_DESC(66) + CASE_DESC(67) CASE_DESC(6a) #undef CASE_DESC