dr.h   dr.h 
/************************************************************************** *** /************************************************************************** ***
* dr.h * dr.h
* (c)2001-2002 VideoLAN * (c)2001-2002 VideoLAN
* $Id: dr.h 105 2005-03-23 17:02:48Z fenrir $ * $Id: dr.h 157 2007-10-16 18:01:15Z jpsaman $
* *
* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr> * Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2 * as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version. * of the License, or (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
skipping to change at line 58 skipping to change at line 58
#include "dr_0f.h" #include "dr_0f.h"
#include "dr_42.h" #include "dr_42.h"
#include "dr_47.h" #include "dr_47.h"
#include "dr_48.h" #include "dr_48.h"
#include "dr_4d.h" #include "dr_4d.h"
#include "dr_4e.h" #include "dr_4e.h"
#include "dr_52.h" #include "dr_52.h"
#include "dr_55.h" #include "dr_55.h"
#include "dr_56.h" #include "dr_56.h"
#include "dr_59.h" #include "dr_59.h"
#include "dr_69.h"
#else #else
#error "Multiple inclusions of dr.h" #error "Multiple inclusions of dr.h"
#endif #endif
 End of changes. 2 change blocks. 
1 lines changed or deleted 2 lines changed or added


 dr_0a.h   dr_0a.h 
/************************************************************************** *** /************************************************************************** ***
* dr_0a.h * dr_0a.h
* (c)2001-2002 VideoLAN * (c)2001-2002 VideoLAN
* $Id: dr_0a.h 88 2004-02-24 14:31:18Z sam $ * $Id: dr_0a.h 132 2006-07-18 08:34:12Z sigmunau $
* *
* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr> * Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2 * as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version. * of the License, or (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
skipping to change at line 42 skipping to change at line 42
* ISO/IEC 13818-1 section 2.6.18. * ISO/IEC 13818-1 section 2.6.18.
*/ */
#ifndef _DVBPSI_DR_0A_H_ #ifndef _DVBPSI_DR_0A_H_
#define _DVBPSI_DR_0A_H_ #define _DVBPSI_DR_0A_H_
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#define DR_0A_API_VER 2
typedef uint8_t iso_639_language_code_t[3];
/************************************************************************** *** /************************************************************************** ***
* dvbpsi_iso639_dr_t * dvbpsi_iso639_dr_t
************************************************************************** ***/ ************************************************************************** ***/
/*! /*!
* \struct dvbpsi_iso639_dr_s * \struct dvbpsi_iso639_dr_s
* \brief "ISO 639 language" descriptor structure. * \brief "ISO 639 language" descriptor structure.
* *
* This structure is used to store a decoded "ISO 639 language" * This structure is used to store a decoded "ISO 639 language"
* descriptor. (ISO/IEC 13818-1 section 2.6.18). * descriptor. (ISO/IEC 13818-1 section 2.6.18).
*/ */
/*! /*!
* \typedef struct dvbpsi_iso639_dr_s dvbpsi_iso639_dr_t * \typedef struct dvbpsi_iso639_dr_s dvbpsi_iso639_dr_t
* \brief dvbpsi_iso639_dr_t type definition. * \brief dvbpsi_iso639_dr_t type definition.
*/ */
typedef struct dvbpsi_iso639_dr_s typedef struct dvbpsi_iso639_dr_s
{ {
uint8_t i_code_count; /*!< length of the i_iso_639_code uint8_t i_code_count; /*!< length of the i_iso_639_code
array */ array */
uint8_t i_iso_639_code[252]; /*!< ISO_639_language_code */ struct {
uint8_t i_audio_type; /*!< audio_type */ iso_639_language_code_t iso_639_code; /*!< ISO_639_language_code */
uint8_t i_audio_type; /*!< audio_type */
} code[64];
} dvbpsi_iso639_dr_t; } dvbpsi_iso639_dr_t;
/************************************************************************** *** /************************************************************************** ***
* dvbpsi_DecodeISO639Dr * dvbpsi_DecodeISO639Dr
************************************************************************** ***/ ************************************************************************** ***/
/*! /*!
* \fn dvbpsi_iso639_dr_t * dvbpsi_DecodeISO639Dr( * \fn dvbpsi_iso639_dr_t * dvbpsi_DecodeISO639Dr(
dvbpsi_descriptor_t * p_descriptor) dvbpsi_descriptor_t * p_descriptor)
* \brief "ISO 639 language" descriptor decoder. * \brief "ISO 639 language" descriptor decoder.
 End of changes. 3 change blocks. 
3 lines changed or deleted 8 lines changed or added


 dr_42.h   dr_42.h 
/************************************************************************** *** /************************************************************************** ***
* dr_42.h * dr_42.h
* (c)2001-2002 VideoLAN * (c)2001-2002 VideoLAN
* $Id: dr_42.h 88 2004-02-24 14:31:18Z sam $ * $Id: dr_42.h 147 2007-10-11 06:46:25Z jpsaman $
* *
* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr> * Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
* Johan Bilien <jobi@via.ecp.fr> * Johan Bilien <jobi@via.ecp.fr>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2 * as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version. * of the License, or (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
skipping to change at line 66 skipping to change at line 66
*/ */
typedef struct dvbpsi_stuffing_dr_s typedef struct dvbpsi_stuffing_dr_s
{ {
uint8_t i_stuffing_length; /*!< length of the i_stuffing_ byte uint8_t i_stuffing_length; /*!< length of the i_stuffing_ byte
array */ array */
uint8_t i_stuffing_byte[255]; /*!< stuffing_bytes */ uint8_t i_stuffing_byte[255]; /*!< stuffing_bytes */
} dvbpsi_stuffing_dr_t; } dvbpsi_stuffing_dr_t;
/************************************************************************** *** /************************************************************************** ***
* dvbpsi_DecodeStuffingDataDr * dvbpsi_DecodeStuffingDr
************************************************************************** ***/ ************************************************************************** ***/
/*! /*!
* \fn dvbpsi_stuffing_dr_t * dvbpsi_DecodeStuffingDr( * \fn dvbpsi_stuffing_dr_t * dvbpsi_DecodeStuffingDr(
dvbpsi_descriptor_t * p_descriptor) dvbpsi_descriptor_t * p_descriptor)
* \brief "stuffing" descriptor decoder. * \brief "stuffing" descriptor decoder.
* \param p_descriptor pointer to the descriptor structure * \param p_descriptor pointer to the descriptor structure
* \return a pointer to a new "stuffing" descriptor structure * \return a pointer to a new "stuffing" descriptor structure
* which contains the decoded data. * which contains the decoded data.
*/ */
dvbpsi_stuffing_dr_t* dvbpsi_DecodeStuffingDr( dvbpsi_stuffing_dr_t* dvbpsi_DecodeStuffingDr(
dvbpsi_descriptor_t * p_descriptor) ; dvbpsi_descriptor_t * p_descriptor) ;
/************************************************************************** *** /************************************************************************** ***
* dvbpsi_GenStuffingDataDr * dvbpsi_GenStuffingDr
************************************************************************** ***/ ************************************************************************** ***/
/*! /*!
* \fn dvbpsi_descriptor_t * dvbpsi_GenStuffingDr( * \fn dvbpsi_descriptor_t * dvbpsi_GenStuffingDr(
dvbpsi_stuffing_data_dr_t * p_decoded, int b_duplic ate) dvbpsi_stuffing_data_dr_t * p_decoded, int b_duplic ate)
* \brief "stuffing" descriptor generator. * \brief "stuffing" descriptor generator.
* \param p_decoded pointer to a decoded "stuffing" descriptor * \param p_decoded pointer to a decoded "stuffing" descriptor
* structure * structure
* \param b_duplicate if non zero then duplicate the p_decoded structure in to * \param b_duplicate if non zero then duplicate the p_decoded structure in to
* the descriptor * the descriptor
* \return a pointer to a new descriptor structure which contains encoded d ata. * \return a pointer to a new descriptor structure which contains encoded d ata.
*/ */
dvbpsi_descriptor_t * dvbpsi_GenStuffingDataDr( dvbpsi_descriptor_t * dvbpsi_GenStuffingDr(
dvbpsi_stuffing_dr_t * p_decoded, dvbpsi_stuffing_dr_t * p_decoded,
int b_duplicate); int b_duplicate);
#ifdef __cplusplus #ifdef __cplusplus
}; };
#endif #endif
#else #else
#error "Multiple inclusions of dr_42.h" #error "Multiple inclusions of dr_42.h"
#endif #endif
 End of changes. 4 change blocks. 
4 lines changed or deleted 4 lines changed or added


 dr_56.h   dr_56.h 
/************************************************************************** *** /************************************************************************** ***
* dr_56.h * dr_56.h
* (c)2004 VideoLAN * (c)2004-2007 VideoLAN
* $Id: dr_56.h 93 2004-10-19 19:17:49Z massiot $ * $Id: dr_56.h 93 2004-10-19 19:17:49Z massiot $
* *
* Authors: Derk-Jan Hartman <hartman at videolan dot org> * Authors: Derk-Jan Hartman <hartman at videolan dot org>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2 * as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version. * of the License, or (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
skipping to change at line 31 skipping to change at line 31
* *
************************************************************************** ***/ ************************************************************************** ***/
/*! /*!
* \file <dr_56.h> * \file <dr_56.h>
* \author Derk-Jan Hartman <hartman at videolan dot org> * \author Derk-Jan Hartman <hartman at videolan dot org>
* \brief EBU Teletext descriptor parsing. * \brief EBU Teletext descriptor parsing.
* *
* DVB EBU Teletext descriptor parsing, according to ETSI EN 300 468 * DVB EBU Teletext descriptor parsing, according to ETSI EN 300 468
* section 6.2.41. * section 6.2.41.
*
* NOTE: this descriptor is known by tag value 0x56 AND 0x46
*/ */
#ifndef _DVBPSI_DR_56_H_ #ifndef _DVBPSI_DR_56_H_
#define _DVBPSI_DR_56_H_ #define _DVBPSI_DR_56_H_
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/************************************************************************** *** /************************************************************************** ***
skipping to change at line 68 skipping to change at line 70
uint8_t i_teletext_magazine_number; /* 3 bits */ uint8_t i_teletext_magazine_number; /* 3 bits */
uint8_t i_teletext_page_number; /* 8 bits */ uint8_t i_teletext_page_number; /* 8 bits */
} dvbpsi_teletextpage_t; } dvbpsi_teletextpage_t;
/************************************************************************** *** /************************************************************************** ***
* dvbpsi_teletext_dr_t * dvbpsi_teletext_dr_t
************************************************************************** ***/ ************************************************************************** ***/
/*! /*!
* \struct dvbpsi_teletext_dr_s * \struct dvbpsi_teletext_dr_s
* \brief "subtitling" descriptor structure. * \brief "teletext" descriptor structure.
* *
* This structure is used to store a decoded "subtitling" * This structure is used to store a decoded "teletext"
* descriptor. (ETSI EN 300 468 section 6.2.30). * descriptor. (ETSI EN 300 468 section 6.2.41).
*/ */
/*! /*!
* \typedef struct dvbpsi_teletext_dr_s dvbpsi_teletext_dr_t * \typedef struct dvbpsi_teletext_dr_s dvbpsi_teletext_dr_t
* \brief dvbpsi_teletext_dr_t type definition. * \brief dvbpsi_teletext_dr_t type definition.
*/ */
typedef struct dvbpsi_teletext_dr_s typedef struct dvbpsi_teletext_dr_s
{ {
uint8_t i_pages_number; uint8_t i_pages_number;
dvbpsi_teletextpage_t p_pages[64]; dvbpsi_teletextpage_t p_pages[64];
} dvbpsi_teletext_dr_t; } dvbpsi_teletext_dr_t;
/************************************************************************** *** /************************************************************************** ***
* dvbpsi_DecodeTeletextDataDr * dvbpsi_DecodeTeletextDataDr
************************************************************************** ***/ ************************************************************************** ***/
/*! /*!
* \fn dvbpsi_teletext_dr_t * dvbpsi_DecodeTeletextDataDr( * \fn dvbpsi_teletext_dr_t * dvbpsi_DecodeTeletextDataDr(
dvbpsi_descriptor_t * p_descriptor) dvbpsi_descriptor_t * p_descriptor)
* \brief "subtitling" descriptor decoder. * \brief "teletext" descriptor decoder.
* \param p_descriptor pointer to the descriptor structure * \param p_descriptor pointer to the descriptor structure
* \return a pointer to a new "subtitling" descriptor structure * \return a pointer to a new "teletext" descriptor structure
* which contains the decoded data. * which contains the decoded data.
*/ */
dvbpsi_teletext_dr_t* dvbpsi_DecodeTeletextDataDr( dvbpsi_teletext_dr_t* dvbpsi_DecodeTeletextDr(
dvbpsi_descriptor_t * p_descriptor) ; dvbpsi_descriptor_t * p_descriptor) ;
/************************************************************************** *** /************************************************************************** ***
* dvbpsi_GenTeletextDr * dvbpsi_GenTeletextDr
************************************************************************** ***/ ************************************************************************** ***/
/*! /*!
* \fn dvbpsi_descriptor_t * dvbpsi_GenTeletextDr( * \fn dvbpsi_descriptor_t * dvbpsi_GenTeletextDr(
dvbpsi_teletext_dr_t * p_decoded, int b_duplicate) dvbpsi_teletext_dr_t * p_decoded, int b_duplicate)
* \brief "teletext" descriptor generator. * \brief "teletext" descriptor generator.
* \param p_decoded pointer to a decoded "teletext" descriptor * \param p_decoded pointer to a decoded "teletext" descriptor
 End of changes. 7 change blocks. 
7 lines changed or deleted 9 lines changed or added


 dvbpsi.h   dvbpsi.h 
/************************************************************************** *** /************************************************************************** ***
* dvbpsi.h * dvbpsi.h
* (c)2001-2002 VideoLAN * (c)2001-2002 VideoLAN
* $Id: dvbpsi.h 88 2004-02-24 14:31:18Z sam $ * $Id: dvbpsi.h 138 2007-01-22 18:03:13Z massiot $
* *
* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr> * Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2 * as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version. * of the License, or (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
skipping to change at line 36 skipping to change at line 36
* \author Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr> * \author Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
* \brief Application interface for all DVB/PSI decoders. * \brief Application interface for all DVB/PSI decoders.
* *
* Application interface for all DVB/PSI decoders. The generic decoder * Application interface for all DVB/PSI decoders. The generic decoder
* structure is public so that external decoders are allowed. * structure is public so that external decoders are allowed.
*/ */
#ifndef _DVBPSI_DVBPSI_H_ #ifndef _DVBPSI_DVBPSI_H_
#define _DVBPSI_DVBPSI_H_ #define _DVBPSI_DVBPSI_H_
#define DVBPSI_VERSION 0.1.6
#define DVBPSI_VERSION_INT ((0<<16)+(1<<8)+6)
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/************************************************************************** *** /************************************************************************** ***
* dvbpsi_handle * dvbpsi_handle
************************************************************************** ***/ ************************************************************************** ***/
/*! /*!
* \typedef struct dvbpsi_decoder_s * dvbpsi_handle * \typedef struct dvbpsi_decoder_s * dvbpsi_handle
* \brief Decoder abstration. * \brief Decoder abstration.
 End of changes. 2 change blocks. 
1 lines changed or deleted 4 lines changed or added


 eit.h   eit.h 
skipping to change at line 233 skipping to change at line 233
* \param i_start_time Start Time * \param i_start_time Start Time
* \param i_duration Duration * \param i_duration Duration
* \param i_running_status Running status * \param i_running_status Running status
* \param b_free_ca Free CA flag * \param b_free_ca Free CA flag
* \return a pointer to the added service description. * \return a pointer to the added service description.
*/ */
dvbpsi_eit_event_t* dvbpsi_EITAddEvent(dvbpsi_eit_t* p_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, uint16_t i_event_id, uint64_t i_start_time, uint32_t i_duration,
uint8_t i_running_status, int b_free_ca); uint8_t i_running_status, int b_free_ca);
/**************************************************************************
***
* dvbpsi_EITEventAddDescriptor
**************************************************************************
***/
/*!
* \fn dvbpsi_descriptor_t* dvbpsi_EITEventAddDescriptor(
dvbpsi_eit_event_t* p_event,
uint8_t i_tag, uint8_t i_len
gth,
uint8_t* p_data)
* \brief Add a descriptor to the EIT event.
* \param p_event pointer to the EIT event structure
* \param i_tag descriptor's tag
* \param i_length descriptor's length
* \param p_data descriptor's data
* \return a pointer to the added descriptor.
*/
dvbpsi_descriptor_t* dvbpsi_EITEventAddDescriptor(
dvbpsi_eit_event_t* p_event,
uint8_t i_tag, uint8_t i_len
gth,
uint8_t* p_data);
#ifdef __cplusplus #ifdef __cplusplus
}; };
#endif #endif
#else #else
#error "Multiple inclusions of eit.h" #error "Multiple inclusions of eit.h"
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 24 lines changed or added


 sdt.h   sdt.h 
/************************************************************************** *** /************************************************************************** ***
* sdt.h * sdt.h
* (c)2001-2002 VideoLAN * (c)2001-2002 VideoLAN
* $Id: sdt.h 103 2005-01-21 14:34:51Z massiot $ * $Id: sdt.h 118 2005-09-14 19:16:53Z massiot $
* *
* Authors: Johan Bilien <jobi@via.ecp.fr> * Authors: Johan Bilien <jobi@via.ecp.fr>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2 * as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version. * of the License, or (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
skipping to change at line 226 skipping to change at line 226
* \param b_eit_present EIT Present/Following flag * \param b_eit_present EIT Present/Following flag
* \param i_running_status Running status * \param i_running_status Running status
* \param b_free_ca Free CA flag * \param b_free_ca Free CA flag
* \return a pointer to the added service description. * \return a pointer to the added service description.
*/ */
dvbpsi_sdt_service_t *dvbpsi_SDTAddService(dvbpsi_sdt_t* p_sdt, dvbpsi_sdt_service_t *dvbpsi_SDTAddService(dvbpsi_sdt_t* p_sdt,
uint16_t i_service_id, int b_eit_schedule, int b_eit_present, uint16_t i_service_id, int b_eit_schedule, int b_eit_present,
uint8_t i_running_status,int b_free_ca); uint8_t i_running_status,int b_free_ca);
/************************************************************************** *** /************************************************************************** ***
* dvbpsi_SDTServiceAddDescriptor
**************************************************************************
***/
/*!
* \fn dvbpsi_descriptor_t *dvbpsi_SDTServiceAddDescriptor(
dvbpsi_sdt_service_t *p_serv
ice,
uint8_t i_tag, uint8_t i_len
gth,
uint8_t *p_data)
* \brief Add a descriptor in the SDT service.
* \param p_service pointer to the service structure
* \param i_tag descriptor's tag
* \param i_length descriptor's length
* \param p_data descriptor's data
* \return a pointer to the added descriptor.
*/
dvbpsi_descriptor_t *dvbpsi_SDTServiceAddDescriptor(
dvbpsi_sdt_service_t *p_serv
ice,
uint8_t i_tag, uint8_t i_len
gth,
uint8_t *p_data);
/**************************************************************************
***
* dvbpsi_GenSDTSections * dvbpsi_GenSDTSections
************************************************************************** *** ************************************************************************** ***
* Generate SDT sections based on the dvbpsi_sdt_t structure. * Generate SDT sections based on the dvbpsi_sdt_t structure.
************************************************************************** ***/ ************************************************************************** ***/
dvbpsi_psi_section_t *dvbpsi_GenSDTSections(dvbpsi_sdt_t * p_sdt); dvbpsi_psi_section_t *dvbpsi_GenSDTSections(dvbpsi_sdt_t * p_sdt);
#ifdef __cplusplus #ifdef __cplusplus
}; };
#endif #endif
 End of changes. 2 change blocks. 
1 lines changed or deleted 27 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/