Commit 9124fb3b authored by Georgi Chorbadzhiyski's avatar Georgi Chorbadzhiyski

dvb/si: Add support for descriptor 0x69 (PDC descriptor).

parent cafd3176
......@@ -138,6 +138,7 @@ Supported DVB descriptors
* Descriptor 0x66: Data broadcast id descriptor
* Descriptor 0x67: Transport stream descriptor
* Descriptor 0x68: DSNG descriptor
* Descriptor 0x69: PDC descriptor
* Descriptor 0x6a: AC-3 descriptor [p]
Legend:
......
......@@ -14,7 +14,6 @@ so if you like something just do it and send a patch.
- Descriptor 0x6a: AC-3 descriptor
- Add support (parser, generator, example) for these DVB descriptors:
- Descriptor 0x69: PDC_descriptor
- Descriptor 0x6b: ancillary_data_descriptor
- Descriptor 0x6c: cell_list_descriptor
- Descriptor 0x6d: cell_frequency_link_descriptor
......
/*****************************************************************************
* desc_69.h: ETSI EN 300 468 Descriptor 0x69: PDC 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_69_H__
#define __BITSTREAM_DVB_DESC_69_H__
#include <bitstream/common.h>
#include <bitstream/mpeg/psi/descriptors.h>
#ifdef __cplusplus
extern "C"
{
#endif
/*****************************************************************************
* Descriptor 0x69: PDC descriptor
*****************************************************************************/
#define DESC69_HEADER_SIZE (DESC_HEADER_SIZE + 3)
static inline void desc69_init(uint8_t *p_desc)
{
desc_set_tag(p_desc, 0x69);
desc_set_length(p_desc, DESC69_HEADER_SIZE - DESC_HEADER_SIZE);
p_desc[2] = 0xf0;
}
static inline uint32_t desc69_get_pil(const uint8_t *p_desc)
{
return ((p_desc[2] & 0x0f) << 16) | (p_desc[3] << 8) | p_desc[4];
}
static inline void desc69_set_pil(uint8_t *p_desc, uint32_t i_pil)
{
p_desc[2] = ((i_pil >> 16) & 0x0f) | 0xf0;
p_desc[3] = (i_pil >> 8) & 0xff;
p_desc[4] = i_pil & 0x0f;
}
static inline uint8_t desc69_get_day(const uint8_t *p_desc)
{
uint8_t i_day = ((p_desc[2] & 0x0f) << 1) | ((p_desc[3] & 0x7f) >> 7); // rrrr1111 1xxxxxxx
return i_day + 1;
}
static inline void desc69_set_day(uint8_t *p_desc, uint8_t i_day)
{
i_day &= 0x1f; // 5 bits
p_desc[2] = 0xf0 | ((i_day >> 1) & 0x0f); // rrrr1111
p_desc[3] = ((i_day & 0x01) << 7) | (p_desc[3] & 0x7f); // 1xxxxxxx
}
static inline uint8_t desc69_get_month(const uint8_t *p_desc)
{
uint8_t i_month = ((p_desc[3] & 0x78) >> 3); // x1111xxx
return i_month;
}
static inline void desc69_set_month(uint8_t *p_desc, uint8_t i_month)
{
i_month &= 0x0f; // 4 bits
p_desc[3] = (p_desc[3] & 0x87) | (i_month << 3); // x1111xxx
}
static inline uint8_t desc69_get_hour(const uint8_t *p_desc)
{
uint8_t i_hour = ((p_desc[3] & 0x07) << 2) | ((p_desc[4] & 0xc0) >> 6); // xxxxx111 11xxxxxx
return i_hour;
}
static inline void desc69_set_hour(uint8_t *p_desc, uint8_t i_hour)
{
i_hour &= 0x1f; // 5 bits
p_desc[3] = (p_desc[3] & 0xf8) | ((i_hour >> 3) & 0x07); // xxxxx111
p_desc[4] = ((i_hour & 0x03) << 6) | (p_desc[4] & 0x3f); // 11xxxxxx
}
static inline uint8_t desc69_get_minute(const uint8_t *p_desc)
{
uint8_t i_min = p_desc[4] & 0x3f; // xx111111
return i_min;
}
static inline void desc69_set_minute(uint8_t *p_desc, uint8_t i_minute)
{
i_minute &= 0x3f;
p_desc[4] = (p_desc[4] & 0xc0) | i_minute;
}
static inline bool desc69_validate(const uint8_t *p_desc)
{
return desc_get_length(p_desc) >= (DESC69_HEADER_SIZE - DESC_HEADER_SIZE);
}
static inline void desc69_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,
"<PDC_DESC pil=\"0x%x\" day=\"%u\" month=\"%u\" hour=\"%u\" min=\"%u\"/>",
desc69_get_pil(p_desc),
desc69_get_day(p_desc),
desc69_get_month(p_desc),
desc69_get_hour(p_desc),
desc69_get_minute(p_desc)
);
break;
default:
pf_print(opaque,
" - desc 69 pdc pil=\"0x%x\" day=\"%u\" month=\"%u\" hour=\"%u\" min=\"%u\"",
desc69_get_pil(p_desc),
desc69_get_day(p_desc),
desc69_get_month(p_desc),
desc69_get_hour(p_desc),
desc69_get_minute(p_desc)
);
}
}
#ifdef __cplusplus
}
#endif
#endif
......@@ -75,6 +75,7 @@
#include <bitstream/dvb/si/desc_66.h>
#include <bitstream/dvb/si/desc_67.h>
#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_83p28.h>
#include <bitstream/dvb/si/desc_88p28.h>
......
......@@ -1091,7 +1091,16 @@ static void build_desc68(uint8_t *desc) {
desc68_set_bytes(desc, (uint8_t *)dsng_bytes, strlen(dsng_bytes));
}
/* --- Descriptor 0x69: PDC_descriptor */
/* DVB Descriptor 0x69: PDC_descriptor */
static void build_desc69(uint8_t *desc) {
desc69_init(desc);
// desc69_set_pil(desc, 0x5d805);
desc69_set_day(desc, 11);
desc69_set_month(desc, 11);
desc69_set_hour(desc, 0);
desc69_set_minute(desc, 5);
}
/* DVB Descriptor 0x6a: AC-3 descriptor */
/* --- Descriptor 0x6b: ancillary_data_descriptor */
/* --- Descriptor 0x6c: cell_list_descriptor */
......@@ -1857,6 +1866,9 @@ static void generate_eit(void) {
desc = descs_get_desc(desc_loop, desc_counter++);
build_desc55(desc);
desc = descs_get_desc(desc_loop, desc_counter++);
build_desc69(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);
......
......@@ -154,6 +154,7 @@ new EIT tableid=0x4e type=actual_pf version=1 tsid=10000 onid=40000 seg_last_sec
- desc 55 parental_rating country_code=CHI rating=15 rating_txt="min 18 years"
- desc 55 parental_rating country_code=FRA rating=12 rating_txt="min 15 years"
- desc 55 parental_rating country_code=BUL rating=24 rating_txt="unknown"
- desc 69 pdc pil="0x5d805" day="11" month="11" hour="0" min="5"
end EIT
new TDT time=1234567890 time_dec="2009-02-13 23:31:30 UTC"
end TDT
......
......@@ -273,6 +273,9 @@
<PARENTAL_RATING_DESC country_code="FRA" rating="12" rating_txt="min 15 years"/>
<PARENTAL_RATING_DESC country_code="BUL" rating="24" rating_txt="unknown"/>
</DESC>
<DESC id="0x69" length="3" value="f5d805">
<PDC_DESC pil="0x5d805" day="11" month="11" hour="0" min="5"/>
</DESC>
</EVENT>
</EIT>
<TDT time="1234567890" time_dec="2009-02-13 23:31:30 UTC"/>
......
......@@ -169,6 +169,7 @@ static inline void descl_print(uint8_t *p_descl, uint16_t i_length,
CASE_DESC(66)
CASE_DESC(67)
CASE_DESC(68)
CASE_DESC(69)
CASE_DESC(6a)
#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