dr.h   dr.h 
/************************************************************************** *** /************************************************************************** ***
* dr.h * dr.h
* Copyright (C) 2001-2010 VideoLAN * Copyright (C) 2001-2010 VideoLAN
* $Id$
* *
* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr> * Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version. * 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, * This library 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 62 skipping to change at line 61
#include "dr_41.h" #include "dr_41.h"
#include "dr_42.h" #include "dr_42.h"
#include "dr_43.h" #include "dr_43.h"
#include "dr_44.h" #include "dr_44.h"
#include "dr_45.h" #include "dr_45.h"
#include "dr_47.h" #include "dr_47.h"
#include "dr_48.h" #include "dr_48.h"
#include "dr_49.h" #include "dr_49.h"
#include "dr_4a.h" #include "dr_4a.h"
#include "dr_4b.h" #include "dr_4b.h"
#include "dr_4c.h"
#include "dr_4d.h" #include "dr_4d.h"
#include "dr_4e.h" #include "dr_4e.h"
#include "dr_4f.h" #include "dr_4f.h"
#include "dr_50.h" #include "dr_50.h"
#include "dr_52.h" #include "dr_52.h"
#include "dr_53.h"
#include "dr_54.h" #include "dr_54.h"
#include "dr_55.h" #include "dr_55.h"
#include "dr_56.h" #include "dr_56.h"
#include "dr_58.h" #include "dr_58.h"
#include "dr_59.h" #include "dr_59.h"
#include "dr_5a.h" #include "dr_5a.h"
#include "dr_62.h" #include "dr_62.h"
#include "dr_66.h" #include "dr_66.h"
#include "dr_69.h" #include "dr_69.h"
#include "dr_7c.h"
#include "dr_73.h" #include "dr_73.h"
#include "dr_76.h" #include "dr_76.h"
#include "dr_7c.h"
#include "dr_81.h"
#include "dr_83.h" #include "dr_83.h"
#include "dr_86.h"
#include "dr_8a.h" #include "dr_8a.h"
#include "dr_a0.h"
#include "dr_a1.h"
#else #else
#error "Multiple inclusions of dr.h" #error "Multiple inclusions of dr.h"
#endif #endif
 End of changes. 7 change blocks. 
2 lines changed or deleted 7 lines changed or added


 dr_45.h   dr_45.h 
skipping to change at line 67 skipping to change at line 67
{ {
uint8_t i_parity; /*!< parity bit (1 bits) */ uint8_t i_parity; /*!< parity bit (1 bits) */
uint8_t i_line_offset; /*!< line offset (5 bits) */ uint8_t i_line_offset; /*!< line offset (5 bits) */
} dvbpsi_vbidata_line_t; } dvbpsi_vbidata_line_t;
/*! /*!
* \def DVBPSI_VBIDATA_LINE_DR_MAX * \def DVBPSI_VBIDATA_LINE_DR_MAX
* \brief Maximum number of dvbpsi_vbidata_line_t entries present in * \brief Maximum number of dvbpsi_vbidata_line_t entries present in
* @see dvbpsi_vbidata_t * @see dvbpsi_vbidata_t
* @deprecated will be removed in next major version
*/ */
#define DVBPSI_VBIDATA_LINE_DR_MAX 255 #define DVBPSI_VBIDATA_LINE_DR_MAX 255
/************************************************************************** *** /************************************************************************** ***
* dvbpsi_vbidata_t * dvbpsi_vbidata_t
************************************************************************** ***/ ************************************************************************** ***/
/*! /*!
* \struct dvbpsi_vbidata_s * \struct dvbpsi_vbidata_s
* \brief one VBI data structure. * \brief one VBI data structure.
* *
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 dr_54.h   dr_54.h 
skipping to change at line 38 skipping to change at line 38
*/ */
#ifndef _DVBPSI_DR_54_H_ #ifndef _DVBPSI_DR_54_H_
#define _DVBPSI_DR_54_H_ #define _DVBPSI_DR_54_H_
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/*! /*!
* \def DVDPSI_GetContentCategoryFromType * \def DVBPSI_GetContentCategoryFromType
* \brief Extract content category by type. The value 'type' includes the * \brief Extract content category by type. The value 'type' includes the
* content category (MSB) and content detail (LSB). * content category (MSB) and content detail (LSB).
*/ */
#define DVDPSI_GetContentCategoryFromType(type) ((type) >> 4) #define DVBPSI_GetContentCategoryFromType(type) ((type) >> 4)
/*! /*!
* \def L1L2MERGE * \def L1L2MERGE
* \brief Merge content category and content detail in one byte. The * \brief Merge content category and content detail in one byte. The
* category is in the topmost 4-bits (MSB) and the content detail in * category is in the topmost 4-bits (MSB) and the content detail in
* the lower 4-bits (LSB). * the lower 4-bits (LSB).
*/ */
#define L1L2MERGE(L1,L2) ( ( DVBPSI_CONTENT_CAT ## L1<<4) | (L2) ) #define L1L2MERGE(L1,L2) ( ( DVBPSI_CONTENT_CAT ## L1<<4) | (L2) )
/* Content category */ /* Content category */
#define DVBPSI_CONTENT_CAT_UNDEFINED 0x0 #define DVBPSI_CONTENT_CAT_UNDEFINED 0x0 /*!< Undefined content */
#define DVBPSI_CONTENT_CAT_MOVIE 0x1 #define DVBPSI_CONTENT_CAT_MOVIE 0x1 /*!< Movie content */
#define DVBPSI_CONTENT_CAT_NEWS 0x2 #define DVBPSI_CONTENT_CAT_NEWS 0x2 /*!< News content */
#define DVBPSI_CONTENT_CAT_SHOW 0x3 #define DVBPSI_CONTENT_CAT_SHOW 0x3 /*!< TV Show content */
#define DVBPSI_CONTENT_CAT_SPORTS 0x4 #define DVBPSI_CONTENT_CAT_SPORTS 0x4 /*!< Sports content */
#define DVBPSI_CONTENT_CAT_CHILDREN 0x5 #define DVBPSI_CONTENT_CAT_CHILDREN 0x5 /*!< Children content */
#define DVBPSI_CONTENT_CAT_MUSIC 0x6 #define DVBPSI_CONTENT_CAT_MUSIC 0x6 /*!< Music content */
#define DVBPSI_CONTENT_CAT_CULTURE 0x7 #define DVBPSI_CONTENT_CAT_CULTURE 0x7 /*!< Culture content */
#define DVBPSI_CONTENT_CAT_SOCIAL 0x8 #define DVBPSI_CONTENT_CAT_SOCIAL 0x8 /*!< Social content */
#define DVBPSI_CONTENT_CAT_EDUCATION 0x9 #define DVBPSI_CONTENT_CAT_EDUCATION 0x9 /*!< Educational content */
#define DVBPSI_CONTENT_CAT_LEISURE 0xa #define DVBPSI_CONTENT_CAT_LEISURE 0xa /*!< Leisure content */
#define DVBPSI_CONTENT_CAT_SPECIAL 0xb #define DVBPSI_CONTENT_CAT_SPECIAL 0xb /*!< Special content */
#define DVBPSI_CONTENT_CAT_USERDEFINED 0xf #define DVBPSI_CONTENT_CAT_USERDEFINED 0xf /*!< User defined content */
/* Movie/Drama */ /* Movie/Drama */
#define DVBPSI_CONTENT_MOVIE_GENERAL L1L2MERGE( _MOVIE, 0x0 ) #define DVBPSI_CONTENT_MOVIE_GENERAL L1L2MERGE( _MOVIE, 0x0 ) /*!< G
#define DVBPSI_CONTENT_MOVIE_DETECTIVE L1L2MERGE( _MOVIE, 0x1 ) eneral Movie */
#define DVBPSI_CONTENT_MOVIE_ADVENTURE L1L2MERGE( _MOVIE, 0x2 ) #define DVBPSI_CONTENT_MOVIE_DETECTIVE L1L2MERGE( _MOVIE, 0x1 ) /*!< D
#define DVBPSI_CONTENT_MOVIE_SF L1L2MERGE( _MOVIE, 0x3 ) etective Movie */
#define DVBPSI_CONTENT_MOVIE_COMEDY L1L2MERGE( _MOVIE, 0x4 ) #define DVBPSI_CONTENT_MOVIE_ADVENTURE L1L2MERGE( _MOVIE, 0x2 ) /*!< A
#define DVBPSI_CONTENT_MOVIE_SOAP L1L2MERGE( _MOVIE, 0x5 ) dventure Movie */
#define DVBPSI_CONTENT_MOVIE_ROMANCE L1L2MERGE( _MOVIE, 0x6 ) #define DVBPSI_CONTENT_MOVIE_SF L1L2MERGE( _MOVIE, 0x3 ) /*!< S
#define DVBPSI_CONTENT_MOVIE_CLASSICAL L1L2MERGE( _MOVIE, 0x7 ) ciFi Movie */
#define DVBPSI_CONTENT_MOVIE_ADULT L1L2MERGE( _MOVIE, 0x8 ) #define DVBPSI_CONTENT_MOVIE_COMEDY L1L2MERGE( _MOVIE, 0x4 ) /*!< C
#define DVBPSI_CONTENT_MOVIE_USERDEFINED L1L2MERGE( _MOVIE, 0xf ) omedy Movie */
#define DVBPSI_CONTENT_MOVIE_SOAP L1L2MERGE( _MOVIE, 0x5 ) /*!< S
oap Movie */
#define DVBPSI_CONTENT_MOVIE_ROMANCE L1L2MERGE( _MOVIE, 0x6 ) /*!< R
omance Movie */
#define DVBPSI_CONTENT_MOVIE_CLASSICAL L1L2MERGE( _MOVIE, 0x7 ) /*!< C
lassical Movie */
#define DVBPSI_CONTENT_MOVIE_ADULT L1L2MERGE( _MOVIE, 0x8 ) /*!< A
dult Movie */
#define DVBPSI_CONTENT_MOVIE_USERDEFINED L1L2MERGE( _MOVIE, 0xf ) /*!< U
ser defined Movie */
/* News/Current affairs */ /* News/Current affairs */
#define DVBPSI_CONTENT_NEWS_GENERAL L1L2MERGE( _NEWS, 0x0 ) #define DVBPSI_CONTENT_NEWS_GENERAL L1L2MERGE( _NEWS, 0x0 ) /*!< Ge
#define DVBPSI_CONTENT_NEWS_WEATHER L1L2MERGE( _NEWS, 0x1 ) neral News */
#define DVBPSI_CONTENT_NEWS_MAGAZINE L1L2MERGE( _NEWS, 0x2 ) #define DVBPSI_CONTENT_NEWS_WEATHER L1L2MERGE( _NEWS, 0x1 ) /*!< We
#define DVBPSI_CONTENT_NEWS_DOCUMENTARY L1L2MERGE( _NEWS, 0x3 ) ather News */
#define DVBPSI_CONTENT_NEWS_DISCUSSION L1L2MERGE( _NEWS, 0x4 ) #define DVBPSI_CONTENT_NEWS_MAGAZINE L1L2MERGE( _NEWS, 0x2 ) /*!< Ma
#define DVBPSI_CONTENT_NEWS_USERDEFINED L1L2MERGE( _NEWS, 0xf ) gazine News */
#define DVBPSI_CONTENT_NEWS_DOCUMENTARY L1L2MERGE( _NEWS, 0x3 ) /*!< Do
cumentary News */
#define DVBPSI_CONTENT_NEWS_DISCUSSION L1L2MERGE( _NEWS, 0x4 ) /*!< Di
scussion News */
#define DVBPSI_CONTENT_NEWS_USERDEFINED L1L2MERGE( _NEWS, 0xf ) /*!< Us
er defined News */
/* Show/Game show */ /* Show/Game show */
#define DVBPSI_CONTENT_SHOW_GENERAL L1L2MERGE( _SHOW, 0x0 ) #define DVBPSI_CONTENT_SHOW_GENERAL L1L2MERGE( _SHOW, 0x0 ) /*!< Ge
#define DVBPSI_CONTENT_SHOW_QUIZ L1L2MERGE( _SHOW, 0x1 ) neral Show */
#define DVBPSI_CONTENT_SHOW_VARIETY L1L2MERGE( _SHOW, 0x2 ) #define DVBPSI_CONTENT_SHOW_QUIZ L1L2MERGE( _SHOW, 0x1 ) /*!< Qu
#define DVBPSI_CONTENT_SHOW_TALK L1L2MERGE( _SHOW, 0x3 ) iz Show */
#define DVBPSI_CONTENT_SHOW_USERDEFINED L1L2MERGE( _SHOW, 0xf ) #define DVBPSI_CONTENT_SHOW_VARIETY L1L2MERGE( _SHOW, 0x2 ) /*!< Va
riety Show */
#define DVBPSI_CONTENT_SHOW_TALK L1L2MERGE( _SHOW, 0x3 ) /*!< Ta
lk Show */
#define DVBPSI_CONTENT_SHOW_USERDEFINED L1L2MERGE( _SHOW, 0xf ) /*!< Us
er defined Show */
/* Sports */ /* Sports */
#define DVBPSI_CONTENT_SPORTS_GENERAL L1L2MERGE( _SPORTS, 0x0 ) #define DVBPSI_CONTENT_SPORTS_GENERAL L1L2MERGE( _SPORTS, 0x0 ) /*!<
#define DVBPSI_CONTENT_SPORTS_EVENTS L1L2MERGE( _SPORTS, 0x1 ) General Sports */
#define DVBPSI_CONTENT_SPORTS_MAGAZINE L1L2MERGE( _SPORTS, 0x2 ) #define DVBPSI_CONTENT_SPORTS_EVENTS L1L2MERGE( _SPORTS, 0x1 ) /*!<
#define DVBPSI_CONTENT_SPORTS_FOOTBALL L1L2MERGE( _SPORTS, 0x3 ) Sports Events */
#define DVBPSI_CONTENT_SPORTS_TENNIS L1L2MERGE( _SPORTS, 0x4 ) #define DVBPSI_CONTENT_SPORTS_MAGAZINE L1L2MERGE( _SPORTS, 0x2 ) /*!<
#define DVBPSI_CONTENT_SPORTS_TEAM L1L2MERGE( _SPORTS, 0x5 ) Sports Magazine */
#define DVBPSI_CONTENT_SPORTS_ATHLETICS L1L2MERGE( _SPORTS, 0x6 ) #define DVBPSI_CONTENT_SPORTS_FOOTBALL L1L2MERGE( _SPORTS, 0x3 ) /*!<
#define DVBPSI_CONTENT_SPORTS_MOTOR L1L2MERGE( _SPORTS, 0x7 ) Football Sports */
#define DVBPSI_CONTENT_SPORTS_WATER L1L2MERGE( _SPORTS, 0x8 ) #define DVBPSI_CONTENT_SPORTS_TENNIS L1L2MERGE( _SPORTS, 0x4 ) /*!<
#define DVBPSI_CONTENT_SPORTS_WINTER L1L2MERGE( _SPORTS, 0x9 ) Tennis Sports */
#define DVBPSI_CONTENT_SPORTS_EQUESTRIAN L1L2MERGE( _SPORTS, 0xa ) #define DVBPSI_CONTENT_SPORTS_TEAM L1L2MERGE( _SPORTS, 0x5 ) /*!<
#define DVBPSI_CONTENT_SPORTS_MARTIAL L1L2MERGE( _SPORTS, 0xb ) Team Sports */
#define DVBPSI_CONTENT_SPORTS_USERDEFINED L1L2MERGE( _SPORTS, 0xf ) #define DVBPSI_CONTENT_SPORTS_ATHLETICS L1L2MERGE( _SPORTS, 0x6 ) /*!<
Athletics Sports */
#define DVBPSI_CONTENT_SPORTS_MOTOR L1L2MERGE( _SPORTS, 0x7 ) /*!<
Motor Sports */
#define DVBPSI_CONTENT_SPORTS_WATER L1L2MERGE( _SPORTS, 0x8 ) /*!<
Water Sports */
#define DVBPSI_CONTENT_SPORTS_WINTER L1L2MERGE( _SPORTS, 0x9 ) /*!<
Winter Sports */
#define DVBPSI_CONTENT_SPORTS_EQUESTRIAN L1L2MERGE( _SPORTS, 0xa ) /*!<
Equestrian Sports */
#define DVBPSI_CONTENT_SPORTS_MARTIAL L1L2MERGE( _SPORTS, 0xb ) /*!<
Marital Sports */
#define DVBPSI_CONTENT_SPORTS_USERDEFINED L1L2MERGE( _SPORTS, 0xf ) /*!<
User defined Sports */
/* Children's/Youth */ /* Children's/Youth */
#define DVBPSI_CONTENT_CHILDREN_GENERAL L1L2MERGE( _CHILDREN, 0x0 ) #define DVBPSI_CONTENT_CHILDREN_GENERAL L1L2MERGE( _CHILDREN, 0x0 ) /*!
#define DVBPSI_CONTENT_CHILDREN_PRESCHOOL L1L2MERGE( _CHILDREN, 0x1 ) < General Children */
#define DVBPSI_CONTENT_CHILDREN_06TO14ENT L1L2MERGE( _CHILDREN, 0x2 ) #define DVBPSI_CONTENT_CHILDREN_PRESCHOOL L1L2MERGE( _CHILDREN, 0x1 ) /*!
#define DVBPSI_CONTENT_CHILDREN_10TO16ENT L1L2MERGE( _CHILDREN, 0x3 ) < Preschool Children */
#define DVBPSI_CONTENT_CHILDREN_EDUCATIONAL L1L2MERGE( _CHILDREN, 0x4 ) #define DVBPSI_CONTENT_CHILDREN_06TO14ENT L1L2MERGE( _CHILDREN, 0x2 ) /*!
#define DVBPSI_CONTENT_CHILDREN_CARTOONS L1L2MERGE( _CHILDREN, 0x5 ) < 06 to 14 years old Children */
#define DVBPSI_CONTENT_CHILDREN_USERDEFINED L1L2MERGE( _CHILDREN, 0xf ) #define DVBPSI_CONTENT_CHILDREN_10TO16ENT L1L2MERGE( _CHILDREN, 0x3 ) /*!
< 10 to 16 years old Children */
#define DVBPSI_CONTENT_CHILDREN_EDUCATIONAL L1L2MERGE( _CHILDREN, 0x4 ) /*!
< Educational Children */
#define DVBPSI_CONTENT_CHILDREN_CARTOONS L1L2MERGE( _CHILDREN, 0x5 ) /*!
< Cartoons Children */
#define DVBPSI_CONTENT_CHILDREN_USERDEFINED L1L2MERGE( _CHILDREN, 0xf ) /*!
< User defined for Children */
/* Music/Ballet/Dance */ /* Music/Ballet/Dance */
#define DVBPSI_CONTENT_MUSIC_GENERAL L1L2MERGE( _MUSIC, 0x0 ) #define DVBPSI_CONTENT_MUSIC_GENERAL L1L2MERGE( _MUSIC, 0x0 ) /*!< G
#define DVBPSI_CONTENT_MUSIC_POPROCK L1L2MERGE( _MUSIC, 0x1 ) eneral Music */
#define DVBPSI_CONTENT_MUSIC_CLASSICAL L1L2MERGE( _MUSIC, 0x2 ) #define DVBPSI_CONTENT_MUSIC_POPROCK L1L2MERGE( _MUSIC, 0x1 ) /*!< P
#define DVBPSI_CONTENT_MUSIC_FOLK L1L2MERGE( _MUSIC, 0x3 ) oprock Music */
#define DVBPSI_CONTENT_MUSIC_JAZZ L1L2MERGE( _MUSIC, 0x4 ) #define DVBPSI_CONTENT_MUSIC_CLASSICAL L1L2MERGE( _MUSIC, 0x2 ) /*!< C
#define DVBPSI_CONTENT_MUSIC_OPERA L1L2MERGE( _MUSIC, 0x5 ) lassical Music */
#define DVBPSI_CONTENT_MUSIC_BALLET L1L2MERGE( _MUSIC, 0x6 ) #define DVBPSI_CONTENT_MUSIC_FOLK L1L2MERGE( _MUSIC, 0x3 ) /*!< F
#define DVBPSI_CONTENT_MUSIC_USERDEFINED L1L2MERGE( _MUSIC, 0xf ) olk Music */
#define DVBPSI_CONTENT_MUSIC_JAZZ L1L2MERGE( _MUSIC, 0x4 ) /*!< J
azz Music */
#define DVBPSI_CONTENT_MUSIC_OPERA L1L2MERGE( _MUSIC, 0x5 ) /*!< O
pera Music */
#define DVBPSI_CONTENT_MUSIC_BALLET L1L2MERGE( _MUSIC, 0x6 ) /*!< B
allet Music */
#define DVBPSI_CONTENT_MUSIC_USERDEFINED L1L2MERGE( _MUSIC, 0xf ) /*!< U
ser defined Music */
/* Arts/Culture */ /* Arts/Culture */
#define DVBPSI_CONTENT_CULTURE_GENERAL L1L2MERGE( _CULTURE, 0x0 ) #define DVBPSI_CONTENT_CULTURE_GENERAL L1L2MERGE( _CULTURE, 0x0 ) /*!<
#define DVBPSI_CONTENT_CULTURE_PERFORMANCE L1L2MERGE( _CULTURE, 0x1 ) General Culture */
#define DVBPSI_CONTENT_CULTURE_FINEARTS L1L2MERGE( _CULTURE, 0x2 ) #define DVBPSI_CONTENT_CULTURE_PERFORMANCE L1L2MERGE( _CULTURE, 0x1 ) /*!<
#define DVBPSI_CONTENT_CULTURE_RELIGION L1L2MERGE( _CULTURE, 0x3 ) Performance Culture */
#define DVBPSI_CONTENT_CULTURE_TRADITIONAL L1L2MERGE( _CULTURE, 0x4 ) #define DVBPSI_CONTENT_CULTURE_FINEARTS L1L2MERGE( _CULTURE, 0x2 ) /*!<
#define DVBPSI_CONTENT_CULTURE_LITERATURE L1L2MERGE( _CULTURE, 0x5 ) Fine Arts Culture */
#define DVBPSI_CONTENT_CULTURE_CINEMA L1L2MERGE( _CULTURE, 0x6 ) #define DVBPSI_CONTENT_CULTURE_RELIGION L1L2MERGE( _CULTURE, 0x3 ) /*!<
#define DVBPSI_CONTENT_CULTURE_EXPERIMENTAL L1L2MERGE( _CULTURE, 0x7 ) Religion Culture */
#define DVBPSI_CONTENT_CULTURE_PRESS L1L2MERGE( _CULTURE, 0x8 ) #define DVBPSI_CONTENT_CULTURE_TRADITIONAL L1L2MERGE( _CULTURE, 0x4 ) /*!<
#define DVBPSI_CONTENT_CULTURE_NEWMEDIA L1L2MERGE( _CULTURE, 0x9 ) Traditional Culture */
#define DVBPSI_CONTENT_CULTURE_MAGAZINE L1L2MERGE( _CULTURE, 0xa ) #define DVBPSI_CONTENT_CULTURE_LITERATURE L1L2MERGE( _CULTURE, 0x5 ) /*!<
#define DVBPSI_CONTENT_CULTURE_FASHION L1L2MERGE( _CULTURE, 0xb ) Literature Culture */
#define DVBPSI_CONTENT_CULTURE_USERDEFINED L1L2MERGE( _CULTURE, 0xf ) #define DVBPSI_CONTENT_CULTURE_CINEMA L1L2MERGE( _CULTURE, 0x6 ) /*!<
Cinema Culture */
#define DVBPSI_CONTENT_CULTURE_EXPERIMENTAL L1L2MERGE( _CULTURE, 0x7 ) /*!<
Experimental Culture */
#define DVBPSI_CONTENT_CULTURE_PRESS L1L2MERGE( _CULTURE, 0x8 ) /*!<
Press Culture */
#define DVBPSI_CONTENT_CULTURE_NEWMEDIA L1L2MERGE( _CULTURE, 0x9 ) /*!<
New Media Culture */
#define DVBPSI_CONTENT_CULTURE_MAGAZINE L1L2MERGE( _CULTURE, 0xa ) /*!<
Multure magzine */
#define DVBPSI_CONTENT_CULTURE_FASHION L1L2MERGE( _CULTURE, 0xb ) /*!<
Fashion Culture */
#define DVBPSI_CONTENT_CULTURE_USERDEFINED L1L2MERGE( _CULTURE, 0xf ) /*!<
User defined Culture */
/* Socal/Political/Economics */ /* Socal/Political/Economics */
#define DVBPSI_CONTENT_SOCIAL_GENERAL L1L2MERGE( _SOCIAL, 0x0 ) #define DVBPSI_CONTENT_SOCIAL_GENERAL L1L2MERGE( _SOCIAL, 0x0 ) /*!<
#define DVBPSI_CONTENT_SOCIAL_MAGAZINE L1L2MERGE( _SOCIAL, 0x1 ) General Social */
#define DVBPSI_CONTENT_SOCIAL_ADVISORY L1L2MERGE( _SOCIAL, 0x2 ) #define DVBPSI_CONTENT_SOCIAL_MAGAZINE L1L2MERGE( _SOCIAL, 0x1 ) /*!<
#define DVBPSI_CONTENT_SOCIAL_PEOPLE L1L2MERGE( _SOCIAL, 0x3 ) Social Magazine*/
#define DVBPSI_CONTENT_SOCIAL_USERDEFINED L1L2MERGE( _SOCIAL, 0xf ) #define DVBPSI_CONTENT_SOCIAL_ADVISORY L1L2MERGE( _SOCIAL, 0x2 ) /*!<
Advisory Social */
#define DVBPSI_CONTENT_SOCIAL_PEOPLE L1L2MERGE( _SOCIAL, 0x3 ) /*!<
Social People */
#define DVBPSI_CONTENT_SOCIAL_USERDEFINED L1L2MERGE( _SOCIAL, 0xf ) /*!<
User defined Social */
/* Eduction/Science/Factual */ /* Eduction/Science/Factual */
#define DVBPSI_CONTENT_EDUCATION_GENERAL L1L2MERGE( _EDUCATION, 0x0 ) #define DVBPSI_CONTENT_EDUCATION_GENERAL L1L2MERGE( _EDUCATION, 0x0 ) /*
#define DVBPSI_CONTENT_EDUCATION_NATURE L1L2MERGE( _EDUCATION, 0x1 ) !< General Education */
#define DVBPSI_CONTENT_EDUCATION_TECHNOLOGY L1L2MERGE( _EDUCATION, 0x2 ) #define DVBPSI_CONTENT_EDUCATION_NATURE L1L2MERGE( _EDUCATION, 0x1 ) /*
#define DVBPSI_CONTENT_EDUCATION_MEDICINE L1L2MERGE( _EDUCATION, 0x3 ) !< Nature Education */
#define DVBPSI_CONTENT_EDUCATION_FOREIGN L1L2MERGE( _EDUCATION, 0x4 ) #define DVBPSI_CONTENT_EDUCATION_TECHNOLOGY L1L2MERGE( _EDUCATION, 0x2 ) /*
#define DVBPSI_CONTENT_EDUCATION_SOCIAL L1L2MERGE( _EDUCATION, 0x5 ) !< Technology Education */
#define DVBPSI_CONTENT_EDUCATION_FURTHER L1L2MERGE( _EDUCATION, 0x6 ) #define DVBPSI_CONTENT_EDUCATION_MEDICINE L1L2MERGE( _EDUCATION, 0x3 ) /*
#define DVBPSI_CONTENT_EDUCATION_LANGUAGE L1L2MERGE( _EDUCATION, 0x7 ) !< Medicine Education */
#define DVBPSI_CONTENT_EDUCATION_USERDEFINED L1L2MERGE( _EDUCATION, 0xf ) #define DVBPSI_CONTENT_EDUCATION_FOREIGN L1L2MERGE( _EDUCATION, 0x4 ) /*
!< Foreign Education */
#define DVBPSI_CONTENT_EDUCATION_SOCIAL L1L2MERGE( _EDUCATION, 0x5 ) /*
!< Social Education */
#define DVBPSI_CONTENT_EDUCATION_FURTHER L1L2MERGE( _EDUCATION, 0x6 ) /*
!< Futher Education */
#define DVBPSI_CONTENT_EDUCATION_LANGUAGE L1L2MERGE( _EDUCATION, 0x7 ) /*
!< Language Education */
#define DVBPSI_CONTENT_EDUCATION_USERDEFINED L1L2MERGE( _EDUCATION, 0xf ) /
*!< User defined Education */
/* Leisure/Hobbies */ /* Leisure/Hobbies */
#define DVBPSI_CONTENT_LEISURE_GENERAL L1L2MERGE( _LEISURE, 0x0 ) #define DVBPSI_CONTENT_LEISURE_GENERAL L1L2MERGE( _LEISURE, 0x0 ) /*!<
#define DVBPSI_CONTENT_LEISURE_TRAVEL L1L2MERGE( _LEISURE, 0x1 ) General Leisure */
#define DVBPSI_CONTENT_LEISURE_HANDICRAFT L1L2MERGE( _LEISURE, 0x2 ) #define DVBPSI_CONTENT_LEISURE_TRAVEL L1L2MERGE( _LEISURE, 0x1 ) /*!<
#define DVBPSI_CONTENT_LEISURE_MOTORING L1L2MERGE( _LEISURE, 0x3 ) Travel Leisure */
#define DVBPSI_CONTENT_LEISURE_FITNESS L1L2MERGE( _LEISURE, 0x4 ) #define DVBPSI_CONTENT_LEISURE_HANDICRAFT L1L2MERGE( _LEISURE, 0x2 ) /*!<
#define DVBPSI_CONTENT_LEISURE_COOKING L1L2MERGE( _LEISURE, 0x5 ) Handicraft Leisure */
#define DVBPSI_CONTENT_LEISURE_SHOPPING L1L2MERGE( _LEISURE, 0x6 ) #define DVBPSI_CONTENT_LEISURE_MOTORING L1L2MERGE( _LEISURE, 0x3 ) /*!<
#define DVBPSI_CONTENT_LEISURE_GARDENING L1L2MERGE( _LEISURE, 0x7 ) Motoring Leisure */
#define DVBPSI_CONTENT_LEISURE_USERDEFINED L1L2MERGE( _LEISURE, 0xf ) #define DVBPSI_CONTENT_LEISURE_FITNESS L1L2MERGE( _LEISURE, 0x4 ) /*!<
Fitness Leisure */
#define DVBPSI_CONTENT_LEISURE_COOKING L1L2MERGE( _LEISURE, 0x5 ) /*!<
Cooking Leisure */
#define DVBPSI_CONTENT_LEISURE_SHOPPING L1L2MERGE( _LEISURE, 0x6 ) /*!<
Shopping Leisure */
#define DVBPSI_CONTENT_LEISURE_GARDENING L1L2MERGE( _LEISURE, 0x7 ) /*!<
Gardening Leisure */
#define DVBPSI_CONTENT_LEISURE_USERDEFINED L1L2MERGE( _LEISURE, 0xf ) /*!<
User defined Leisure */
/* Special characteristics */ /* Special characteristics */
#define DVBPSI_CONTENT_SPECIAL_ORIGINALLANGUAGE L1L2MERGE( _SPECIAL, 0x0 ) #define DVBPSI_CONTENT_SPECIAL_ORIGINALLANGUAGE L1L2MERGE( _SPECIAL, 0x0 )
#define DVBPSI_CONTENT_SPECIAL_BLACKANDWHITE L1L2MERGE( _SPECIAL, 0x1 ) /*!< Original language Special */
#define DVBPSI_CONTENT_SPECIAL_UNPUBLISHED L1L2MERGE( _SPECIAL, 0x2 ) #define DVBPSI_CONTENT_SPECIAL_BLACKANDWHITE L1L2MERGE( _SPECIAL, 0x1 )
#define DVBPSI_CONTENT_SPECIAL_LIVE L1L2MERGE( _SPECIAL, 0x3 ) /*!< Black and White Special */
#define DVBPSI_CONTENT_SPECIAL_PLANOSTEREOSCOPIC L1L2MERGE( _SPECIAL, 0x4 ) #define DVBPSI_CONTENT_SPECIAL_UNPUBLISHED L1L2MERGE( _SPECIAL, 0x2 )
#define DVBPSI_CONTENT_SPECIAL_USERDEFINED L1L2MERGE( _SPECIAL, 0xb ) /*!< Unpublished Special */
#define DVBPSI_CONTENT_SPECIAL_USERDEFINED1 L1L2MERGE( _SPECIAL, 0xc ) #define DVBPSI_CONTENT_SPECIAL_LIVE L1L2MERGE( _SPECIAL, 0x3 )
#define DVBPSI_CONTENT_SPECIAL_USERDEFINED2 L1L2MERGE( _SPECIAL, 0xd ) /*!< Live Special */
#define DVBPSI_CONTENT_SPECIAL_USERDEFINED3 L1L2MERGE( _SPECIAL, 0xe ) #define DVBPSI_CONTENT_SPECIAL_PLANOSTEREOSCOPIC L1L2MERGE( _SPECIAL, 0x4 )
#define DVBPSI_CONTENT_SPECIAL_USERDEFINED4 L1L2MERGE( _SPECIAL, 0xf ) /*!< Planostereoscopic Special */
#define DVBPSI_CONTENT_SPECIAL_USERDEFINED L1L2MERGE( _SPECIAL, 0xb )
/*!< User defined Special */
#define DVBPSI_CONTENT_SPECIAL_USERDEFINED1 L1L2MERGE( _SPECIAL, 0xc )
/*!< User defined Special */
#define DVBPSI_CONTENT_SPECIAL_USERDEFINED2 L1L2MERGE( _SPECIAL, 0xd )
/*!< User defined Special */
#define DVBPSI_CONTENT_SPECIAL_USERDEFINED3 L1L2MERGE( _SPECIAL, 0xe )
/*!< User defined Special */
#define DVBPSI_CONTENT_SPECIAL_USERDEFINED4 L1L2MERGE( _SPECIAL, 0xf )
/*!< User defined Special */
/************************************************************************** *** /************************************************************************** ***
* dvbpsi_content_t * dvbpsi_content_t
************************************************************************** ***/ ************************************************************************** ***/
/*! /*!
* \struct dvbpsi_content_s * \struct dvbpsi_content_s
* \brief Content nibble structure. * \brief Content nibble structure.
* *
* This structure is used since content_descriptor will contain several * This structure is used since content_descriptor will contain several
* content nibbles pairs. * content nibbles pairs.
 End of changes. 14 change blocks. 
110 lines changed or deleted 205 lines changed or added


 dvbpsi.h   dvbpsi.h 
skipping to change at line 38 skipping to change at line 38
* Jean-Paul Saman <jpsaman@videolan.org> * Jean-Paul Saman <jpsaman@videolan.org>
* \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 1.1.2 /*!< Human readible DVBPSI v #define DVBPSI_VERSION 1.2.0 /*!< Human readible DVBPSI v
ersion*/ ersion*/
#define DVBPSI_VERSION_INT ((1<<16)+(1<<8)+1) /*!< Machine readible DVBPSI #define DVBPSI_VERSION_INT ((1<<16)+(2<<8)+0) /*!< Machine readible DVBPSI
version */ version */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/************************************************************************** *** /************************************************************************** ***
* Helper for GCC version checks borrowed from VLC. * Helper for GCC version checks borrowed from VLC.
************************************************************************** ***/ ************************************************************************** ***/
/*! /*!
* \def DVBPSI_GCC_VERSION(maj,min) * \def DVBPSI_GCC_VERSION(maj,min)
 End of changes. 1 change blocks. 
4 lines changed or deleted 4 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/