Commit abbe2e3c authored by Georgi Chorbadzhiyski's avatar Georgi Chorbadzhiyski

mpeg/psi: Add support for descriptor 0x23 (MultiplexBuffer descriptor).

parent bf6fc458
......@@ -84,6 +84,7 @@ Supported MPEG descriptors
* Descriptor 0x1e: SL_descriptor
* Descriptor 0x1f: FMC_descriptor
* Descriptor 0x20: External ES_ID descriptor
* Descriptor 0x23: MultiplexBuffer descriptor
Supported DVB descriptors
......
......@@ -4,7 +4,6 @@ so if you like something just do it and send a patch.
- Add support (parser, generator, example) for these MPEG descriptors:
- Descriptor 0x21 MuxCode_descriptor
- Descriptor 0x22 FmxBufferSize_descriptor
- Descriptor 0x23 multiplexbuffer_descriptor
- Descriptor 0x24 content_labeling_descriptor
- Descriptor 0x25 metadata_pointer_descriptor
- Descriptor 0x26 metadata_descriptor
......
......@@ -281,6 +281,12 @@ static void build_desc20(uint8_t *desc) {
desc20_set_external_es_id(desc, 0x1234);
}
/* MPEG Descriptor 0x23: MultiplexBuffer descriptor */
static void build_desc23(uint8_t *desc) {
desc23_init(desc);
desc23_set_mb_buffer_size(desc, 112233);
desc23_set_tb_leak_rate(desc, 445566);
}
/* =========================================================================
* DVB defined descriptors
......@@ -1649,6 +1655,9 @@ static void generate_pmt(void) {
desc = descs_get_desc(desc_loop, desc_counter++);
build_desc20(desc);
desc = descs_get_desc(desc_loop, desc_counter++);
build_desc23(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);
......
/*****************************************************************************
* desc_23.h: ISO/IEC 13818-1 Descriptor 0x23 (MultiplexBuffer descriptor)
*****************************************************************************
* Copyright (C) 2011 Unix Solutions Ltd.
*
* Authors: Georgi Chorbadzhiyski <georgi@unixsol.org>
*
* 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_23_H__
#define __BITSTREAM_MPEG_DESC_23_H__
#include <bitstream/common.h>
#include <bitstream/mpeg/psi/descriptors.h>
#ifdef __cplusplus
extern "C"
{
#endif
/*****************************************************************************
* Descriptor 0x23 (MultiplexBuffer descriptor)
*****************************************************************************/
#define DESC23_HEADER_SIZE (DESC_HEADER_SIZE + 6)
static inline void desc23_init(uint8_t *p_desc)
{
desc_set_tag(p_desc, 0x23);
desc_set_length(p_desc, DESC23_HEADER_SIZE - DESC_HEADER_SIZE);
}
static inline bool desc23_validate(const uint8_t *p_desc)
{
return desc_get_length(p_desc) >= DESC23_HEADER_SIZE - DESC_HEADER_SIZE;
}
static inline uint32_t desc23_get_mb_buffer_size(const uint8_t *p_desc)
{
return (p_desc[2] << 16) | (p_desc[3] << 8) | p_desc[4];
}
static inline void desc23_set_mb_buffer_size(uint8_t *p_desc, uint32_t i_mb_buffer_size)
{
p_desc[2] = (i_mb_buffer_size >> 16) & 0xff;
p_desc[3] = (i_mb_buffer_size >> 8) & 0xff;
p_desc[4] = i_mb_buffer_size & 0xff;
}
static inline uint32_t desc23_get_tb_leak_rate(const uint8_t *p_desc)
{
return (p_desc[5] << 16) | (p_desc[6] << 8) | p_desc[7];
}
static inline void desc23_set_tb_leak_rate(uint8_t *p_desc, uint32_t i_tb_leak_rate)
{
p_desc[5] = (i_tb_leak_rate >> 16) & 0xff;
p_desc[6] = (i_tb_leak_rate >> 8) & 0xff;
p_desc[7] = i_tb_leak_rate & 0xff;
}
static inline void desc23_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, "<MULTIPLEX_BUFFER_DESC mb_buffer_size=\"%u\" tb_leak_rate=\"%u\"/>",
desc23_get_mb_buffer_size(p_desc),
desc23_get_tb_leak_rate(p_desc));
break;
default:
pf_print(opaque," - desc 23 multiplex_buffer mb_buffer_size=%u tb_leak_rate=%u",
desc23_get_mb_buffer_size(p_desc),
desc23_get_tb_leak_rate(p_desc));
}
}
#ifdef __cplusplus
}
#endif
#endif
......@@ -57,5 +57,6 @@
#include <bitstream/mpeg/psi/desc_1e.h>
#include <bitstream/mpeg/psi/desc_1f.h>
#include <bitstream/mpeg/psi/desc_20.h>
#include <bitstream/mpeg/psi/desc_23.h>
#endif
......@@ -123,6 +123,7 @@ static inline void descl_print(uint8_t *p_descl, uint16_t i_length,
CASE_DESC(1e)
CASE_DESC(1f)
CASE_DESC(20)
CASE_DESC(23)
CASE_DESC_ICONV(40)
CASE_DESC(41)
CASE_DESC(43)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment