From 269e23a3e58a4ec80575389a8459adcef7d62d3b Mon Sep 17 00:00:00 2001 From: Georgi Chorbadzhiyski Date: Tue, 4 Oct 2011 17:07:04 +0300 Subject: [PATCH] mpeg/psi: Add support for descriptor 0x1b (MPEG-4 video descriptor). --- README | 1 + TODO | 1 - examples/dvb_gen_si.c | 9 +++++ mpeg/psi/desc_1b.h | 86 ++++++++++++++++++++++++++++++++++++++++++ mpeg/psi/descs_list.h | 1 + mpeg/psi/descs_print.h | 1 + 6 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 mpeg/psi/desc_1b.h diff --git a/README b/README index 5a62ee2..9e841c2 100644 --- a/README +++ b/README @@ -78,6 +78,7 @@ Supported MPEG descriptors * Descriptor 0x10: Smoothing buffer descriptor * Descriptor 0x11: STD descriptor * Descriptor 0x12: IBP descriptor + * Descriptor 0x1b: MPEG-4 video descriptor Supported DVB descriptors diff --git a/TODO b/TODO index 1b08660..6a5342e 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 0x1b MPEG-4_video_descriptor - Descriptor 0x1c MPEG-4_audio_descriptor - Descriptor 0x1d IOD_descriptor - Descriptor 0x1e SL_descriptor diff --git a/examples/dvb_gen_si.c b/examples/dvb_gen_si.c index f2b4727..5e47b95 100644 --- a/examples/dvb_gen_si.c +++ b/examples/dvb_gen_si.c @@ -225,6 +225,12 @@ static void build_desc12(uint8_t *desc) { desc12_set_max_gop_length(desc, 5000); } +/* MPEG Descriptor 0x1b: MPEG4 Video descriptor */ +static void build_desc1b(uint8_t *desc) { + desc1b_init(desc); + desc1b_set_mpeg4_visual_profile_and_level(desc, 0x12); +} + /* ========================================================================= * DVB defined descriptors * ========================================================================= */ @@ -1476,6 +1482,9 @@ static void generate_pmt(void) { desc = descs_get_desc(desc_loop, desc_counter++); build_desc11(desc); + desc = descs_get_desc(desc_loop, desc_counter++); + build_desc1b(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_1b.h b/mpeg/psi/desc_1b.h new file mode 100644 index 0000000..06c3da3 --- /dev/null +++ b/mpeg/psi/desc_1b.h @@ -0,0 +1,86 @@ +/***************************************************************************** + * desc_1b.h: ISO/IEC 13818-1 Descriptor 0x1b (MPEG-4 video 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_1B_H__ +#define __BITSTREAM_MPEG_DESC_1B_H__ + +#include +#include + +#ifdef __cplusplus +extern "C" +{ +#endif + +/***************************************************************************** + * Descriptor 0x1b (MPEG-4 video descriptor) + *****************************************************************************/ +#define DESC1B_HEADER_SIZE (DESC_HEADER_SIZE + 1) + +static inline void desc1b_init(uint8_t *p_desc) +{ + desc_set_tag(p_desc, 0x1b); + desc_set_length(p_desc, DESC1B_HEADER_SIZE - DESC_HEADER_SIZE); +} + +static inline bool desc1b_validate(const uint8_t *p_desc) +{ + return desc_get_length(p_desc) >= DESC1B_HEADER_SIZE - DESC_HEADER_SIZE; +} + +static inline uint8_t desc1b_get_mpeg4_visual_profile_and_level(const uint8_t *p_desc) { + return p_desc[2]; +} + +static inline void desc1b_set_mpeg4_visual_profile_and_level(uint8_t *p_desc, uint8_t i_mpeg4_visual_profile_and_level) { + p_desc[2] = i_mpeg4_visual_profile_and_level; +} + +static inline void desc1b_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, "", + desc1b_get_mpeg4_visual_profile_and_level(p_desc)); + break; + default: + pf_print(opaque," - desc 1b mpeg4_video visual_profile_and_level=0x%02x", + desc1b_get_mpeg4_visual_profile_and_level(p_desc)); + } +} + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/mpeg/psi/descs_list.h b/mpeg/psi/descs_list.h index e95a0c4..13e533c 100644 --- a/mpeg/psi/descs_list.h +++ b/mpeg/psi/descs_list.h @@ -51,5 +51,6 @@ #include #include #include +#include #endif diff --git a/mpeg/psi/descs_print.h b/mpeg/psi/descs_print.h index 1cae881..ea86a20 100644 --- a/mpeg/psi/descs_print.h +++ b/mpeg/psi/descs_print.h @@ -117,6 +117,7 @@ static inline void descl_print(uint8_t *p_descl, uint16_t i_length, CASE_DESC(10) CASE_DESC(11) CASE_DESC(12) + CASE_DESC(1b) CASE_DESC_ICONV(40) CASE_DESC(41) CASE_DESC(43)