From fd8f386f475aa84f72a2dc7da008e93fd7afbf7d Mon Sep 17 00:00:00 2001 From: Georgi Chorbadzhiyski Date: Fri, 7 Oct 2011 14:23:32 +0300 Subject: [PATCH] dvb/si: Add support for descriptor 0x4c (Time shifted service descriptor). --- README | 1 + TODO | 1 - dvb/si/desc_4c.h | 89 ++++++++++++++++++++++++++++++++++++++++++ dvb/si/descs_list.h | 1 + examples/dvb_gen_si.c | 10 ++++- mpeg/psi/descs_print.h | 1 + 6 files changed, 101 insertions(+), 2 deletions(-) create mode 100644 dvb/si/desc_4c.h diff --git a/README b/README index 0c78732..5965e8d 100644 --- a/README +++ b/README @@ -109,6 +109,7 @@ Supported DVB descriptors * Descriptor 0x49: Country availability descriptor * Descriptor 0x4a: Linkage descriptor (partially implemented) * Descriptor 0x4b: NVOD reference descriptor + * Descriptor 0x4c: Time shifted service descriptor * Descriptor 0x4d: Short event descriptor * Descriptor 0x4e: Extended event descriptor * Descriptor 0x52: Stream identifier descriptor diff --git a/TODO b/TODO index 82c693f..81728be 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 0x4c: time_shifted_service_descriptor - Descriptor 0x4f: time_shifted_event_descriptor - Descriptor 0x50: component_descriptor - Descriptor 0x51: mosaic_descriptor diff --git a/dvb/si/desc_4c.h b/dvb/si/desc_4c.h new file mode 100644 index 0000000..c587cd8 --- /dev/null +++ b/dvb/si/desc_4c.h @@ -0,0 +1,89 @@ +/***************************************************************************** + * desc_4c.h: ETSI EN 300 468 Descriptor 0x4c: (Time shifted service 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_4C_H__ +#define __BITSTREAM_MPEG_DESC_4C_H__ + +#include +#include + +#ifdef __cplusplus +extern "C" +{ +#endif + +/***************************************************************************** + * Descriptor 0x4c: Time shifted service descriptor + *****************************************************************************/ +#define DESC4C_HEADER_SIZE (DESC_HEADER_SIZE + 2) + +static inline void desc4c_init(uint8_t *p_desc) +{ + desc_set_tag(p_desc, 0x4c); + desc_set_length(p_desc, DESC4C_HEADER_SIZE - DESC_HEADER_SIZE); +} + +static inline uint16_t desc4c_get_reference_sid(const uint8_t *p_desc) +{ + return (p_desc[2] << 8) | p_desc[3]; +} + +static inline void desc4c_set_reference_sid(uint8_t *p_desc, uint16_t i_reference_sid) +{ + p_desc[2] = (i_reference_sid >> 8) & 0xff; + p_desc[3] = i_reference_sid & 0xff; +} + +static inline bool desc4c_validate(const uint8_t *p_desc) +{ + return desc_get_length(p_desc) >= DESC4C_HEADER_SIZE - DESC_HEADER_SIZE; +} + +static inline void desc4c_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, "", + desc4c_get_reference_sid(p_desc)); + break; + default: + pf_print(opaque, " - desc 4c time_shifted_service reference_sid=%u", + desc4c_get_reference_sid(p_desc)); + } +} + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/dvb/si/descs_list.h b/dvb/si/descs_list.h index ae81ed7..74b84f6 100644 --- a/dvb/si/descs_list.h +++ b/dvb/si/descs_list.h @@ -46,6 +46,7 @@ #include #include #include +#include #include #include #include diff --git a/examples/dvb_gen_si.c b/examples/dvb_gen_si.c index 3ca1a03..a266612 100644 --- a/examples/dvb_gen_si.c +++ b/examples/dvb_gen_si.c @@ -564,7 +564,12 @@ static void build_desc4b(uint8_t *desc, bool b_available) { desc_set_length(desc, ref_n - desc - DESC_HEADER_SIZE); } -/* --- Descriptor 0x4c: time_shifted_service_descriptor */ +/* DVB Descriptor 0x4c: time_shifted_service_descriptor */ +static void build_desc4c(uint8_t *desc) { + desc4c_init(desc); + desc4c_set_reference_sid(desc, sid + 1000); +} + /* DVB Descriptor 0x4d: Short event descriptor */ static void build_desc4d(uint8_t *desc) { char *event_name = "Major TV event"; @@ -1332,6 +1337,9 @@ static void generate_sdt(void) { desc = descs_get_desc(desc_loop, desc_counter++); build_desc48(desc); + desc = descs_get_desc(desc_loop, desc_counter++); + build_desc4c(desc); + desc = descs_get_desc(desc_loop, desc_counter++); build_desc5f(desc); diff --git a/mpeg/psi/descs_print.h b/mpeg/psi/descs_print.h index 983e02a..60e8ae2 100644 --- a/mpeg/psi/descs_print.h +++ b/mpeg/psi/descs_print.h @@ -141,6 +141,7 @@ static inline void descl_print(uint8_t *p_descl, uint16_t i_length, CASE_DESC(49) CASE_DESC(4a) CASE_DESC(4b) + CASE_DESC(4c) CASE_DESC_ICONV(4d) CASE_DESC_ICONV(4e) CASE_DESC(52)