diff --git a/README b/README index c9d4894..d3586f6 100644 --- a/README +++ b/README @@ -134,6 +134,7 @@ Supported DVB descriptors * Descriptor 0x62: Frequency list descriptor * Descriptor 0x63: Partial transport stream descriptor * Descriptor 0x64: Data broadcast descriptor + * Descriptor 0x65: Scrambling descriptor * Descriptor 0x6a: AC-3 descriptor [p] Legend: diff --git a/TODO b/TODO index 6b32671..0a60243 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 0x65: scrambling_descriptor - Descriptor 0x66: data_broadcast_id_descriptor - Descriptor 0x67: transport_stream_descriptor - Descriptor 0x68: DSNG_descriptor diff --git a/dvb/si/desc_65.h b/dvb/si/desc_65.h new file mode 100644 index 0000000..1a55815 --- /dev/null +++ b/dvb/si/desc_65.h @@ -0,0 +1,105 @@ +/***************************************************************************** + * desc_65.h: ETSI EN 300 468 Descriptor 0x65: Scrambling 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_65_H__ +#define __BITSTREAM_DVB_DESC_65_H__ + +#include +#include + +#ifdef __cplusplus +extern "C" +{ +#endif + +/***************************************************************************** + * Descriptor 0x65: Scrambling descriptor + *****************************************************************************/ +#define DESC65_HEADER_SIZE (DESC_HEADER_SIZE + 1) + +static inline void desc65_init(uint8_t *p_desc) +{ + desc_set_tag(p_desc, 0x65); + desc_set_length(p_desc, DESC65_HEADER_SIZE - DESC_HEADER_SIZE); +} + +static inline uint8_t desc65_get_scrambling_mode(const uint8_t *p_desc) +{ + return p_desc[2]; +} + +static inline void desc65_set_scrambling_mode(uint8_t *p_desc, uint8_t i_scrambling_mode) +{ + p_desc[2] = i_scrambling_mode; +} + +static inline const char *desc65_get_scrambling_mode_txt(uint8_t i_mode) +{ + return i_mode == 0x00 ? "Reserved" : + i_mode == 0x01 ? "DVB-CSA1" : + i_mode == 0x02 ? "DVB-CSA2" : + i_mode == 0x03 ? "DVB-CSA3 in standart mode" : + i_mode == 0x04 ? "DVB-CSA3 in minimally enhanced mode" : + i_mode == 0x05 ? "DVB-CSA3 in fully enhanced mode" : + i_mode >= 0x06 && i_mode <= 0x6f ? "Reserved" : + i_mode >= 0x70 && i_mode <= 0x7f ? "ATIS defined" : + i_mode >= 0x80 && i_mode <= 0xfe ? "User defined" : "Reserved"; +} + +static inline bool desc65_validate(const uint8_t *p_desc) +{ + return desc_get_length(p_desc) >= DESC65_HEADER_SIZE - DESC_HEADER_SIZE; +} + +static inline void desc65_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, "", + desc65_get_scrambling_mode(p_desc), + desc65_get_scrambling_mode_txt(desc65_get_scrambling_mode(p_desc)) + ); + break; + default: + pf_print(opaque, " - desc 65 scrambling scrambling_mode=0x%02x scrambling_mode_txt=\"%s\"", + desc65_get_scrambling_mode(p_desc), + desc65_get_scrambling_mode_txt(desc65_get_scrambling_mode(p_desc)) + ); + } +} + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/dvb/si/descs_list.h b/dvb/si/descs_list.h index cbdd5a7..f9bf39d 100644 --- a/dvb/si/descs_list.h +++ b/dvb/si/descs_list.h @@ -71,6 +71,7 @@ #include #include #include +#include #include #include #include diff --git a/examples/dvb_gen_si.c b/examples/dvb_gen_si.c index 6fbf59d..0a16f6f 100644 --- a/examples/dvb_gen_si.c +++ b/examples/dvb_gen_si.c @@ -1064,7 +1064,12 @@ static void build_desc64(uint8_t *desc) { desc64_set_length(desc); } -/* --- Descriptor 0x65: scrambling_descriptor */ +/* DVB Descriptor 0x65: Scrambling descriptor */ +static void build_desc65(uint8_t *desc) { + desc65_init(desc); + desc65_set_scrambling_mode(desc, 0x01); +} + /* --- Descriptor 0x66: data_broadcast_id_descriptor */ /* --- Descriptor 0x67: transport_stream_descriptor */ /* --- Descriptor 0x68: DSNG_descriptor */ @@ -2143,6 +2148,9 @@ static void generate_pmt(void) { desc = descs_get_desc(desc_loop, desc_counter++); build_desc60(desc); + desc = descs_get_desc(desc_loop, desc_counter++); + build_desc65(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 f8e22fa..ddfd0db 100644 --- a/examples/dvb_print_si.output.txt +++ b/examples/dvb_print_si.output.txt @@ -240,6 +240,7 @@ new PMT program=20000 version=1 pcrpid=110 - 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 + - desc 65 scrambling scrambling_mode=0x01 scrambling_mode_txt="DVB-CSA1" * 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 6053e95..ff171b0 100644 --- a/examples/dvb_print_si.output.xml +++ b/examples/dvb_print_si.output.xml @@ -414,6 +414,9 @@ + + + diff --git a/mpeg/psi/descs_print.h b/mpeg/psi/descs_print.h index 1a88cea..2b41083 100644 --- a/mpeg/psi/descs_print.h +++ b/mpeg/psi/descs_print.h @@ -165,6 +165,7 @@ static inline void descl_print(uint8_t *p_descl, uint16_t i_length, CASE_DESC(62) CASE_DESC(63) CASE_DESC_ICONV(64) + CASE_DESC(65) CASE_DESC(6a) #undef CASE_DESC