From 29ddb6e6d91a7c9fe612560e4086765087c17c92 Mon Sep 17 00:00:00 2001 From: Georgi Chorbadzhiyski Date: Tue, 4 Oct 2011 17:47:04 +0300 Subject: [PATCH] mpeg/psi: Add support for descriptor 0x1e (SL descriptor). --- README | 1 + TODO | 1 - examples/dvb_gen_si.c | 9 +++++ mpeg/psi/desc_1e.h | 87 ++++++++++++++++++++++++++++++++++++++++++ mpeg/psi/descs_list.h | 1 + mpeg/psi/descs_print.h | 1 + 6 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 mpeg/psi/desc_1e.h diff --git a/README b/README index f20859e..42ac95e 100644 --- a/README +++ b/README @@ -81,6 +81,7 @@ Supported MPEG descriptors * Descriptor 0x1b: MPEG-4 video descriptor * Descriptor 0x1c: MPEG-4 audio descriptor * Descriptor 0x1d: IOD_descriptor + * Descriptor 0x1e: SL_descriptor Supported DVB descriptors diff --git a/TODO b/TODO index 72c5443..f7039ed 100644 --- a/TODO +++ b/TODO @@ -2,7 +2,6 @@ TODO items for biTStream. The items are not ordered by importance so if you like something just do it and send a patch. - Add support (parser, generator, example) for these MPEG descriptors: - - Descriptor 0x1e SL_descriptor - Descriptor 0x1f FMC_descriptor - Descriptor 0x20 external_ES_ID_descriptor - Descriptor 0x21 MuxCode_descriptor diff --git a/examples/dvb_gen_si.c b/examples/dvb_gen_si.c index 4d186b8..a8696dd 100644 --- a/examples/dvb_gen_si.c +++ b/examples/dvb_gen_si.c @@ -245,6 +245,12 @@ static void build_desc1d(uint8_t *desc) { desc1d_set_iod(desc, 0x45); } +/* MPEG Descriptor 0x1e: SL descriptor */ +static void build_desc1e(uint8_t *desc) { + desc1e_init(desc); + desc1e_set_es_id(desc, 0x1234); +} + /* ========================================================================= * DVB defined descriptors * ========================================================================= */ @@ -1600,6 +1606,9 @@ static void generate_pmt(void) { desc_loop = pmtn_get_descs(pmt_n); descs_set_length(desc_loop, DESCS_MAX_SIZE); // This is needed so descs_get_desc(x, n) works + desc = descs_get_desc(desc_loop, desc_counter++); + build_desc1e(desc); + desc = descs_get_desc(desc_loop, desc_counter++); build_desc1d(desc); diff --git a/mpeg/psi/desc_1e.h b/mpeg/psi/desc_1e.h new file mode 100644 index 0000000..8b0b4a3 --- /dev/null +++ b/mpeg/psi/desc_1e.h @@ -0,0 +1,87 @@ +/***************************************************************************** + * desc_1e.h: ISO/IEC 13818-1 Descriptor 0x1e (SL 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: + * - ISO/IEC 13818-1:2007(E) (MPEG-2 Systems) + */ + +#ifndef __BITSTREAM_MPEG_DESC_1e_H__ +#define __BITSTREAM_MPEG_DESC_1e_H__ + +#include +#include + +#ifdef __cplusplus +extern "C" +{ +#endif + +/***************************************************************************** + * Descriptor 0x1e (SL descriptor) + *****************************************************************************/ +#define DESC1E_HEADER_SIZE (DESC_HEADER_SIZE + 2) + +static inline void desc1e_init(uint8_t *p_desc) +{ + desc_set_tag(p_desc, 0x1e); + desc_set_length(p_desc, DESC1E_HEADER_SIZE - DESC_HEADER_SIZE); +} + +static inline bool desc1e_validate(const uint8_t *p_desc) +{ + return desc_get_length(p_desc) >= DESC1E_HEADER_SIZE - DESC_HEADER_SIZE; +} + +static inline uint16_t desc1e_get_es_id(const uint8_t *p_desc) { + return (p_desc[2] << 8) | p_desc[3]; +} + +static inline void desc1e_set_es_id(uint8_t *p_desc, uint16_t i_es_id) { + p_desc[2] = (i_es_id >> 8) & 0xff; + p_desc[3] = i_es_id & 0xff; +} + +static inline void desc1e_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, "", + desc1e_get_es_id(p_desc)); + break; + default: + pf_print(opaque," - desc 1e sl es_id=0x%04x", + desc1e_get_es_id(p_desc)); + } +} + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/mpeg/psi/descs_list.h b/mpeg/psi/descs_list.h index ddd9caf..e750ce3 100644 --- a/mpeg/psi/descs_list.h +++ b/mpeg/psi/descs_list.h @@ -54,5 +54,6 @@ #include #include #include +#include #endif diff --git a/mpeg/psi/descs_print.h b/mpeg/psi/descs_print.h index e076fb4..292f667 100644 --- a/mpeg/psi/descs_print.h +++ b/mpeg/psi/descs_print.h @@ -120,6 +120,7 @@ static inline void descl_print(uint8_t *p_descl, uint16_t i_length, CASE_DESC(1b) CASE_DESC(1c) CASE_DESC(1d) + CASE_DESC(1e) CASE_DESC_ICONV(40) CASE_DESC(41) CASE_DESC(43)