diff --git a/README b/README index d49fa11..2a9fe27 100644 --- a/README +++ b/README @@ -86,6 +86,7 @@ Supported MPEG descriptors * Descriptor 0x1f: FMC_descriptor * Descriptor 0x20: External ES_ID descriptor * Descriptor 0x21: MuxCode descriptor + * Descriptor 0x22: FmxBufferSize descriptor * Descriptor 0x23: MultiplexBuffer descriptor * Descriptor 0x27: Metadata STD descriptor * Descriptor 0x28: AVC video descriptor diff --git a/TODO b/TODO index 4661e68..44fdbe2 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 0x22 FmxBufferSize_descriptor - Descriptor 0x24 content_labeling_descriptor - Descriptor 0x25 metadata_pointer_descriptor - Descriptor 0x26 metadata_descriptor diff --git a/examples/dvb_gen_si.c b/examples/dvb_gen_si.c index e1812e8..4654230 100644 --- a/examples/dvb_gen_si.c +++ b/examples/dvb_gen_si.c @@ -365,6 +365,31 @@ static void build_desc21(uint8_t *desc) { desc_set_length(desc, entry_n - desc - DESC_HEADER_SIZE); } +/* MPEG Descriptor 0x22: FmxBufferSize descriptor */ +static void build_desc22(uint8_t *desc) { + uint8_t k = 0; + uint8_t *entry_n; + + desc22_init(desc); + desc22_set_default_buffer_size(desc, 0x112233); + + desc_set_length(desc, 255); + entry_n = desc22_get_entry(desc, k++); + desc22n_set_flexmux_channel(entry_n, 0x11); + desc22n_set_flexmux_buffer_size(entry_n, 0x223344); + + entry_n = desc22_get_entry(desc, k++); + desc22n_set_flexmux_channel(entry_n, 0x55); + desc22n_set_flexmux_buffer_size(entry_n, 0x667788); + + entry_n = desc22_get_entry(desc, k++); + desc22n_set_flexmux_channel(entry_n, 0x99); + desc22n_set_flexmux_buffer_size(entry_n, 0xaabbcc); + + entry_n = desc22_get_entry(desc, k); + desc_set_length(desc, entry_n - desc - DESC_HEADER_SIZE); +} + /* MPEG Descriptor 0x23: MultiplexBuffer descriptor */ static void build_desc23(uint8_t *desc) { desc23_init(desc); @@ -2514,6 +2539,9 @@ static void generate_pmt(void) { desc = descs_get_desc(desc_loop, desc_counter++); build_desc21(desc); + desc = descs_get_desc(desc_loop, desc_counter++); + build_desc22(desc); + desc = descs_get_desc(desc_loop, desc_counter++); build_desc23(desc); diff --git a/examples/dvb_print_si.output.txt b/examples/dvb_print_si.output.txt index d5d511b..b039895 100644 --- a/examples/dvb_print_si.output.txt +++ b/examples/dvb_print_si.output.txt @@ -291,6 +291,10 @@ new PMT program=20000 version=1 pcrpid=110 - muxcode_substruct_entry slot=1 flex_mux_channel=71 number_of_bytes=81 - muxcode_substruct_entry slot=2 flex_mux_channel=72 number_of_bytes=82 - muxcode_substruct_entry slot=3 flex_mux_channel=73 number_of_bytes=83 + - desc 22 fmx_buffer_size default_buffer_size=1122867 + - flexmux_channel=0x11 buffer_size=2241348 + - flexmux_channel=0x55 buffer_size=6715272 + - flexmux_channel=0x99 buffer_size=11189196 - desc 23 multiplex_buffer mb_buffer_size=112233 tb_leak_rate=445566 - desc 27 metadata_std input_leak_rate=12345 buffer_size=23456 output_leak_rate=34567 - desc 2c flexmux_timing fcr_es_id=0x1234 fcr_resolution=123456789 fcr_length=55 fmx_rate_length=66 diff --git a/examples/dvb_print_si.output.xml b/examples/dvb_print_si.output.xml index 8e76216..b8cf7dd 100644 --- a/examples/dvb_print_si.output.xml +++ b/examples/dvb_print_si.output.xml @@ -517,6 +517,13 @@ + + + + + + + diff --git a/mpeg/psi/desc_22.h b/mpeg/psi/desc_22.h new file mode 100644 index 0000000..b44db55 --- /dev/null +++ b/mpeg/psi/desc_22.h @@ -0,0 +1,145 @@ +/***************************************************************************** + * desc_22.h: ISO/IEC 13818-1 Descriptor 0x22 (FmxBufferSize 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) + * - ISO/IEC 14496-1:2001(E) (MPEG-4 Systems) + */ + +#ifndef __BITSTREAM_MPEG_DESC_22_H__ +#define __BITSTREAM_MPEG_DESC_22_H__ + +#include +#include + +#ifdef __cplusplus +extern "C" +{ +#endif + +/***************************************************************************** + * Descriptor 0x22: FmxBufferSize descriptor + *****************************************************************************/ +#define DESC22_HEADER_SIZE (DESC_HEADER_SIZE + 3) +#define DESC22_ENTRY_SIZE 4 + +static inline void desc22_init(uint8_t *p_desc) +{ + desc_set_tag(p_desc, 0x22); + desc_set_length(p_desc, DESC22_HEADER_SIZE - DESC_HEADER_SIZE); +} + +static inline uint32_t desc22_get_default_buffer_size(const uint8_t *p_desc) +{ + return (p_desc[2] << 16) | (p_desc[3] << 8) | p_desc[4]; +} + +static inline void desc22_set_default_buffer_size(uint8_t *p_desc, uint32_t i_default_buffer_size) +{ + p_desc[2] = (i_default_buffer_size >> 16) & 0xff; + p_desc[3] = (i_default_buffer_size >> 8) & 0xff; + p_desc[4] = i_default_buffer_size & 0xff; +} + +static inline uint8_t *desc22_get_entry(uint8_t *p_desc, uint8_t n) +{ + uint8_t *p_desc_n = p_desc + DESC22_HEADER_SIZE + n * DESC22_ENTRY_SIZE; + if (p_desc_n + DESC22_ENTRY_SIZE - p_desc + > desc_get_length(p_desc) + DESC22_HEADER_SIZE) + return NULL; + return p_desc_n; +} + +static inline uint8_t desc22n_get_flexmux_channel(const uint8_t *p_desc_n) +{ + return p_desc_n[0]; +} + +static inline void desc22n_set_flexmux_channel(uint8_t *p_desc_n, uint8_t i_flexmux_channel) +{ + p_desc_n[0] = i_flexmux_channel; +} + +static inline uint32_t desc22n_get_flexmux_buffer_size(const uint8_t *p_desc_n) +{ + return (p_desc_n[1] << 16) | (p_desc_n[2] << 8) | p_desc_n[3]; +} + +static inline void desc22n_set_flexmux_buffer_size(uint8_t *p_desc_n, uint32_t i_buffer_size) +{ + p_desc_n[1] = (i_buffer_size >> 16) & 0xff; + p_desc_n[2] = (i_buffer_size >> 8) & 0xff; + p_desc_n[3] = i_buffer_size & 0xff; +} + + +static inline bool desc22_validate(const uint8_t *p_desc) +{ + return ((desc_get_length(p_desc) - (DESC22_HEADER_SIZE - DESC_HEADER_SIZE)) + % DESC22_ENTRY_SIZE) == 0; +} + +static inline void desc22_print(uint8_t *p_desc, f_print pf_print, + void *opaque, print_type_t i_print_type) +{ + uint8_t n = 0; + uint8_t *p_desc_n; + + switch (i_print_type) { + case PRINT_XML: + pf_print(opaque, "", + desc22_get_default_buffer_size(p_desc)); + break; + default: + pf_print(opaque, " - desc 22 fmx_buffer_size default_buffer_size=%u", + desc22_get_default_buffer_size(p_desc)); + } + + while ((p_desc_n = desc22_get_entry(p_desc, n++)) != NULL) { + switch (i_print_type) { + case PRINT_XML: + pf_print(opaque, "", + desc22n_get_flexmux_channel(p_desc_n), + desc22n_get_flexmux_buffer_size(p_desc_n)); + break; + default: + pf_print(opaque, " - flexmux_channel=0x%02x buffer_size=%u", + desc22n_get_flexmux_channel(p_desc_n), + desc22n_get_flexmux_buffer_size(p_desc_n)); + } + } + + if (i_print_type == PRINT_XML) + pf_print(opaque, ""); +} + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/mpeg/psi/descs_list.h b/mpeg/psi/descs_list.h index efd9913..ae912df 100644 --- a/mpeg/psi/descs_list.h +++ b/mpeg/psi/descs_list.h @@ -58,6 +58,7 @@ #include #include #include +#include #include #include #include diff --git a/mpeg/psi/descs_print.h b/mpeg/psi/descs_print.h index f2d4590..430699e 100644 --- a/mpeg/psi/descs_print.h +++ b/mpeg/psi/descs_print.h @@ -124,6 +124,7 @@ static inline void descl_print(uint8_t *p_descl, uint16_t i_length, CASE_DESC(1f) CASE_DESC(20) CASE_DESC(21) + CASE_DESC(22) CASE_DESC(23) CASE_DESC(27) CASE_DESC(28)