Commit a68331b0 authored by Georgi Chorbadzhiyski's avatar Georgi Chorbadzhiyski

dvb/si: Add support for descriptor 0x49 (Country availability descriptor).

parent 4b14313e
......@@ -106,6 +106,7 @@ Supported DVB descriptors
* Descriptor 0x46: VBI teletext descriptor
* Descriptor 0x47: Bouquet name descriptor
* Descriptor 0x48: Service descriptor
* Descriptor 0x49: Country availability descriptor
* Descriptor 0x4a: Linkage descriptor (partially implemented)
* Descriptor 0x4d: Short event descriptor
* Descriptor 0x4e: Extended event descriptor
......
......@@ -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 0x49: Country availability descriptor
- Descriptor 0x4b: NVOD_reference_descriptor
- Descriptor 0x4c: time_shifted_service_descriptor
- Descriptor 0x4f: time_shifted_event_descriptor
......
/*****************************************************************************
* desc_49.h: ETSI EN 300 468 Descriptor 0x49: Country availability 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_49_H__
#define __BITSTREAM_DVB_DESC_49_H__
#include <bitstream/common.h>
#include <bitstream/mpeg/psi/descriptors.h>
#include <bitstream/mpeg/psi/desc_0a.h>
#ifdef __cplusplus
extern "C"
{
#endif
/*****************************************************************************
* Descriptor 0x49: Country availability descriptor
*****************************************************************************/
#define DESC49_HEADER_SIZE (DESC_HEADER_SIZE + 1)
#define DESC49_CODE_SIZE 3
static inline void desc49_init(uint8_t *p_desc)
{
desc_set_tag(p_desc, 0x49);
p_desc[2] = 0x7f;
}
static inline bool desc49_get_country_availability_flag(const uint8_t *p_desc)
{
return (p_desc[2] & 0x80) == 0x80;
}
static inline void desc49_set_country_availability_flag(uint8_t *p_desc, bool b_available)
{
p_desc[2] = b_available ? (p_desc[2] | 0x80) : (p_desc[2] &~ 0x80);
}
static inline uint8_t *desc49_get_code(uint8_t *p_desc, uint8_t n)
{
uint8_t *p_desc_n = p_desc + DESC49_HEADER_SIZE + n * DESC49_CODE_SIZE;
if (p_desc_n + DESC49_CODE_SIZE - p_desc
> desc_get_length(p_desc) + DESC49_HEADER_SIZE)
return NULL;
return p_desc_n;
}
#define desc49n_set_code desc0an_set_code
#define desc49n_get_code desc0an_get_code
static inline bool desc49_validate(const uint8_t *p_desc)
{
return ((desc_get_length(p_desc) - 1) % DESC49_CODE_SIZE) == 0;
}
static inline void desc49_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 = desc49_get_code(p_desc, j)) != NULL) {
j++;
switch (i_print_type) {
case PRINT_XML:
pf_print(opaque,
"<COUNTRY_AVAILABILITY_DESC available=\"%u\" country=\"%3.3s\"/>",
desc49_get_country_availability_flag(p_desc),
(const char *)desc49n_get_code(p_desc_n)
);
break;
default:
pf_print(opaque,
" - desc 49 country_availability available=%u country=%3.3s",
desc49_get_country_availability_flag(p_desc),
(const char *)desc49n_get_code(p_desc_n)
);
}
}
}
#ifdef __cplusplus
}
#endif
#endif
......@@ -43,6 +43,7 @@
#include <bitstream/dvb/si/desc_46.h>
#include <bitstream/dvb/si/desc_47.h>
#include <bitstream/dvb/si/desc_48.h>
#include <bitstream/dvb/si/desc_49.h>
#include <bitstream/dvb/si/desc_4a.h>
#include <bitstream/dvb/si/desc_4d.h>
#include <bitstream/dvb/si/desc_4e.h>
......
......@@ -513,7 +513,29 @@ static void build_desc48(uint8_t *desc) {
desc48_set_length(desc);
}
/* --- Descriptor 0x49: Country availability descriptor */
/* DVB Descriptor 0x49: Country availability descriptor */
static void build_desc49(uint8_t *desc, bool b_available) {
uint8_t k = 0;
uint8_t *code_n;
desc49_init(desc);
desc49_set_country_availability_flag(desc, b_available);
desc_set_length(desc, 255);
code_n = desc49_get_code(desc, k++);
desc49n_set_code(code_n, (uint8_t *)"GBR");
code_n = desc49_get_code(desc, k++);
desc49n_set_code(code_n, (uint8_t *)"FRA");
code_n = desc49_get_code(desc, k++);
desc49n_set_code(code_n, (uint8_t *)"BUL");
code_n = desc49_get_code(desc, k);
desc_set_length(desc, code_n - desc - DESC_HEADER_SIZE);
}
/* DVB Descriptor 0x4a: Linkage descriptor (partially implemented) */
/* --- Descriptor 0x4b: NVOD_reference_descriptor */
/* --- Descriptor 0x4c: time_shifted_service_descriptor */
......@@ -1231,6 +1253,9 @@ static void generate_sdt(void) {
desc = descs_get_desc(desc_loop, desc_counter++);
build_desc48(desc);
desc = descs_get_desc(desc_loop, desc_counter++);
build_desc49(desc, true);
desc = descs_get_desc(desc_loop, desc_counter++);
build_desc5f(desc);
......@@ -1254,6 +1279,9 @@ static void generate_sdt(void) {
desc = descs_get_desc(desc_loop, desc_counter++);
build_desc48(desc);
desc = descs_get_desc(desc_loop, desc_counter++);
build_desc49(desc, false);
desc = descs_get_desc(desc_loop, desc_counter++);
build_desc5f(desc);
......
......@@ -138,6 +138,7 @@ static inline void descl_print(uint8_t *p_descl, uint16_t i_length,
CASE_DESC(46)
CASE_DESC_ICONV(47)
CASE_DESC_ICONV(48)
CASE_DESC(49)
CASE_DESC(4a)
CASE_DESC_ICONV(4d)
CASE_DESC_ICONV(4e)
......
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