| dr_54.h | dr_54.h | |||
|---|---|---|---|---|
| skipping to change at line 37 | skipping to change at line 37 | |||
| * section 6.2.9. | * section 6.2.9. | |||
| */ | */ | |||
| #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 | ||||
| * \brief Extract content category by type. The value 'type' includes the | ||||
| * content category (MSB) and content detail (LSB). | ||||
| */ | ||||
| #define DVDPSI_GetContentCategoryFromType(type) ((type) >> 4) | #define DVDPSI_GetContentCategoryFromType(type) ((type) >> 4) | |||
| /*! | ||||
| * \def L1L2MERGE | ||||
| * \brief Merge content category and content detail in one byte. The | ||||
| * category is in the topmost 4-bits (MSB) and the content detail in | ||||
| * 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 */ | ||||
| #define DVBPSI_CONTENT_CAT_UNDEFINED 0x0 | #define DVBPSI_CONTENT_CAT_UNDEFINED 0x0 | |||
| #define DVBPSI_CONTENT_CAT_MOVIE 0x1 | #define DVBPSI_CONTENT_CAT_MOVIE 0x1 | |||
| #define DVBPSI_CONTENT_CAT_NEWS 0x2 | #define DVBPSI_CONTENT_CAT_NEWS 0x2 | |||
| #define DVBPSI_CONTENT_CAT_SHOW 0x3 | #define DVBPSI_CONTENT_CAT_SHOW 0x3 | |||
| #define DVBPSI_CONTENT_CAT_SPORTS 0x4 | #define DVBPSI_CONTENT_CAT_SPORTS 0x4 | |||
| #define DVBPSI_CONTENT_CAT_CHILDREN 0x5 | #define DVBPSI_CONTENT_CAT_CHILDREN 0x5 | |||
| #define DVBPSI_CONTENT_CAT_MUSIC 0x6 | #define DVBPSI_CONTENT_CAT_MUSIC 0x6 | |||
| #define DVBPSI_CONTENT_CAT_CULTURE 0x7 | #define DVBPSI_CONTENT_CAT_CULTURE 0x7 | |||
| #define DVBPSI_CONTENT_CAT_SOCIAL 0x8 | #define DVBPSI_CONTENT_CAT_SOCIAL 0x8 | |||
| #define DVBPSI_CONTENT_CAT_EDUCATION 0x9 | #define DVBPSI_CONTENT_CAT_EDUCATION 0x9 | |||
| End of changes. 3 change blocks. | ||||
| 0 lines changed or deleted | 12 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.0 /*!< Human readible DVBPSI v | #define DVBPSI_VERSION 1.1.1 /*!< Human readible DVBPSI v | |||
| ersion*/ | ersion*/ | |||
| #define DVBPSI_VERSION_INT ((1<<16)+(1<<8)+0) /*!< Machine readible DVBPSI | #define DVBPSI_VERSION_INT ((1<<16)+(1<<8)+1) /*!< 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 | |||
| eit.h | eit.h | |||
|---|---|---|---|---|
| skipping to change at line 90 | skipping to change at line 90 | |||
| * This structure is used to store a decoded EIT. | * This structure is used to store a decoded EIT. | |||
| * (ETSI EN 300 468 V1.5.1 section 5.2.4). | * (ETSI EN 300 468 V1.5.1 section 5.2.4). | |||
| */ | */ | |||
| /*! | /*! | |||
| * \typedef struct dvbpsi_eit_s dvbpsi_eit_t | * \typedef struct dvbpsi_eit_s dvbpsi_eit_t | |||
| * \brief dvbpsi_eit_t type definition. | * \brief dvbpsi_eit_t type definition. | |||
| */ | */ | |||
| typedef struct dvbpsi_eit_s | typedef struct dvbpsi_eit_s | |||
| { | { | |||
| uint8_t i_table_id; /*!< table id */ | uint8_t i_table_id; /*!< table id */ | |||
| uint16_t i_extension; /*!< subtable id */ | uint16_t i_extension; /*!< subtable id, here service_ id */ | |||
| uint8_t i_version; /*!< version_number */ | uint8_t i_version; /*!< version_number */ | |||
| bool b_current_next; /*!< current_next_indicator */ | bool b_current_next; /*!< current_next_indicator */ | |||
| uint16_t i_ts_id; /*!< transport stream id */ | uint16_t i_ts_id; /*!< transport stream id */ | |||
| uint16_t i_network_id; /*!< original network id */ | uint16_t i_network_id; /*!< original network id */ | |||
| uint8_t i_segment_last_section_number; /*!< segment last se ction number */ | uint8_t i_segment_last_section_number; /*!< segment last se ction number */ | |||
| uint8_t i_last_table_id; /*!< last table id */ | uint8_t i_last_table_id; /*!< last table id */ | |||
| dvbpsi_eit_event_t *p_first_event; /*!< event information list */ | dvbpsi_eit_event_t *p_first_event; /*!< event information list */ | |||
| End of changes. 1 change blocks. | ||||
| 1 lines changed or deleted | 1 lines changed or added | |||
| sdt.h | sdt.h | |||
|---|---|---|---|---|
| skipping to change at line 206 | skipping to change at line 206 | |||
| /************************************************************************** *** | /************************************************************************** *** | |||
| * dvbpsi_sdt_service_add | * dvbpsi_sdt_service_add | |||
| ************************************************************************** ***/ | ************************************************************************** ***/ | |||
| /*! | /*! | |||
| * \fn dvbpsi_sdt_service_t* dvbpsi_sdt_service_add(dvbpsi_sdt_t* p_sdt, | * \fn dvbpsi_sdt_service_t* dvbpsi_sdt_service_add(dvbpsi_sdt_t* p_sdt, | |||
| uint16_t i_service_id, | uint16_t i_service_id, | |||
| bool b_eit_schedule, | bool b_eit_schedule, | |||
| bool b_eit_present, | bool b_eit_present, | |||
| uint8_t i_running_status, | uint8_t i_running_status, | |||
| bool b_free_ca) | bool b_free_ca) | |||
| * \brief Add a service description at the end of the SDT. | * \brief Add a service at the end of the SDT. | |||
| * \param p_sdt pointer to the SDT structure | * \param p_sdt pointer to the SDT structure | |||
| * \param i_service_id Service ID | * \param i_service_id Service ID | |||
| * \param b_eit_schedule EIT Schedule flag | * \param b_eit_schedule EIT Schedule flag | |||
| * \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_sdt_service_add(dvbpsi_sdt_t* p_sdt, | dvbpsi_sdt_service_t *dvbpsi_sdt_service_add(dvbpsi_sdt_t* p_sdt, | |||
| uint16_t i_service_id, bool b_eit_schedule, bool b_eit_present, | uint16_t i_service_id, bool b_eit_schedule, bool b_eit_present, | |||
| End of changes. 1 change blocks. | ||||
| 1 lines changed or deleted | 1 lines changed or added | |||