Skip to content

B
bitstream
Commit e3ecc642 authored by Georgi Chorbadzhiyski's avatar Georgi Chorbadzhiyski
Browse files
Options

dvb/si: Add support for descriptor 0x7a (Enhanced AC-3 descriptor).

parent 074963a0
Hide whitespace changes
Inline Side-by-side
Showing with 250 additions and 1 deletion
README
View file @ e3ecc642
......@@ -140,6 +140,7 @@ Supported DVB descriptors
* Descriptor 0x68: DSNG descriptor
* Descriptor 0x69: PDC descriptor
* Descriptor 0x6a: AC-3 descriptor
* Descriptor 0x7a: Enhanced AC-3 descriptor
To see what is unsupported look in the TODO file.
......
dvb/si/desc_7a.h 0 → 100644
View file @ e3ecc642
/*****************************************************************************
* desc_7a.h: ETSI EN 300 468 Descriptor 0x7a: Enhanced AC-3 descriptor
*****************************************************************************
* Copyright (C) 2009-2010 VideoLAN
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* 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:
* - ETSI EN 300 468 V1.11.1 (2010-04) (SI in DVB systems)
*/
#ifndef __BITSTREAM_DVB_DESC_7A_H__
#define __BITSTREAM_DVB_DESC_7A_H__
#include <bitstream/common.h>
#include <bitstream/mpeg/psi/descriptors.h>
#ifdef __cplusplus
extern "C"
{
#endif
/*****************************************************************************
* Descriptor 0x7a: Enhanced AC-3 descriptor
*****************************************************************************/
#define DESC7A_HEADER_SIZE (DESC_HEADER_SIZE + 1)
static inline void desc7a_init(uint8_t *p_desc)
{
desc_set_tag(p_desc, 0x7a);
desc_set_length(p_desc, (DESC7A_HEADER_SIZE - DESC_HEADER_SIZE));
p_desc[2] = 0x00;
}
static inline void desc7a_clear_flags(uint8_t *p_desc)
{
p_desc[2] = 0x00;
}
#define DEFINE_AC3_FLAG(FLAGNAME, bit) \
static inline bool desc7a_get_##FLAGNAME##_flag(const uint8_t *p_desc) \
{ \
return (p_desc[2] & bit) == bit; \
} \
\
static inline void desc7a_set_##FLAGNAME##_flag(uint8_t *p_desc, bool b_##FLAGNAME) \
{ \
p_desc[2] = b_##FLAGNAME ? (p_desc[2] | bit) : (p_desc[2] &~ bit); \
}
#define DEFINE_AC3_VALUE(VALUENAME, ofs) \
static inline uint8_t desc7a_get_##VALUENAME(const uint8_t *p_desc) \
{ \
if (!desc7a_get_##VALUENAME##_flag(p_desc)) return 0; \
return p_desc[ofs]; \
} \
\
static inline void desc7a_set_##VALUENAME(uint8_t *p_desc, uint8_t i_##VALUENAME) \
{ \
if (!desc7a_get_##VALUENAME##_flag(p_desc)) return; \
p_desc[ofs] = i_##VALUENAME; \
}
DEFINE_AC3_FLAG (component_type, 0x80)
DEFINE_AC3_VALUE(component_type, DESC7A_HEADER_SIZE)
DEFINE_AC3_FLAG (bsid, 0x40)
DEFINE_AC3_VALUE(bsid, DESC7A_HEADER_SIZE
+ desc7a_get_component_type_flag(p_desc))
DEFINE_AC3_FLAG (mainid, 0x20)
DEFINE_AC3_VALUE(mainid, DESC7A_HEADER_SIZE
+ desc7a_get_component_type_flag(p_desc)
+ desc7a_get_bsid_flag(p_desc))
DEFINE_AC3_FLAG (asvc, 0x10)
DEFINE_AC3_VALUE(asvc, DESC7A_HEADER_SIZE
+ desc7a_get_component_type_flag(p_desc)
+ desc7a_get_bsid_flag(p_desc)
+ desc7a_get_mainid_flag(p_desc))
DEFINE_AC3_FLAG (mixinfoexists, 0x08)
DEFINE_AC3_FLAG (substream1, 0x04)
DEFINE_AC3_VALUE(substream1, DESC7A_HEADER_SIZE
+ desc7a_get_component_type_flag(p_desc)
+ desc7a_get_bsid_flag(p_desc)
+ desc7a_get_mainid_flag(p_desc)
+ desc7a_get_asvc_flag(p_desc))
DEFINE_AC3_FLAG (substream2, 0x02)
DEFINE_AC3_VALUE(substream2, DESC7A_HEADER_SIZE
+ desc7a_get_component_type_flag(p_desc)
+ desc7a_get_bsid_flag(p_desc)
+ desc7a_get_mainid_flag(p_desc)
+ desc7a_get_asvc_flag(p_desc)
+ desc7a_get_substream1_flag(p_desc))
DEFINE_AC3_FLAG (substream3, 0x01)
DEFINE_AC3_VALUE(substream3, DESC7A_HEADER_SIZE
+ desc7a_get_component_type_flag(p_desc)
+ desc7a_get_bsid_flag(p_desc)
+ desc7a_get_mainid_flag(p_desc)
+ desc7a_get_asvc_flag(p_desc)
+ desc7a_get_substream1_flag(p_desc)
+ desc7a_get_substream2_flag(p_desc))
#undef DEFINE_AC3_FLAG
#undef DEFINE_AC3_VALUE
static inline void desc7a_set_length(uint8_t *p_desc)
{
uint8_t i_size = (DESC7A_HEADER_SIZE - DESC_HEADER_SIZE)
+ desc7a_get_component_type_flag(p_desc)
+ desc7a_get_bsid_flag(p_desc)
+ desc7a_get_mainid_flag(p_desc)
+ desc7a_get_asvc_flag(p_desc)
+ desc7a_get_substream1_flag(p_desc)
+ desc7a_get_substream2_flag(p_desc)
+ desc7a_get_substream3_flag(p_desc);
return desc_set_length(p_desc, i_size);
}
static inline bool desc7a_validate(const uint8_t *p_desc)
{
uint8_t i_size = (DESC7A_HEADER_SIZE - DESC_HEADER_SIZE)
+ desc7a_get_component_type_flag(p_desc)
+ desc7a_get_bsid_flag(p_desc)
+ desc7a_get_mainid_flag(p_desc)
+ desc7a_get_asvc_flag(p_desc)
+ desc7a_get_substream1_flag(p_desc)
+ desc7a_get_substream2_flag(p_desc)
+ desc7a_get_substream3_flag(p_desc);
return desc_get_length(p_desc) >= i_size;
}
static inline void desc7a_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,
"<AC3_DESC component_type_flag=\"%u\" component_type=\"%u\""
" bsid_flag=\"%u\" bsid=\"%u\""
" mainid_flag=\"%u\" mainid=\"%u\""
" asvc_flag=\"%u\" asvc=\"%u\""
" mixinfoexists=\"%u\""
" substream1_flag=\"%u\" substream1=\"%u\""
" substream2_flag=\"%u\" substream2=\"%u\""
" substream3_flag=\"%u\" substream3=\"%u\"/>",
desc7a_get_component_type_flag(p_desc), desc7a_get_component_type(p_desc),
desc7a_get_bsid_flag(p_desc), desc7a_get_bsid(p_desc),
desc7a_get_mainid_flag(p_desc), desc7a_get_mainid(p_desc),
desc7a_get_asvc_flag(p_desc), desc7a_get_asvc(p_desc),
desc7a_get_mixinfoexists_flag(p_desc),
desc7a_get_substream1_flag(p_desc), desc7a_get_substream1(p_desc),
desc7a_get_substream2_flag(p_desc), desc7a_get_substream2(p_desc),
desc7a_get_substream3_flag(p_desc), desc7a_get_substream3(p_desc)
);
break;
default:
pf_print(opaque,
" - desc 7a ac3 component_type_flag=%u component_type=%u"
" bsid_flag=%u bsid=%u"
" mainid_flag=%u mainid=%u"
" asvc_flag=%u asvc=%u"
" mixinfoexists=%u"
" substream1_flag=%u substream1=%u"
" substream2_flag=%u substream2=%u"
" substream3_flag=%u substream3=%u",
desc7a_get_component_type_flag(p_desc), desc7a_get_component_type(p_desc),
desc7a_get_bsid_flag(p_desc), desc7a_get_bsid(p_desc),
desc7a_get_mainid_flag(p_desc), desc7a_get_mainid(p_desc),
desc7a_get_asvc_flag(p_desc), desc7a_get_asvc(p_desc),
desc7a_get_mixinfoexists_flag(p_desc),
desc7a_get_substream1_flag(p_desc), desc7a_get_substream1(p_desc),
desc7a_get_substream2_flag(p_desc), desc7a_get_substream2(p_desc),
desc7a_get_substream3_flag(p_desc), desc7a_get_substream3(p_desc)
);
}
}
#ifdef __cplusplus
}
#endif
#endif
dvb/si/descs_list.h
View file @ e3ecc642
......@@ -77,6 +77,7 @@
#include <bitstream/dvb/si/desc_68.h>
#include <bitstream/dvb/si/desc_69.h>
#include <bitstream/dvb/si/desc_6a.h>
#include <bitstream/dvb/si/desc_7a.h>
#include <bitstream/dvb/si/desc_83p28.h>
#include <bitstream/dvb/si/desc_88p28.h>
......
examples/dvb_gen_si.c
View file @ e3ecc642
......@@ -1135,7 +1135,37 @@ static void build_desc6a(uint8_t *desc) {
/* --- Descriptor 0x77: time_slice_fec_identifier_descriptor */
/* --- Descriptor 0x78: ECM_repetition_rate_descriptor */
/* --- Descriptor 0x79: S2_satellite_delivery_system_descriptor */
/* --- Descriptor 0x7a: enhanced_AC-3_descriptor */
/* DVB Descriptor 0x7a: Enhanced AC-3 descriptor */
static void build_desc7a(uint8_t *desc) {
desc7a_init(desc);
desc7a_set_component_type_flag (desc, true);
desc7a_set_component_type (desc, 10);
desc7a_set_bsid_flag (desc, true);
desc7a_set_bsid (desc, 20);
desc7a_set_mainid_flag (desc, true);
desc7a_set_mainid (desc, 30);
desc7a_set_asvc_flag (desc, true);
desc7a_set_asvc (desc, 40);
desc7a_set_mixinfoexists_flag (desc, true);
desc7a_set_substream1_flag (desc, true);
desc7a_set_substream1 (desc, 50);
desc7a_set_substream2_flag (desc, true);
desc7a_set_substream2 (desc, 60);
desc7a_set_substream3_flag (desc, true);
desc7a_set_substream3 (desc, 70);
desc7a_set_length(desc);
}
/* --- Descriptor 0x7b: DTS descriptor */
/* --- Descriptor 0x7c: AAC descriptor */
/* --- Descriptor 0x7d: XAIT location descriptor */
......@@ -2164,6 +2194,9 @@ static void generate_pmt(void) {
desc = descs_get_desc(desc_loop, desc_counter++);
build_desc6a(desc);
desc = descs_get_desc(desc_loop, desc_counter++);
build_desc7a(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);
......
examples/dvb_print_si.output.txt
View file @ e3ecc642
......@@ -214,6 +214,7 @@ new PMT program=20000 version=1 pcrpid=110
- desc 5e multilingual_component code="fre" component_tag=46 text="Stereo"
- desc 5e multilingual_component code="bul" component_tag=46 text="Stereo"
- desc 6a ac3 component_type_flag=1 component_type=10 bsid_flag=1 bsid=20 mainid_flag=1 mainid=30 asvc_flag=1 asvc=40
- desc 7a ac3 component_type_flag=1 component_type=10 bsid_flag=1 bsid=20 mainid_flag=1 mainid=30 asvc_flag=1 asvc=40 mixinfoexists=1 substream1_flag=1 substream1=50 substream2_flag=1 substream2=60 substream3_flag=1 substream3=70
* ES pid=122 streamtype=0x06 streamtype_txt="13818-1 PES private data"
- desc 46 vbi_telx language=eng type=0x1 type_txt="Initial teletext page" mag=3 page=0x255x
- desc 46 vbi_telx language=bul type=0x2 type_txt="Teletext subtitle page" mag=2 page=0x127x
......
examples/dvb_print_si.output.xml
View file @ e3ecc642
......@@ -381,6 +381,9 @@
<DESC id="0x6a" length="5" value="ff0a141e28">
<AC3_DESC component_type_flag="1" component_type="10" bsid_flag="1" bsid="20" mainid_flag="1" mainid="30" asvc_flag="1" asvc="40"/>
</DESC>
<DESC id="0x7a" length="8" value="ff0a141e28323c46">
<AC3_DESC component_type_flag="1" component_type="10" bsid_flag="1" bsid="20" mainid_flag="1" mainid="30" asvc_flag="1" asvc="40" mixinfoexists="1" substream1_flag="1" substream1="50" substream2_flag="1" substream2="60" substream3_flag="1" substream3="70"/>
</DESC>
</ES>
<ES pid="122" streamtype="0x06" streamtype_txt="13818-1 PES private data">
<DESC id="0x46" length="15" value="656e670bff62756c127f6672651940">
......
mpeg/psi/descs_print.h
View file @ e3ecc642
......@@ -171,6 +171,7 @@ static inline void descl_print(uint8_t *p_descl, uint16_t i_length,
CASE_DESC(68)
CASE_DESC(69)
CASE_DESC(6a)
CASE_DESC(7a)
#undef CASE_DESC
#undef CASE_DESC_ICONV
......
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