From 10d1a83c2d4cff13d217c1b4071811d97c1f3c6b Mon Sep 17 00:00:00 2001 From: Georgi Chorbadzhiyski Date: Fri, 7 Oct 2011 14:32:23 +0300 Subject: [PATCH] dvb/si: Add support for descriptor 0x4f (Time shifted event descriptor). --- README | 1 + TODO | 1 - dvb/si/desc_4f.h | 104 +++++++++++++++++++++++++++++++++++++++++ dvb/si/descs_list.h | 1 + examples/dvb_gen_si.c | 11 ++++- mpeg/psi/descs_print.h | 1 + 6 files changed, 117 insertions(+), 2 deletions(-) create mode 100644 dvb/si/desc_4f.h diff --git a/README b/README index 5965e8d..ffccbef 100644 --- a/README +++ b/README @@ -112,6 +112,7 @@ Supported DVB descriptors * Descriptor 0x4c: Time shifted service descriptor * Descriptor 0x4d: Short event descriptor * Descriptor 0x4e: Extended event descriptor + * Descriptor 0x4f: Time shifted event descriptor * Descriptor 0x52: Stream identifier descriptor * Descriptor 0x54: Content descriptor * Descriptor 0x55: Parental rating descriptor diff --git a/TODO b/TODO index 81728be..7eb2528 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 0x4f: time_shifted_event_descriptor - Descriptor 0x50: component_descriptor - Descriptor 0x51: mosaic_descriptor - Descriptor 0x53: CA_identifier_descriptor diff --git a/dvb/si/desc_4f.h b/dvb/si/desc_4f.h new file mode 100644 index 0000000..087c153 --- /dev/null +++ b/dvb/si/desc_4f.h @@ -0,0 +1,104 @@ +/***************************************************************************** + * desc_4f.h: ETSI EN 300 468 Descriptor 0x4f: (Time shifted event 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_4F_H__ +#define __BITSTREAM_MPEG_DESC_4F_H__ + +#include +#include + +#ifdef __cplusplus +extern "C" +{ +#endif + +/***************************************************************************** + * Descriptor 0x4f: Time shifted event descriptor + *****************************************************************************/ +#define DESC4F_HEADER_SIZE (DESC_HEADER_SIZE + 4) + +static inline void desc4f_init(uint8_t *p_desc) +{ + desc_set_tag(p_desc, 0x4f); + desc_set_length(p_desc, DESC4F_HEADER_SIZE - DESC_HEADER_SIZE); +} + +static inline uint16_t desc4f_get_reference_sid(const uint8_t *p_desc) +{ + return (p_desc[2] << 8) | p_desc[3]; +} + +static inline void desc4f_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 uint16_t desc4f_get_reference_event_id(const uint8_t *p_desc) +{ + return (p_desc[4] << 8) | p_desc[5]; +} + +static inline void desc4f_set_reference_event_id(uint8_t *p_desc, uint16_t i_reference_event_id) +{ + p_desc[4] = (i_reference_event_id >> 8) & 0xff; + p_desc[5] = i_reference_event_id & 0xff; +} + +static inline bool desc4f_validate(const uint8_t *p_desc) +{ + return desc_get_length(p_desc) >= DESC4F_HEADER_SIZE - DESC_HEADER_SIZE; +} + +static inline void desc4f_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, "", + desc4f_get_reference_sid(p_desc), + desc4f_get_reference_event_id(p_desc) + ); + break; + default: + pf_print(opaque, " - desc 4f time_shifted_service reference_sid=%u reference_event_id=%u", + desc4f_get_reference_sid(p_desc), + desc4f_get_reference_event_id(p_desc) + ); + } +} + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/dvb/si/descs_list.h b/dvb/si/descs_list.h index 74b84f6..29cbade 100644 --- a/dvb/si/descs_list.h +++ b/dvb/si/descs_list.h @@ -49,6 +49,7 @@ #include #include #include +#include #include #include #include diff --git a/examples/dvb_gen_si.c b/examples/dvb_gen_si.c index a266612..349d7ff 100644 --- a/examples/dvb_gen_si.c +++ b/examples/dvb_gen_si.c @@ -625,7 +625,13 @@ static void build_desc4e(uint8_t *desc) { desc4e_set_length(desc); } -/* --- Descriptor 0x4f: time_shifted_event_descriptor */ +/* DVB Descriptor 0x4f: time_shifted_event_descriptor */ +static void build_desc4f(uint8_t *desc) { + desc4f_init(desc); + desc4f_set_reference_sid(desc, sid + 2000); + desc4f_set_reference_event_id(desc, event_id + 2000); +} + /* --- Descriptor 0x50: component_descriptor */ /* --- Descriptor 0x51: mosaic_descriptor */ /* DVB Descriptor 0x52: Stream identifier descriptor */ @@ -1485,6 +1491,9 @@ static void generate_eit(void) { desc = descs_get_desc(desc_loop, desc_counter++); build_desc4d(desc); + desc = descs_get_desc(desc_loop, desc_counter++); + build_desc4f(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/mpeg/psi/descs_print.h b/mpeg/psi/descs_print.h index 60e8ae2..0ab4c65 100644 --- a/mpeg/psi/descs_print.h +++ b/mpeg/psi/descs_print.h @@ -144,6 +144,7 @@ static inline void descl_print(uint8_t *p_descl, uint16_t i_length, CASE_DESC(4c) CASE_DESC_ICONV(4d) CASE_DESC_ICONV(4e) + CASE_DESC(4f) CASE_DESC(52) CASE_DESC(54) CASE_DESC(55)