Commit 43cea6b5 authored by Georgi Chorbadzhiyski's avatar Georgi Chorbadzhiyski

dvb/si: Add support for descriptor 0x66 (Data broadcast id descriptor).

parent 610d9976
...@@ -135,6 +135,7 @@ Supported DVB descriptors ...@@ -135,6 +135,7 @@ Supported DVB descriptors
* Descriptor 0x63: Partial transport stream descriptor * Descriptor 0x63: Partial transport stream descriptor
* Descriptor 0x64: Data broadcast descriptor * Descriptor 0x64: Data broadcast descriptor
* Descriptor 0x65: Scrambling descriptor * Descriptor 0x65: Scrambling descriptor
* Descriptor 0x66: Data broadcast id descriptor
* Descriptor 0x6a: AC-3 descriptor [p] * Descriptor 0x6a: AC-3 descriptor [p]
Legend: Legend:
......
...@@ -14,7 +14,6 @@ so if you like something just do it and send a patch. ...@@ -14,7 +14,6 @@ so if you like something just do it and send a patch.
- Descriptor 0x6a: AC-3 descriptor - Descriptor 0x6a: AC-3 descriptor
- Add support (parser, generator, example) for these DVB descriptors: - Add support (parser, generator, example) for these DVB descriptors:
- Descriptor 0x66: data_broadcast_id_descriptor
- Descriptor 0x67: transport_stream_descriptor - Descriptor 0x67: transport_stream_descriptor
- Descriptor 0x68: DSNG_descriptor - Descriptor 0x68: DSNG_descriptor
- Descriptor 0x69: PDC_descriptor - Descriptor 0x69: PDC_descriptor
......
/*****************************************************************************
* desc_66.h: ETSI EN 300 468 Descriptor 0x66: Data broadcast id 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:
* - ETSI EN 300 468 V1.11.1 (2010-04) (SI in DVB systems)
*/
#ifndef __BITSTREAM_DVB_DESC_66_H__
#define __BITSTREAM_DVB_DESC_66_H__
#include <bitstream/common.h>
#include <bitstream/mpeg/psi/descriptors.h>
#ifdef __cplusplus
extern "C"
{
#endif
/*****************************************************************************
* Descriptor 0x66: Data broadcast id descriptor
*****************************************************************************/
#define DESC66_HEADER_SIZE (DESC_HEADER_SIZE + 2)
static inline void desc66_init(uint8_t *p_desc)
{
desc_set_tag(p_desc, 0x66);
desc_set_length(p_desc, DESC66_HEADER_SIZE - DESC_HEADER_SIZE);
}
static inline uint16_t desc66_get_broadcast_id(const uint8_t *p_desc)
{
return (p_desc[2] << 8) | p_desc[3];
}
static inline void desc66_set_broadcast_id(uint8_t *p_desc, uint16_t i_broadcast_id)
{
p_desc[2] = (i_broadcast_id >> 8) & 0xff;
p_desc[3] = i_broadcast_id & 0xff;
}
static inline uint8_t desc66_get_selector_byte_length(const uint8_t *p_desc)
{
return desc_get_length(p_desc) - (DESC66_HEADER_SIZE - DESC_HEADER_SIZE);
}
static inline const uint8_t *desc66_get_selector_byte(const uint8_t *p_desc, uint8_t *pi_length)
{
*pi_length = desc66_get_selector_byte_length(p_desc);
return p_desc + 4;
}
static inline void desc66_set_selector_byte(uint8_t *p_desc, const uint8_t *p_selector_byte, uint8_t i_length)
{
desc_set_length(p_desc, i_length + (DESC66_HEADER_SIZE - DESC_HEADER_SIZE));
memcpy(p_desc + 4, p_selector_byte, i_length);
}
static inline bool desc66_validate(const uint8_t *p_desc)
{
int i_length = desc_get_length(p_desc) - (DESC66_HEADER_SIZE - DESC_HEADER_SIZE);
i_length -= desc66_get_selector_byte_length(p_desc);
return i_length == 0;
}
static inline void desc66_print(const uint8_t *p_desc, f_print pf_print,
void *opaque, print_type_t i_print_type)
{
uint8_t i_selector_byte_length, i;
const uint8_t *p_selector_byte = desc66_get_selector_byte(p_desc, &i_selector_byte_length);
char psz_selector_byte[2 * 255 + 1];
char psz_selector_byte_txt[255 + 1];
for (i = 0; i < i_selector_byte_length; i++) {
sprintf(psz_selector_byte + 2 * i, "%02x", p_selector_byte[i]);
if (p_selector_byte[i] >= 32 && p_selector_byte[i] <= 127 && p_selector_byte[i] != '"')
psz_selector_byte_txt[i] = p_selector_byte[i];
else
psz_selector_byte_txt[i] = '.';
}
psz_selector_byte[2 * i] = '\0';
psz_selector_byte_txt[i] = '\0';
switch (i_print_type) {
case PRINT_XML:
pf_print(opaque,
"<DATA_BROADCAST_ID_DESC broadcast_id=\"0x%04x\""
" selector_byte=\"%s\" selector_byte_txt=\"%s\"/>",
desc66_get_broadcast_id(p_desc),
psz_selector_byte,
psz_selector_byte_txt
);
break;
default:
pf_print(opaque,
" - desc 66 data_broadcast broadcast_id=0x%04x"
" selector_byte=\"%s\" selector_byte_txt=\"%s\"",
desc66_get_broadcast_id(p_desc),
psz_selector_byte,
psz_selector_byte_txt
);
}
}
#ifdef __cplusplus
}
#endif
#endif
...@@ -72,6 +72,7 @@ ...@@ -72,6 +72,7 @@
#include <bitstream/dvb/si/desc_63.h> #include <bitstream/dvb/si/desc_63.h>
#include <bitstream/dvb/si/desc_64.h> #include <bitstream/dvb/si/desc_64.h>
#include <bitstream/dvb/si/desc_65.h> #include <bitstream/dvb/si/desc_65.h>
#include <bitstream/dvb/si/desc_66.h>
#include <bitstream/dvb/si/desc_6a.h> #include <bitstream/dvb/si/desc_6a.h>
#include <bitstream/dvb/si/desc_83p28.h> #include <bitstream/dvb/si/desc_83p28.h>
#include <bitstream/dvb/si/desc_88p28.h> #include <bitstream/dvb/si/desc_88p28.h>
......
...@@ -1070,7 +1070,14 @@ static void build_desc65(uint8_t *desc) { ...@@ -1070,7 +1070,14 @@ static void build_desc65(uint8_t *desc) {
desc65_set_scrambling_mode(desc, 0x01); desc65_set_scrambling_mode(desc, 0x01);
} }
/* --- Descriptor 0x66: data_broadcast_id_descriptor */ /* DVB Descriptor 0x66: Data broadcast id descriptor */
static void build_desc66(uint8_t *desc) {
char *selector_byte = "UNIX";
desc66_init(desc);
desc66_set_broadcast_id(desc, 0x1122);
desc66_set_selector_byte(desc, (uint8_t *)selector_byte, strlen(selector_byte));
}
/* --- Descriptor 0x67: transport_stream_descriptor */ /* --- Descriptor 0x67: transport_stream_descriptor */
/* --- Descriptor 0x68: DSNG_descriptor */ /* --- Descriptor 0x68: DSNG_descriptor */
/* --- Descriptor 0x69: PDC_descriptor */ /* --- Descriptor 0x69: PDC_descriptor */
...@@ -1649,6 +1656,9 @@ static void generate_sdt(void) { ...@@ -1649,6 +1656,9 @@ static void generate_sdt(void) {
desc = descs_get_desc(desc_loop, desc_counter++); desc = descs_get_desc(desc_loop, desc_counter++);
build_desc64(desc); build_desc64(desc);
desc = descs_get_desc(desc_loop, desc_counter++);
build_desc66(desc);
// Finish descriptor generation // Finish descriptor generation
desc = descs_get_desc(desc_loop, desc_counter); // Get next descriptor pos desc = descs_get_desc(desc_loop, desc_counter); // Get next descriptor pos
descs_set_length(desc_loop, desc - desc_loop - DESCS_HEADER_SIZE); descs_set_length(desc_loop, desc - desc_loop - DESCS_HEADER_SIZE);
......
...@@ -108,6 +108,7 @@ new SDT actual tsid=10000 version=1 onid=40000 ...@@ -108,6 +108,7 @@ new SDT actual tsid=10000 version=1 onid=40000
- desc 4c time_shifted_service reference_sid=21000 - desc 4c time_shifted_service reference_sid=21000
- desc 5f private_data specifier=0xaabbccdd - desc 5f private_data specifier=0xaabbccdd
- desc 64 data_broadcast broadcast_id=0x1122 component_tag=78 selector_byte="4259225445" selector_byte_txt="BY.TE" lang=eng text="Some text" - desc 64 data_broadcast broadcast_id=0x1122 component_tag=78 selector_byte="4259225445" selector_byte_txt="BY.TE" lang=eng text="Some text"
- desc 66 data_broadcast broadcast_id=0x1122 selector_byte="554e4958" selector_byte_txt="UNIX"
* service sid=20300 eit_schedule eit_pf running=2 scrambled * service sid=20300 eit_schedule eit_pf running=2 scrambled
- desc 48 service type=0x1 provider="Test Provider Name" service="Test Service Name" - desc 48 service type=0x1 provider="Test Provider Name" service="Test Service Name"
- desc 4b nvod_reference tsid=10000 onid=40000 sid=20000 - desc 4b nvod_reference tsid=10000 onid=40000 sid=20000
......
...@@ -182,6 +182,9 @@ ...@@ -182,6 +182,9 @@
<DESC id="0x64" length="22" value="11224e054259225445656e6709536f6d652074657874"> <DESC id="0x64" length="22" value="11224e054259225445656e6709536f6d652074657874">
<DATA_BROADCAST_DESC broadcast_id="0x1122" component_tag="78" selector_byte="4259225445" selector_byte_txt="BY.TE" lang="eng" text="Some text"/> <DATA_BROADCAST_DESC broadcast_id="0x1122" component_tag="78" selector_byte="4259225445" selector_byte_txt="BY.TE" lang="eng" text="Some text"/>
</DESC> </DESC>
<DESC id="0x66" length="6" value="1122554e4958">
<DATA_BROADCAST_ID_DESC broadcast_id="0x1122" selector_byte="554e4958" selector_byte_txt="UNIX"/>
</DESC>
</SERVICE> </SERVICE>
<SERVICE sid="20300" eit_schedule="1" eit_pf="1" running="2" free_CA="1"> <SERVICE sid="20300" eit_schedule="1" eit_pf="1" running="2" free_CA="1">
<DESC id="0x48" length="38" value="0112546573742050726f7669646572204e616d6511546573742053657276696365204e616d65"> <DESC id="0x48" length="38" value="0112546573742050726f7669646572204e616d6511546573742053657276696365204e616d65">
......
...@@ -166,6 +166,7 @@ static inline void descl_print(uint8_t *p_descl, uint16_t i_length, ...@@ -166,6 +166,7 @@ static inline void descl_print(uint8_t *p_descl, uint16_t i_length,
CASE_DESC(63) CASE_DESC(63)
CASE_DESC_ICONV(64) CASE_DESC_ICONV(64)
CASE_DESC(65) CASE_DESC(65)
CASE_DESC(66)
CASE_DESC(6a) CASE_DESC(6a)
#undef CASE_DESC #undef CASE_DESC
......
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