diff --git a/README b/README index 9e841c2..cdcdc54 100644 --- a/README +++ b/README @@ -79,6 +79,7 @@ Supported MPEG descriptors * Descriptor 0x11: STD descriptor * Descriptor 0x12: IBP descriptor * Descriptor 0x1b: MPEG-4 video descriptor + * Descriptor 0x1c: MPEG-4 audio descriptor Supported DVB descriptors diff --git a/TODO b/TODO index 6a5342e..2ef8d97 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 0x1c MPEG-4_audio_descriptor - Descriptor 0x1d IOD_descriptor - Descriptor 0x1e SL_descriptor - Descriptor 0x1f FMC_descriptor diff --git a/examples/dvb_gen_si.c b/examples/dvb_gen_si.c index 5e47b95..f424eff 100644 --- a/examples/dvb_gen_si.c +++ b/examples/dvb_gen_si.c @@ -231,6 +231,12 @@ static void build_desc1b(uint8_t *desc) { desc1b_set_mpeg4_visual_profile_and_level(desc, 0x12); } +/* MPEG Descriptor 0x1c: MPEG4 Audio descriptor */ +static void build_desc1c(uint8_t *desc) { + desc1c_init(desc); + desc1c_set_mpeg4_audio_profile_and_level(desc, 0x13); +} + /* ========================================================================= * DVB defined descriptors * ========================================================================= */ @@ -1510,6 +1516,9 @@ static void generate_pmt(void) { desc = descs_get_desc(desc_loop, desc_counter++); build_desc52(desc); + desc = descs_get_desc(desc_loop, desc_counter++); + build_desc1c(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/desc_1c.h b/mpeg/psi/desc_1c.h new file mode 100644 index 0000000..e2a6dc9 --- /dev/null +++ b/mpeg/psi/desc_1c.h @@ -0,0 +1,78 @@ +/***************************************************************************** + * desc_1c.h: ISO/IEC 13818-1 Descriptor 0x1c (MPEG-4 audio 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_1C_H__ +#define __BITSTREAM_MPEG_DESC_1C_H__ + +#include +#include +#include + +#ifdef __cplusplus +extern "C" +{ +#endif + +/***************************************************************************** + * Descriptor 0x1c (MPEG-4 audio descriptor) + *****************************************************************************/ +#define DESC1C_HEADER_SIZE (DESC_HEADER_SIZE + 1) + +static inline void desc1c_init(uint8_t *p_desc) +{ + desc_set_tag(p_desc, 0x1c); + desc_set_length(p_desc, DESC1C_HEADER_SIZE - DESC_HEADER_SIZE); +} + +#define desc1c_validate desc1b_validate +#define desc1c_get_mpeg4_audio_profile_and_level desc1b_get_mpeg4_visual_profile_and_level +#define desc1c_set_mpeg4_audio_profile_and_level desc1b_set_mpeg4_visual_profile_and_level + +static inline void desc1c_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, "", + desc1c_get_mpeg4_audio_profile_and_level(p_desc)); + break; + default: + pf_print(opaque," - desc 1c mpeg4_audio audio_profile_and_level=0x%02x", + desc1c_get_mpeg4_audio_profile_and_level(p_desc)); + } +} + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/mpeg/psi/descs_list.h b/mpeg/psi/descs_list.h index 13e533c..421d7ca 100644 --- a/mpeg/psi/descs_list.h +++ b/mpeg/psi/descs_list.h @@ -52,5 +52,6 @@ #include #include #include +#include #endif diff --git a/mpeg/psi/descs_print.h b/mpeg/psi/descs_print.h index ea86a20..67d3746 100644 --- a/mpeg/psi/descs_print.h +++ b/mpeg/psi/descs_print.h @@ -118,6 +118,7 @@ static inline void descl_print(uint8_t *p_descl, uint16_t i_length, CASE_DESC(11) CASE_DESC(12) CASE_DESC(1b) + CASE_DESC(1c) CASE_DESC_ICONV(40) CASE_DESC(41) CASE_DESC(43)