Commit ec527463 authored by Georgi Chorbadzhiyski's avatar Georgi Chorbadzhiyski

mpeg/psi: Add support for descriptor 0x1f (FMC descriptor).

parent 29ddb6e6
......@@ -82,6 +82,7 @@ Supported MPEG descriptors
* Descriptor 0x1c: MPEG-4 audio descriptor
* Descriptor 0x1d: IOD_descriptor
* Descriptor 0x1e: SL_descriptor
* Descriptor 0x1f: FMC_descriptor
Supported DVB descriptors
......
......@@ -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 0x1f FMC_descriptor
- Descriptor 0x20 external_ES_ID_descriptor
- Descriptor 0x21 MuxCode_descriptor
- Descriptor 0x22 FmxBufferSize_descriptor
......
......@@ -251,6 +251,30 @@ static void build_desc1e(uint8_t *desc) {
desc1e_set_es_id(desc, 0x1234);
}
/* MPEG Descriptor 0x1f: FMC descriptor */
static void build_desc1f(uint8_t *desc) {
uint8_t k = 0;
uint8_t *entry_n;
desc1f_init(desc);
desc_set_length(desc, 255);
entry_n = desc1f_get_entry(desc, k++);
desc1fn_set_es_id(entry_n, 0x1122);
desc1fn_set_flexmux_channel(entry_n, 0x33);
entry_n = desc1f_get_entry(desc, k++);
desc1fn_set_es_id(entry_n, 0x4455);
desc1fn_set_flexmux_channel(entry_n, 0x66);
entry_n = desc1f_get_entry(desc, k++);
desc1fn_set_es_id(entry_n, 0x7788);
desc1fn_set_flexmux_channel(entry_n, 0x99);
entry_n = desc1f_get_entry(desc, k);
desc_set_length(desc, entry_n - desc - DESC1F_HEADER_SIZE);
}
/* =========================================================================
* DVB defined descriptors
* ========================================================================= */
......@@ -1612,6 +1636,9 @@ static void generate_pmt(void) {
desc = descs_get_desc(desc_loop, desc_counter++);
build_desc1d(desc);
desc = descs_get_desc(desc_loop, desc_counter++);
build_desc1f(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_1f.h: ISO/IEC 13818-1 Descriptor 0x1f (FMC 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_1F_H__
#define __BITSTREAM_MPEG_DESC_1F_H__
#include <bitstream/common.h>
#include <bitstream/mpeg/psi/descriptors.h>
#ifdef __cplusplus
extern "C"
{
#endif
/*****************************************************************************
* Descriptor 0x1f: FMC descriptor
*****************************************************************************/
#define DESC1F_HEADER_SIZE DESC_HEADER_SIZE
#define DESC1F_ENTRY_SIZE 3
static inline void desc1f_init(uint8_t *p_desc)
{
desc_set_tag(p_desc, 0x1f);
}
static inline uint8_t *desc1f_get_entry(uint8_t *p_desc, uint8_t n)
{
uint8_t *p_desc_n = p_desc + DESC1F_HEADER_SIZE + n * DESC1F_ENTRY_SIZE;
if (p_desc_n + DESC1F_ENTRY_SIZE - p_desc
> desc_get_length(p_desc) + DESC1F_HEADER_SIZE)
return NULL;
return p_desc_n;
}
static inline uint16_t desc1fn_get_es_id(const uint8_t *p_desc)
{
return (p_desc[0] << 8) | p_desc[1];
}
static inline void desc1fn_set_es_id(uint8_t *p_desc_n, uint16_t i_es_id)
{
p_desc_n[0] = (i_es_id >> 8) & 0xff;
p_desc_n[1] = i_es_id & 0xff;
}
static inline uint8_t desc1fn_get_flexmux_channel(const uint8_t *p_desc_n)
{
return p_desc_n[2];
}
static inline void desc1fn_set_flexmux_channel(uint8_t *p_desc_n, uint8_t i_flexmux_channel)
{
p_desc_n[2] = i_flexmux_channel;
}
static inline bool desc1f_validate(const uint8_t *p_desc)
{
return !(desc_get_length(p_desc) % DESC1F_ENTRY_SIZE);
}
static inline void desc1f_print(uint8_t *p_desc, f_print pf_print,
void *opaque, print_type_t i_print_type)
{
uint8_t j = 0;
uint8_t *p_desc_n;
while ((p_desc_n = desc1f_get_entry(p_desc, j)) != NULL) {
j++;
switch (i_print_type) {
case PRINT_XML:
pf_print(opaque, "<FMC_DESC es_id=\"0x%04x\" flexmux_channel=\"0x%02x\"/>",
desc1fn_get_es_id(p_desc_n),
desc1fn_get_flexmux_channel(p_desc_n));
break;
default:
pf_print(opaque, " - desc 1f fmc es_id=0x%04x flexmux_channel=0x%02x",
desc1fn_get_es_id(p_desc_n),
desc1fn_get_flexmux_channel(p_desc_n));
}
}
}
#ifdef __cplusplus
}
#endif
#endif
......@@ -55,5 +55,6 @@
#include <bitstream/mpeg/psi/desc_1c.h>
#include <bitstream/mpeg/psi/desc_1d.h>
#include <bitstream/mpeg/psi/desc_1e.h>
#include <bitstream/mpeg/psi/desc_1f.h>
#endif
......@@ -121,6 +121,7 @@ static inline void descl_print(uint8_t *p_descl, uint16_t i_length,
CASE_DESC(1c)
CASE_DESC(1d)
CASE_DESC(1e)
CASE_DESC(1f)
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