diff --git a/README b/README index cdcdc54..f20859e 100644 --- a/README +++ b/README @@ -80,6 +80,7 @@ Supported MPEG descriptors * Descriptor 0x12: IBP descriptor * Descriptor 0x1b: MPEG-4 video descriptor * Descriptor 0x1c: MPEG-4 audio descriptor + * Descriptor 0x1d: IOD_descriptor Supported DVB descriptors diff --git a/TODO b/TODO index 2ef8d97..72c5443 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 0x1d IOD_descriptor - Descriptor 0x1e SL_descriptor - Descriptor 0x1f FMC_descriptor - Descriptor 0x20 external_ES_ID_descriptor diff --git a/examples/dvb_gen_si.c b/examples/dvb_gen_si.c index f424eff..4d186b8 100644 --- a/examples/dvb_gen_si.c +++ b/examples/dvb_gen_si.c @@ -237,6 +237,14 @@ static void build_desc1c(uint8_t *desc) { desc1c_set_mpeg4_audio_profile_and_level(desc, 0x13); } +/* MPEG Descriptor 0x1d: IOD descriptor */ +static void build_desc1d(uint8_t *desc) { + desc1d_init(desc); + desc1d_set_scope(desc, 0x01); + desc1d_set_iod_label(desc, 0x23); + desc1d_set_iod(desc, 0x45); +} + /* ========================================================================= * DVB defined descriptors * ========================================================================= */ @@ -1581,6 +1589,25 @@ static void generate_pmt(void) { descs_set_length(desc_loop, desc - desc_loop - DESCS_HEADER_SIZE); } + pmt_n = pmt_get_es(pmt, pmt_n_counter++); + pmtn_init(pmt_n); + pmtn_set_streamtype(pmt_n, 0x06); + pmtn_set_pid(pmt_n, pmt_pid + 25); + pmtn_set_desclength(pmt_n, 0); + { + // Add descriptors to transport_stream_n + desc_counter = 0; + 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_desc1d(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); + } + // Set transport_stream_loop length pmt_n = pmt_get_es(pmt, pmt_n_counter); // Get last service pmt_set_length(pmt, pmt_n - pmt_get_es(pmt, 0) + pmt_get_desclength(pmt)); diff --git a/mpeg/psi/desc_1d.h b/mpeg/psi/desc_1d.h new file mode 100644 index 0000000..b5b40e7 --- /dev/null +++ b/mpeg/psi/desc_1d.h @@ -0,0 +1,106 @@ +/***************************************************************************** + * desc_1d.h: ISO/IEC 13818-1 Descriptor 0x1d (IOD 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_1D_H__ +#define __BITSTREAM_MPEG_DESC_1D_H__ + +#include +#include + +#ifdef __cplusplus +extern "C" +{ +#endif + +/***************************************************************************** + * Descriptor 0x1d (IOD descriptor) + *****************************************************************************/ +#define DESC1D_HEADER_SIZE (DESC_HEADER_SIZE + 3) + +static inline void desc1d_init(uint8_t *p_desc) +{ + desc_set_tag(p_desc, 0x1d); + desc_set_length(p_desc, DESC1D_HEADER_SIZE - DESC_HEADER_SIZE); +} + +static inline bool desc1d_validate(const uint8_t *p_desc) +{ + return desc_get_length(p_desc) >= DESC1D_HEADER_SIZE - DESC_HEADER_SIZE; +} + +static inline uint8_t desc1d_get_scope(const uint8_t *p_desc) { + return p_desc[2]; +} + +static inline void desc1d_set_scope(uint8_t *p_desc, uint8_t i_scope) { + p_desc[2] = i_scope; +} + +static inline uint8_t desc1d_get_iod_label(const uint8_t *p_desc) { + return p_desc[3]; +} + +static inline void desc1d_set_iod_label(uint8_t *p_desc, uint8_t i_iod_label) { + p_desc[3] = i_iod_label; +} + +static inline uint8_t desc1d_get_iod(const uint8_t *p_desc) { + return p_desc[4]; +} + +static inline void desc1d_set_iod(uint8_t *p_desc, uint8_t i_iod) { + p_desc[4] = i_iod; +} + +static inline void desc1d_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, "", + desc1d_get_scope(p_desc), + desc1d_get_iod_label(p_desc), + desc1d_get_iod(p_desc)); + break; + default: + pf_print(opaque," - desc 1d iod scope=0x%02x iod_label=0x%02x iod=0x%02x", + desc1d_get_scope(p_desc), + desc1d_get_iod_label(p_desc), + desc1d_get_iod(p_desc)); + } +} + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/mpeg/psi/descs_list.h b/mpeg/psi/descs_list.h index 421d7ca..ddd9caf 100644 --- a/mpeg/psi/descs_list.h +++ b/mpeg/psi/descs_list.h @@ -53,5 +53,6 @@ #include #include #include +#include #endif diff --git a/mpeg/psi/descs_print.h b/mpeg/psi/descs_print.h index 67d3746..e076fb4 100644 --- a/mpeg/psi/descs_print.h +++ b/mpeg/psi/descs_print.h @@ -119,6 +119,7 @@ static inline void descl_print(uint8_t *p_descl, uint16_t i_length, CASE_DESC(12) CASE_DESC(1b) CASE_DESC(1c) + CASE_DESC(1d) CASE_DESC_ICONV(40) CASE_DESC(41) CASE_DESC(43)