Commit a585a8aa authored by Ilkka Ollakka's avatar Ilkka Ollakka Committed by Jean-Paul Saman

add dr_44 handling, NIT decode for dvb-c

parent e7cbfefb
......@@ -33,6 +33,7 @@ pkginclude_HEADERS = dvbpsi.h psi.h descriptor.h demux.h \
descriptors/dr_0f.h \
descriptors/dr_42.h \
descriptors/dr_43.h \
descriptors/dr_44.h \
descriptors/dr_45.h \
descriptors/dr_47.h \
descriptors/dr_48.h \
......@@ -64,6 +65,7 @@ descriptors_src = descriptors/dr_02.c \
descriptors/dr_0f.c \
descriptors/dr_42.c \
descriptors/dr_43.c \
descriptors/dr_44.c \
descriptors/dr_45.c \
descriptors/dr_47.c \
descriptors/dr_48.c \
......
......@@ -48,6 +48,7 @@
#include "dr_0f.h"
#include "dr_42.h"
#include "dr_43.h"
#include "dr_44.h"
#include "dr_45.h"
#include "dr_47.h"
#include "dr_48.h"
......
/*****************************************************************************
* dr_44.c
* Copyright (C) 2011 VideoLAN
* $Id$
*
* Authors: Ilkka Ollakka
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*****************************************************************************/
#include "config.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#if defined(HAVE_INTTYPES_H)
#include <inttypes.h>
#elif defined(HAVE_STDINT_H)
#include <stdint.h>
#endif
#include "../dvbpsi.h"
#include "../dvbpsi_private.h"
#include "../descriptor.h"
#include "dr_44.h"
/*****************************************************************************
* dvbpsi_DecodeCableDelivSysDr
*****************************************************************************/
dvbpsi_cable_deliv_sys_dr_t * dvbpsi_DecodeCableDelivSysDr(
dvbpsi_descriptor_t * p_descriptor)
{
dvbpsi_cable_deliv_sys_dr_t * p_decoded;
/* Check the tag */
if(p_descriptor->i_tag != 0x44)
{
DVBPSI_ERROR_ARG("dr_44 decoder", "bad tag (0x%x)", p_descriptor->i_tag);
return NULL;
}
/* Don't decode twice */
if(p_descriptor->p_decoded)
return p_descriptor->p_decoded;
/* Allocate memory */
p_decoded =
(dvbpsi_cable_deliv_sys_dr_t*)malloc(sizeof(dvbpsi_cable_deliv_sys_dr_t));
if(!p_decoded)
{
DVBPSI_ERROR("dr_44 decoder", "out of memory");
return NULL;
}
/* Decode data */
p_decoded->i_frequency = (uint32_t)(p_descriptor->p_data[0] << 24)
| (uint32_t)(p_descriptor->p_data[1] << 16)
| (uint32_t)(p_descriptor->p_data[2] << 8)
| (uint32_t)(p_descriptor->p_data[3] );
p_decoded->i_fec_outer = (uint8_t)(p_descriptor->p_data[5] & 0x0f);
p_decoded->i_modulation = (uint8_t)(p_descriptor->p_data[6] );
p_decoded->i_symbol_rate = (uint32_t)(p_descriptor->p_data[7] << 20)
| (uint32_t)(p_descriptor->p_data[8] << 12)
| (uint32_t)(p_descriptor->p_data[9] << 4)
| (uint32_t)((p_descriptor->p_data[10] & 0xf0) >> 4);
p_decoded->i_fec_inner = (uint8_t)(p_descriptor->p_data[10] & 0x0f);
p_descriptor->p_decoded = (void*)p_decoded;
return p_decoded;
}
/*****************************************************************************
* dvbpsi_GenCableDelivSysDr
*****************************************************************************/
dvbpsi_descriptor_t * dvbpsi_GenCableDelivSysDr(
dvbpsi_cable_deliv_sys_dr_t * p_decoded,
int b_duplicate)
{
/* Create the descriptor */
dvbpsi_descriptor_t * p_descriptor =
dvbpsi_NewDescriptor(0x44, 11, NULL);
if(p_descriptor)
{
/* Encode data */
p_descriptor->p_data[0] = (p_decoded->i_frequency >> 24) & 0xff;
p_descriptor->p_data[1] = (p_decoded->i_frequency >> 16) & 0xff;
p_descriptor->p_data[2] = (p_decoded->i_frequency >> 8) & 0xff;
p_descriptor->p_data[3] = p_decoded->i_frequency & 0xff;
p_descriptor->p_data[5] = (p_decoded->i_fec_outer & 0x0f);
p_descriptor->p_data[6] = (p_decoded->i_modulation);
p_descriptor->p_data[7] = (p_decoded->i_symbol_rate >> 20) & 0xff;
p_descriptor->p_data[8] = (p_decoded->i_symbol_rate >> 12) & 0xff;
p_descriptor->p_data[9] = (p_decoded->i_symbol_rate >> 4) & 0xff;
p_descriptor->p_data[10] = ((p_decoded->i_symbol_rate << 4) & 0xf0)
|(p_decoded->i_fec_inner & 0x0f);
if(b_duplicate)
{
/* Duplicate decoded data */
dvbpsi_cable_deliv_sys_dr_t * p_dup_decoded =
(dvbpsi_cable_deliv_sys_dr_t*)malloc(sizeof(dvbpsi_cable_deliv_sys_dr_t));
if(p_dup_decoded)
memcpy(p_dup_decoded, p_decoded, sizeof(dvbpsi_cable_deliv_sys_dr_t));
p_descriptor->p_decoded = (void*)p_dup_decoded;
}
}
return p_descriptor;
}
/*****************************************************************************
* dr_44.h
* Copyright (C) 2011 VideoLAN
* $Id$
*
* Authors: Ilkka Ollakka
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*****************************************************************************/
/*!
* \file <dr_44.h>
* \author Ilkka Ollakka
* \brief Application interface for the DVB cable delivery system
* descriptor decoder and generator.
*
* Application interface for the DVB cable delivery system descriptor
* decoder and generator. This descriptor's definition can be found in
* ETSI EN 300 468 section 6.2.13.1.
* dr_44.h is heavily based on dr_43.h file
*/
#ifndef _DVBPSI_DR_44_H_
#define _DVBPSI_DR_44_H_
#ifdef __cplusplus
extern "C" {
#endif
/*****************************************************************************
* dvbpsi_cable_deliv_sys_dr_t
*****************************************************************************/
/*!
* \struct dvbpsi_cable_deliv_sys_dr_s
* \brief cable delivery system descriptor structure.
*
* This structure is used to store a decoded cable delivery system
* descriptor. (ETSI EN 300 468 section 6.2.13.1).
*/
/*!
* \typedef struct dvbpsi_cable_deliv_sys_dr_s dvbpsi_cable_deliv_sys_dr_t
* \brief dvbpsi_cable_deliv_sys_dr_t type definition.
*/
typedef struct dvbpsi_cable_deliv_sys_dr_s
{
uint32_t i_frequency; /*!< frequency */
uint8_t i_modulation; /*!< modulation type */
uint32_t i_symbol_rate; /*!< symbol rate */
uint8_t i_fec_inner; /*!< FEC inner */
uint8_t i_fec_outer; /*!< FEC outer*/
} dvbpsi_cable_deliv_sys_dr_t;
/*****************************************************************************
* dvbpsi_DecodeCableDelivSysDr
*****************************************************************************/
/*!
* \fn dvbpsi_cable_deliv_sys_dr_t * dvbpsi_DecodeCableDelivSysDr(
dvbpsi_descriptor_t * p_descriptor)
* \brief cable delivery system descriptor decoder.
* \param p_descriptor pointer to the descriptor structure
* \return a pointer to a new cable delivery system descriptor structure
* which contains the decoded data.
*/
dvbpsi_cable_deliv_sys_dr_t* dvbpsi_DecodeCableDelivSysDr(
dvbpsi_descriptor_t * p_descriptor);
/*****************************************************************************
* dvbpsi_GenCableDelivSysDr
*****************************************************************************/
/*!
* \fn dvbpsi_descriptor_t * dvbpsi_GenCableDelivSysDr(
dvbpsi_cable_deliv_sys_dr_t * p_decoded, int b_duplicate)
* \brief cable delivery system descriptor generator.
* \param p_decoded pointer to a decoded cable delivery system descriptor
* descriptor structure
* \param b_duplicate if non zero then duplicate the p_decoded structure into
* the descriptor
* \return a pointer to a new descriptor structure which contains encoded data.
*/
dvbpsi_descriptor_t * dvbpsi_GenCableDelivSysDr(
dvbpsi_cable_deliv_sys_dr_t * p_decoded,
int b_duplicate);
#ifdef __cplusplus
};
#endif
#else
#error "Multiple inclusions of dr_44.h"
#endif
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