diff --git a/README b/README index f09b7dd..c9b0002 100644 --- a/README +++ b/README @@ -129,6 +129,7 @@ Supported DVB descriptors * Descriptor 0x5d: Multilingual service name descriptor * Descriptor 0x5e: Multilingual component descriptor * Descriptor 0x5f: Private data specifier descriptor + * Descriptor 0x60: Service move descriptor * Descriptor 0x6a: AC-3 descriptor [p] Legend: diff --git a/TODO b/TODO index 7dc0415..d017d63 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 0x60: service_move_descriptor - Descriptor 0x61: short_smoothing_buffer_descriptor - Descriptor 0x62: frequency_list_descriptor - Descriptor 0x63: partial_transport_stream_descriptor diff --git a/dvb/si/desc_60.h b/dvb/si/desc_60.h new file mode 100644 index 0000000..d3c2e54 --- /dev/null +++ b/dvb/si/desc_60.h @@ -0,0 +1,117 @@ +/***************************************************************************** + * desc_60.h: ETSI EN 300 468 Descriptor 0x60: Service move 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_MPEG_DESC_60_H__ +#define __BITSTREAM_MPEG_DESC_60_H__ + +#include +#include + +#ifdef __cplusplus +extern "C" +{ +#endif + +/***************************************************************************** + * Descriptor 0x60: Service move descriptor + *****************************************************************************/ +#define DESC60_HEADER_SIZE (DESC_HEADER_SIZE + 6) + +static inline void desc60_init(uint8_t *p_desc) +{ + desc_set_tag(p_desc, 0x60); + desc_set_length(p_desc, DESC60_HEADER_SIZE - DESC_HEADER_SIZE); +} + +static inline uint16_t desc60_get_new_onid(const uint8_t *p_desc) +{ + return (p_desc[2] << 8) | p_desc[3]; +} + +static inline void desc60_set_new_onid(uint8_t *p_desc, uint16_t i_new_onid) +{ + p_desc[2] = (i_new_onid >> 8) & 0xff; + p_desc[3] = i_new_onid & 0xff; +} + +static inline uint16_t desc60_get_new_tsid(const uint8_t *p_desc) +{ + return (p_desc[4] << 8) | p_desc[5]; +} + +static inline void desc60_set_new_tsid(uint8_t *p_desc, uint16_t i_new_tsid) +{ + p_desc[4] = (i_new_tsid >> 8) & 0xff; + p_desc[5] = i_new_tsid & 0xff; +} + +static inline uint16_t desc60_get_new_service_id(const uint8_t *p_desc) +{ + return (p_desc[6] << 8) | p_desc[7]; +} + +static inline void desc60_set_new_service_id(uint8_t *p_desc, uint16_t i_new_service_id) +{ + p_desc[6] = (i_new_service_id >> 8) & 0xff; + p_desc[7] = i_new_service_id & 0xff; +} + +static inline bool desc60_validate(const uint8_t *p_desc) +{ + return desc_get_length(p_desc) >= DESC60_HEADER_SIZE - DESC_HEADER_SIZE; +} + +static inline void desc60_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, "", + desc60_get_new_onid(p_desc), + desc60_get_new_tsid(p_desc), + desc60_get_new_service_id(p_desc) + ); + break; + default: + pf_print(opaque, " - desc 60 service_move new_onid=%u new_tsid=%u new_service_id=%u", + desc60_get_new_onid(p_desc), + desc60_get_new_tsid(p_desc), + desc60_get_new_service_id(p_desc) + ); + } +} + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/dvb/si/descs_list.h b/dvb/si/descs_list.h index 2f4cfac..2ca45c5 100644 --- a/dvb/si/descs_list.h +++ b/dvb/si/descs_list.h @@ -66,6 +66,7 @@ #include #include #include +#include #include #include #include diff --git a/examples/dvb_gen_si.c b/examples/dvb_gen_si.c index 76ab29c..4c82f2e 100644 --- a/examples/dvb_gen_si.c +++ b/examples/dvb_gen_si.c @@ -1000,7 +1000,14 @@ static void build_desc5f(uint8_t *desc) { desc5f_set_specifier(desc, 0xaabbccdd); } -/* --- Descriptor 0x60: service_move_descriptor */ +/* DVB Descriptor 0x60: Service move descriptor */ +static void build_desc60(uint8_t *desc) { + desc60_init(desc); + desc60_set_new_onid(desc, 10000); + desc60_set_new_tsid(desc, 15000); + desc60_set_new_service_id(desc, 20000); +} + /* --- Descriptor 0x61: short_smoothing_buffer_descriptor */ /* --- Descriptor 0x62: frequency_list_descriptor */ /* --- Descriptor 0x63: partial_transport_stream_descriptor */ @@ -2072,6 +2079,9 @@ static void generate_pmt(void) { desc = descs_get_desc(desc_loop, desc_counter++); build_desc56(desc); + desc = descs_get_desc(desc_loop, desc_counter++); + build_desc60(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/examples/dvb_print_si.output.txt b/examples/dvb_print_si.output.txt index 90ed4b8..e0952a9 100644 --- a/examples/dvb_print_si.output.txt +++ b/examples/dvb_print_si.output.txt @@ -232,6 +232,7 @@ new PMT program=20000 version=1 pcrpid=110 - desc 56 telx language=eng type=0x1 type_txt="Initial teletext page" mag=3 page=0x255x - desc 56 telx language=bul type=0x2 type_txt="Teletext subtitle page" mag=2 page=0x127x - desc 56 telx language=fre type=0x3 type_txt="Additional information page" mag=1 page=0x64x + - desc 60 service_move new_onid=10000 new_tsid=15000 new_service_id=20000 * ES pid=124 streamtype=0x06 streamtype_txt="13818-1 PES private data" - desc 59 subtitling language=eng type=0x1 composition=2 ancillary=3 - desc 59 subtitling language=bul type=0x2 composition=3 ancillary=4 diff --git a/examples/dvb_print_si.output.xml b/examples/dvb_print_si.output.xml index e0f34a2..e2f1987 100644 --- a/examples/dvb_print_si.output.xml +++ b/examples/dvb_print_si.output.xml @@ -398,6 +398,9 @@ + + + diff --git a/mpeg/psi/descs_print.h b/mpeg/psi/descs_print.h index bf7b98c..a789ce5 100644 --- a/mpeg/psi/descs_print.h +++ b/mpeg/psi/descs_print.h @@ -160,6 +160,7 @@ static inline void descl_print(uint8_t *p_descl, uint16_t i_length, CASE_DESC_ICONV(5c) CASE_DESC_ICONV(5d) CASE_DESC_ICONV(5e) + CASE_DESC(60) CASE_DESC(6a) #undef CASE_DESC