Commit 8176eb84 authored by Christophe Massiot's avatar Christophe Massiot

* src/tables/eit*: EIT decoder (no generator yet)

  * 0x55 (dvb parental rating) descriptor decoder
  * fixed a segfault in the subtitles descriptor decoder
  * bumped up version number to 0.1.5
parent 84476959
......@@ -12,4 +12,24 @@ D: main structure
D: PSI section gathering
D: PAT decoder/generator
D: PMT decoder/generator
D: MPEG descriptors
N: Johan Bilien
E: jobi@via.ecp.fr
C: jobi
D: subtables decoder
D: SDT decoder
D: most DVB descriptors
N: Tristan Leteurtre
E: tristan.leteurtre@anevia.com
C: tooney
D: subtitles descriptor (0x59)
N: Christophe Massiot
E: massiot@via.ecp.fr
C: massiot
D: initial specs
D: EIT decoder
D: parental rating descriptor (0x55)
$Id: NEWS,v 1.5 2004/01/02 14:15:46 sam Exp $
$Id$
Changes between 0.1.4 and 0.1.5:
--------------------------------
* src/tables/eit*: EIT decoder (no generator yet)
* 0x55 (dvb parental rating) descriptor decoder
* fixed a segfault in the subtitles descriptor decoder
Changes between 0.1.3 and 0.1.4:
--------------------------------
......
......@@ -4,7 +4,7 @@ AC_PREREQ(2.50)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_SYSTEM
AM_INIT_AUTOMAKE(libdvbpsi3, 0.1.4)
AM_INIT_AUTOMAKE(libdvbpsi3, 0.1.5)
AM_CONFIG_HEADER(config.h)
#AC_CANONICAL_HOST
......
......@@ -14,7 +14,7 @@ libdvbpsi_la_SOURCES = dvbpsi.c dvbpsi_private.h \
libdvbpsi_la_LDFLAGS = -version-info 3:0:0
pkginclude_HEADERS = dvbpsi.h psi.h descriptor.h demux.h \
tables/pat.h tables/pmt.h tables/sdt.h \
tables/pat.h tables/pmt.h tables/sdt.h tables/eit.h \
descriptors/dr_02.h \
descriptors/dr_03.h \
descriptors/dr_04.h \
......@@ -32,6 +32,7 @@ pkginclude_HEADERS = dvbpsi.h psi.h descriptor.h demux.h \
descriptors/dr_42.h \
descriptors/dr_47.h \
descriptors/dr_48.h \
descriptors/dr_55.h \
descriptors/dr_59.h \
descriptors/dr.h
......@@ -52,9 +53,11 @@ descriptors_src = descriptors/dr_02.c \
descriptors/dr_42.c \
descriptors/dr_47.c \
descriptors/dr_48.c \
descriptors/dr_55.c \
descriptors/dr_59.c
tables_src = tables/pat.c tables/pat_private.h \
tables/pmt.c tables/pmt_private.h \
tables/sdt.c tables/sdt_private.h
tables/sdt.c tables/sdt_private.h \
tables/eit.c tables/eit_private.h
/*****************************************************************************
* dr.h
* (c)2001-2002 VideoLAN
* $Id: dr.h,v 1.5 2003/11/06 16:20:30 nitrox Exp $
* $Id$
*
* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
*
......@@ -49,6 +49,7 @@
#include "dr_42.h"
#include "dr_47.h"
#include "dr_48.h"
#include "dr_55.h"
#include "dr_59.h"
#else
......
/*****************************************************************************
* dr_55.c
* (c)2004 VideoLAN
* $Id: dr_55.c 89 2004-06-28 19:17:23Z gbazin $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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_55.h"
/*****************************************************************************
* dvbpsi_DecodeParentalRatingDr
*****************************************************************************/
dvbpsi_parental_rating_dr_t * dvbpsi_DecodeParentalRatingDr(
dvbpsi_descriptor_t * p_descriptor)
{
int i_ratings_number, i;
dvbpsi_parental_rating_dr_t * p_decoded;
/* Check the tag */
if(p_descriptor->i_tag != 0x55)
{
DVBPSI_ERROR_ARG("dr_55 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_parental_rating_dr_t*)malloc(sizeof(dvbpsi_parental_rating_dr_t));
if(!p_decoded)
{
DVBPSI_ERROR("dr_55 decoder", "out of memory");
return NULL;
}
/* Decode data and check the length */
if(p_descriptor->i_length % 4)
{
DVBPSI_ERROR_ARG("dr_55 decoder", "length not multiple of 4 (%d)",
p_descriptor->i_length);
free(p_decoded);
return NULL;
}
i_ratings_number = p_descriptor->i_length / 4;
p_decoded->i_ratings_number = i_ratings_number;
for (i=0; i < i_ratings_number; i++)
{
p_decoded->p_parental_rating[i].i_country_code =
((uint32_t)p_descriptor->p_data[4 * i] << 16)
| ((uint32_t)p_descriptor->p_data[4 * i + 1] << 8)
| p_descriptor->p_data[4 * i + 2];
p_decoded->p_parental_rating[i].i_rating = p_descriptor->p_data[4 * i + 3];
}
p_descriptor->p_decoded = (void*)p_decoded;
return p_decoded;
}
/*****************************************************************************
* dvbpsi_GenParentalRatingDr
*****************************************************************************/
dvbpsi_descriptor_t * dvbpsi_GenParentalRatingDr(
dvbpsi_parental_rating_dr_t * p_decoded,
int b_duplicate)
{
int i;
/* Create the descriptor */
dvbpsi_descriptor_t * p_descriptor =
dvbpsi_NewDescriptor(0x55, p_decoded->i_ratings_number * 4 , NULL);
if(p_descriptor)
{
/* Encode data */
for (i=0; i < p_decoded->i_ratings_number; i++ )
{
p_descriptor->p_data[8 * i] =
p_decoded->p_parental_rating[i].i_country_code >> 16;
p_descriptor->p_data[8 * i + 1] =
(p_decoded->p_parental_rating[i].i_country_code >> 8) & 0xff;
p_descriptor->p_data[8 * i + 2] =
p_decoded->p_parental_rating[i].i_country_code & 0xff;
p_descriptor->p_data[8 * i + 3] =
p_decoded->p_parental_rating[i].i_rating;
}
if(b_duplicate)
{
/* Duplicate decoded data */
dvbpsi_parental_rating_dr_t * p_dup_decoded =
(dvbpsi_parental_rating_dr_t*)malloc(sizeof(dvbpsi_parental_rating_dr_t));
if(p_dup_decoded)
memcpy(p_dup_decoded, p_decoded, sizeof(dvbpsi_parental_rating_dr_t));
p_descriptor->p_decoded = (void*)p_dup_decoded;
}
}
return p_descriptor;
}
/*****************************************************************************
* dr_55.h
* (c)2004 VideoLAN
* $Id: dr_55.h 88 2004-02-24 14:31:18Z sam $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
*****************************************************************************/
/*!
* \file <dr_55.h>
* \author Christophe Massiot <massiot@via.ecp.fr>
* \brief Parental rating descriptor parsing.
*
* Parental rating descriptor parsing, according to ETSI EN 300 468
* section 6.2.26.
*/
#ifndef _DVBPSI_DR_55_H_
#define _DVBPSI_DR_55_H_
#ifdef __cplusplus
extern "C" {
#endif
/*****************************************************************************
* dvbpsi_parental_rating_t
*****************************************************************************/
/*!
* \struct dvbpsi_parental_rating_s
* \brief one subtitle structure.
*
* This structure is used since parental_rating_descriptor will contain several
* coutry/rating pairs.
*/
/*!
* \typedef struct dvbpsi_parental_rating_s dvbpsi_parental_rating_t
* \brief dvbpsi_parental_rating_t type definition.
*/
typedef struct dvbpsi_parental_rating_s
{
uint32_t i_country_code;
uint8_t i_rating;
} dvbpsi_parental_rating_t;
/*****************************************************************************
* dvbpsi_parental_rating_dr_t
*****************************************************************************/
/*!
* \struct dvbpsi_parental_rating_dr_s
* \brief "parental_rating" descriptor structure.
*
* This structure is used to store a decoded "parental_rating"
* descriptor. (ETSI EN 300 468 section 6.2.26).
*/
/*!
* \typedef struct dvbpsi_parental_rating_dr_s dvbpsi_parental_rating_dr_t
* \brief dvbpsi_parental_rating_dr_t type definition.
*/
typedef struct dvbpsi_parental_rating_dr_s
{
uint8_t i_ratings_number;
dvbpsi_parental_rating_t p_parental_rating[64];
} dvbpsi_parental_rating_dr_t;
/*****************************************************************************
* dvbpsi_DecodeParentalRatingDataDr
*****************************************************************************/
/*!
* \fn dvbpsi_parental_rating_dr_t * dvbpsi_DecodeParentalRatingDr(
dvbpsi_descriptor_t * p_descriptor)
* \brief "parental_rating" descriptor decoder.
* \param p_descriptor pointer to the descriptor structure
* \return a pointer to a new "parental_rating" descriptor structure
* which contains the decoded data.
*/
dvbpsi_parental_rating_dr_t* dvbpsi_DecodeParentalRatingDr(
dvbpsi_descriptor_t * p_descriptor);
/*****************************************************************************
* dvbpsi_GenParentalRatingDataDr
*****************************************************************************/
/*!
* \fn dvbpsi_descriptor_t * dvbpsi_GenParentalRatingDr(
dvbpsi_parental_rating_dr_t * p_decoded, int b_duplicate)
* \brief "parental_rating" descriptor generator.
* \param p_decoded pointer to a decoded "parental_rating" 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_GenParentalRatingDr(
dvbpsi_parental_rating_dr_t * p_decoded,
int b_duplicate);
#ifdef __cplusplus
};
#endif
#else
#error "Multiple inclusions of dr_55.h"
#endif
/*****************************************************************************
* dr_48.c
* dr_59.c
* (c)2001-2002 VideoLAN
* $Id$
*
......@@ -77,6 +77,7 @@ dvbpsi_subtitling_dr_t * dvbpsi_DecodeSubtitlingDr(
DVBPSI_ERROR_ARG("dr_59 decoder", "bad length (%d)",
p_descriptor->i_length);
free(p_decoded);
return NULL;
}
if(p_descriptor->i_length % 8)
......@@ -84,6 +85,7 @@ dvbpsi_subtitling_dr_t * dvbpsi_DecodeSubtitlingDr(
DVBPSI_ERROR_ARG("dr_59 decoder", "length not multiple of 8 (%d)",
p_descriptor->i_length);
free(p_decoded);
return NULL;
}
i_subtitles_number = p_descriptor->i_length / 8;
......
/*****************************************************************************
* dr_59.h
* (c)2001-2002 VideoLAN
* $Id: dr_59.h,v 1.1 2003/11/06 16:20:30 nitrox Exp $
* $Id$
*
* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
* Tristan Leteurtre <tristan.leteurtre@anevia.com>
......@@ -42,7 +42,7 @@ extern "C" {
* dvbpsi_subtitle_t
*****************************************************************************/
/*!
* \struct dvbpsi_subtitle_dr_s
* \struct dvbpsi_subtitle_s
* \brief one subtitle structure.
*
* This structure is used since subtitling_descriptor will contain several
......
/*****************************************************************************
* eit.c: EIT decoder/generator
*----------------------------------------------------------------------------
* (c)2004 VideoLAN
* $Id: eit.c 88 2004-02-24 14:31:18Z sam $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Johan Bilien <jobi@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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 "../psi.h"
#include "../descriptor.h"
#include "../demux.h"
#include "eit.h"
#include "eit_private.h"
/*****************************************************************************
* dvbpsi_AttachEIT
*****************************************************************************
* Initialize a EIT subtable decoder.
*****************************************************************************/
int dvbpsi_AttachEIT(dvbpsi_decoder_t * p_psi_decoder, uint8_t i_table_id,
uint16_t i_extension, dvbpsi_eit_callback pf_callback,
void* p_cb_data)
{
dvbpsi_demux_t* p_demux = (dvbpsi_demux_t*)p_psi_decoder->p_private_decoder;
dvbpsi_demux_subdec_t* p_subdec;
dvbpsi_eit_decoder_t* p_eit_decoder;
unsigned int i;
if(dvbpsi_demuxGetSubDec(p_demux, i_table_id, i_extension))
{
DVBPSI_ERROR_ARG("EIT decoder",
"Already a decoder for (table_id == 0x%02x,"
"extension == 0x%02x)",
i_table_id, i_extension);
return 1;
}
p_subdec = (dvbpsi_demux_subdec_t*)malloc(sizeof(dvbpsi_demux_subdec_t));
if(p_subdec == NULL)
{
return 1;
}
p_eit_decoder = (dvbpsi_eit_decoder_t*)malloc(sizeof(dvbpsi_eit_decoder_t));
if(p_eit_decoder == NULL)
{
free(p_subdec);
return 1;
}
/* subtable decoder configuration */
p_subdec->pf_callback = &dvbpsi_GatherEITSections;
p_subdec->p_cb_data = p_eit_decoder;
p_subdec->i_id = (uint32_t)i_table_id << 16 | (uint32_t)i_extension;
/* Attach the subtable decoder to the demux */
p_subdec->p_next = p_demux->p_first_subdec;
p_demux->p_first_subdec = p_subdec;
/* EIT decoder information */
p_eit_decoder->pf_callback = pf_callback;
p_eit_decoder->p_cb_data = p_cb_data;
/* EIT decoder initial state */
p_eit_decoder->b_current_valid = 0;
p_eit_decoder->p_building_eit = NULL;
for(i = 0; i <= 255; i++)
p_eit_decoder->ap_sections[i] = NULL;
return 0;
}
/*****************************************************************************
* dvbpsi_DetachEIT
*****************************************************************************
* Close a EIT decoder.
*****************************************************************************/
void dvbpsi_DetachEIT(dvbpsi_demux_t * p_demux, uint8_t i_table_id,
uint16_t i_extension)
{
dvbpsi_demux_subdec_t* p_subdec;
dvbpsi_demux_subdec_t* p_next_subdec;
dvbpsi_eit_decoder_t* p_eit_decoder;
unsigned int i;
p_subdec = dvbpsi_demuxGetSubDec(p_demux, i_table_id, i_extension);
if(p_demux == NULL)
{
DVBPSI_ERROR_ARG("EIT Decoder",
"No such EIT decoder (table_id == 0x%02x,"
"extension == 0x%02x)",
i_table_id, i_extension);
return;
}
p_next_subdec = p_subdec->p_next;
p_eit_decoder = (dvbpsi_eit_decoder_t*)p_subdec->p_cb_data;
free(p_eit_decoder->p_building_eit);
for(i = 0; i <= 255; i++)
{
if(p_eit_decoder->ap_sections[i])
free(p_eit_decoder->ap_sections[i]);
}
free(p_subdec->p_cb_data);
free(p_subdec);
p_subdec = p_next_subdec;
}
/*****************************************************************************
* dvbpsi_InitEIT
*****************************************************************************
* Initialize a pre-allocated dvbpsi_eit_t structure.
*****************************************************************************/
void dvbpsi_InitEIT(dvbpsi_eit_t* p_eit, uint16_t i_service_id, uint8_t i_version,
int b_current_next, uint16_t i_ts_id, uint16_t i_network_id,
uint8_t i_segment_last_section_number,
uint8_t i_last_table_id)
{
p_eit->i_service_id = i_service_id;
p_eit->i_version = i_version;
p_eit->b_current_next = b_current_next;
p_eit->i_ts_id = i_ts_id;
p_eit->i_network_id = i_network_id;
p_eit->i_segment_last_section_number = i_segment_last_section_number;
p_eit->i_last_table_id = i_last_table_id;
p_eit->p_first_event = NULL;
}
/*****************************************************************************
* dvbpsi_EmptyEIT
*****************************************************************************
* Clean a dvbpsi_eit_t structure.
*****************************************************************************/
void dvbpsi_EmptyEIT(dvbpsi_eit_t* p_eit)
{
dvbpsi_eit_event_t* p_event = p_eit->p_first_event;
while(p_event != NULL)
{
dvbpsi_eit_event_t* p_tmp = p_event->p_next;
dvbpsi_DeleteDescriptors(p_event->p_first_descriptor);
free(p_event);
p_event = p_tmp;
}
p_eit->p_first_event = NULL;
}
/*****************************************************************************
* dvbpsi_EITAddEvent
*****************************************************************************
* Add an event description at the end of the EIT.
*****************************************************************************/
dvbpsi_eit_event_t* dvbpsi_EITAddEvent(dvbpsi_eit_t* p_eit,
uint16_t i_event_id, uint64_t i_start_time, uint32_t i_duration,
uint8_t i_running_status,int b_free_ca)
{
dvbpsi_eit_event_t* p_event
= (dvbpsi_eit_event_t*)malloc(sizeof(dvbpsi_eit_event_t));
if(p_event)
{
p_event->i_event_id = i_event_id;
p_event->i_start_time = i_start_time;
p_event->i_duration = i_duration;
p_event->i_running_status = i_running_status;
p_event->b_free_ca = b_free_ca;
p_event->p_next = NULL;
p_event->p_first_descriptor = NULL;
if(p_eit->p_first_event == NULL)
{
p_eit->p_first_event = p_event;
}
else
{
dvbpsi_eit_event_t* p_last_event = p_eit->p_first_event;
while(p_last_event->p_next != NULL)
p_last_event = p_last_event->p_next;
p_last_event->p_next = p_event;
}
}
return p_event;
}
/*****************************************************************************
* dvbpsi_EITEventAddDescriptor
*****************************************************************************
* Add a descriptor in the EIT event description.
*****************************************************************************/
dvbpsi_descriptor_t* dvbpsi_EITEventAddDescriptor(
dvbpsi_eit_event_t* p_event,
uint8_t i_tag, uint8_t i_length,
uint8_t* p_data)
{
dvbpsi_descriptor_t* p_descriptor
= dvbpsi_NewDescriptor(i_tag, i_length, p_data);
if(p_descriptor)
{
if(p_event->p_first_descriptor == NULL)
{
p_event->p_first_descriptor = p_descriptor;
}
else
{
dvbpsi_descriptor_t* p_last_descriptor = p_event->p_first_descriptor;
while(p_last_descriptor->p_next != NULL)
p_last_descriptor = p_last_descriptor->p_next;
p_last_descriptor->p_next = p_descriptor;
}
}
return p_descriptor;
}