diff --git a/README b/README index d0103e1..0e238ee 100644 --- a/README +++ b/README @@ -132,6 +132,7 @@ Supported DVB descriptors * Descriptor 0x60: Service move descriptor * Descriptor 0x61: Short smoothing buffer descriptor * Descriptor 0x62: Frequency list descriptor + * Descriptor 0x63: Partial transport stream descriptor * Descriptor 0x6a: AC-3 descriptor [p] Legend: diff --git a/TODO b/TODO index c2b9e36..7ba0789 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 0x63: partial_transport_stream_descriptor - Descriptor 0x64: data_broadcast_descriptor - Descriptor 0x65: scrambling_descriptor - Descriptor 0x66: data_broadcast_id_descriptor diff --git a/dvb/si/desc_63.h b/dvb/si/desc_63.h new file mode 100644 index 0000000..9094b18 --- /dev/null +++ b/dvb/si/desc_63.h @@ -0,0 +1,128 @@ +/***************************************************************************** + * desc_63.h: ETSI EN 300 468 Descriptor 0x63: Partial Transport Stream + ***************************************************************************** + * 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_63_H__ +#define __BITSTREAM_DVB_DESC_63_H__ + +#include +#include + +#ifdef __cplusplus +extern "C" +{ +#endif + +/***************************************************************************** + * Descriptor 0x63: Partial Transport Stream + *****************************************************************************/ +#define DESC63_HEADER_SIZE (DESC_HEADER_SIZE + 8) + +static inline void desc63_init(uint8_t *p_desc) +{ + desc_set_tag(p_desc, 0x63); + desc_set_length(p_desc, DESC63_HEADER_SIZE - DESC_HEADER_SIZE); + p_desc[2] = 0xc0; + p_desc[5] = 0xc0; + p_desc[8] = 0xc0; +} + +static inline uint32_t desc63_get_peak_rate(const uint8_t *p_desc) +{ + return ((p_desc[2] & 0x3f) << 16) | (p_desc[3] << 8) | p_desc[4]; +} + +static inline void desc63_set_peak_rate(uint8_t *p_desc, uint32_t i_peak_rate) +{ + p_desc[2] = ((i_peak_rate >> 16) & 0xff) | 0xc0; + p_desc[3] = (i_peak_rate >> 8) & 0xff; + p_desc[4] = i_peak_rate & 0xff; +} + +static inline uint32_t desc63_get_min_overall_smoothing_rate(const uint8_t *p_desc) +{ + return ((p_desc[5] & 0x3f) << 16) | (p_desc[6] << 8) | p_desc[7]; +} + +static inline void desc63_set_min_overall_smoothing_rate(uint8_t *p_desc, uint32_t i_min_overall_smoothing_rate) +{ + p_desc[5] = ((i_min_overall_smoothing_rate >> 16) & 0xff) | 0xc0; + p_desc[6] = (i_min_overall_smoothing_rate >> 8) & 0xff; + p_desc[7] = i_min_overall_smoothing_rate & 0xff; +} + +static inline uint32_t desc63_get_max_overall_smoothing_buffer(const uint8_t *p_desc) +{ + return ((p_desc[8] & 0x3f) << 8) | p_desc[9]; +} + +static inline void desc63_set_max_overall_smoothing_buffer(uint8_t *p_desc, uint32_t i_max_overall_smoothing_buffer) +{ + p_desc[8] = ((i_max_overall_smoothing_buffer >> 8) & 0xff) | 0xc0; + p_desc[9] = i_max_overall_smoothing_buffer & 0xff; +} + +static inline bool desc63_validate(const uint8_t *p_desc) +{ + return desc_get_length(p_desc) >= DESC63_HEADER_SIZE - DESC_HEADER_SIZE; +} + +static inline void desc63_print(const uint8_t *p_desc, f_print pf_print, + void *opaque, print_type_t i_print_type) +{ + switch (i_print_type) { + case PRINT_XML: + pf_print(opaque, + "", + desc63_get_peak_rate(p_desc), + desc63_get_min_overall_smoothing_rate(p_desc), + desc63_get_max_overall_smoothing_buffer(p_desc) + ); + break; + default: + pf_print(opaque, + " - desc 63 partial_transport_stream peak_rate=%u" + " min_overall_smoothing_rate=%u" + " max_overall_smoothing_buffer=%u", + desc63_get_peak_rate(p_desc), + desc63_get_min_overall_smoothing_rate(p_desc), + desc63_get_max_overall_smoothing_buffer(p_desc) + ); + } +} + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/dvb/si/descs_list.h b/dvb/si/descs_list.h index 55e97f8..9784bde 100644 --- a/dvb/si/descs_list.h +++ b/dvb/si/descs_list.h @@ -69,6 +69,7 @@ #include #include #include +#include #include #include #include diff --git a/examples/dvb_gen_si.c b/examples/dvb_gen_si.c index 73161cc..f02d790 100644 --- a/examples/dvb_gen_si.c +++ b/examples/dvb_gen_si.c @@ -1043,7 +1043,14 @@ static void build_desc62(uint8_t *desc) { desc_set_length(desc, freq_n - desc - DESC_HEADER_SIZE); } -/* --- Descriptor 0x63: partial_transport_stream_descriptor */ +/* DVB Descriptor 0x63: Partial transport stream descriptor */ +static void build_desc63(uint8_t *desc) { + desc63_init(desc); + desc63_set_peak_rate(desc, 5000); + desc63_set_min_overall_smoothing_rate(desc, 7000); + desc63_set_max_overall_smoothing_buffer(desc, 1000); +} + /* --- Descriptor 0x64: data_broadcast_descriptor */ /* --- Descriptor 0x65: scrambling_descriptor */ /* --- Descriptor 0x66: data_broadcast_id_descriptor */ @@ -2286,7 +2293,7 @@ static void generate_sit(void) { desc_loop = sit_get_descs(sit); desc = descs_get_desc(desc_loop, desc_counter++); - build_desc05(desc); + build_desc63(desc); // 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 54a2fad..bf982bc 100644 --- a/examples/dvb_print_si.output.txt +++ b/examples/dvb_print_si.output.txt @@ -267,7 +267,7 @@ end DIT new SIT version=0 end SIT new SIT version=1 - - desc 05 registration identifier=TEST + - desc 63 partial_transport_stream peak_rate=5000 min_overall_smoothing_rate=7000 max_overall_smoothing_buffer=1000 * SERVICE sid=20000 running_status=1 - desc 05 registration identifier=TEST - desc 05 registration identifier=TEST diff --git a/examples/dvb_print_si.output.xml b/examples/dvb_print_si.output.xml index 13dec31..0df8a53 100644 --- a/examples/dvb_print_si.output.xml +++ b/examples/dvb_print_si.output.xml @@ -466,8 +466,8 @@ - - + + diff --git a/mpeg/psi/descs_print.h b/mpeg/psi/descs_print.h index 8a05114..a781d03 100644 --- a/mpeg/psi/descs_print.h +++ b/mpeg/psi/descs_print.h @@ -163,6 +163,7 @@ static inline void descl_print(uint8_t *p_descl, uint16_t i_length, CASE_DESC(60) CASE_DESC(61) CASE_DESC(62) + CASE_DESC(63) CASE_DESC(6a) #undef CASE_DESC