[PATCH] BAT decoding method signature fix
Roberto Corno <[email protected]>
| Newsgroups | gmane.comp.video.videolan.libdvbpsi.devel |
|---|---|
| Message-ID | <CAO6YRm_JDWTu-KnUsV9AfCsrh5hyjENY=_fvJxd07CZef4V-Gg@mail.gmail.com> |
Method declarations used to add descriptors moved from bat_private.h to bat.h method dvbpsi_bat_descriptor_add removed because identical to dvbpsi_bat_bouquet_descriptor_add Patch is attached Regards, Roberto _______________________________________________ libdvbpsi-devel mailing list [email protected] http://mailman.videolan.org/listinfo/libdvbpsi-devel
0003-BAT-decoding-method-signature-fix.patch
(application/octet-stream, 10.4 KB)
From 4604b48cf9a5f50d590a983970eddee4f901d1da Mon Sep 17 00:00:00 2001 From: Roberto Corno <[email protected]> Date: Thu, 2 Aug 2012 09:24:36 +0200 Subject: [PATCH 3/3] BAT decoding method signature fix --- src/tables/bat.c | 47 ++++++++++++++++---------------- src/tables/bat.h | 66 ++++++++++++++++++++++++++++++++++++++++++++++ src/tables/bat_private.h | 38 -------------------------- 3 files changed, 89 insertions(+), 62 deletions(-) diff --git a/src/tables/bat.c b/src/tables/bat.c index 8dde361..a3e2806 100644 --- a/src/tables/bat.c +++ b/src/tables/bat.c @@ -196,6 +196,29 @@ void dvbpsi_bat_delete(dvbpsi_bat_t *p_bat) } /***************************************************************************** + * dvbpsi_bat_bouquet_descriptor_add + ***************************************************************************** + * Add a descriptor in the BAT. + *****************************************************************************/ +dvbpsi_descriptor_t* dvbpsi_bat_bouquet_descriptor_add(dvbpsi_bat_t* p_bat, + 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 == NULL) + return NULL; + + p_bat->p_first_descriptor = dvbpsi_AddDescriptor(p_bat->p_first_descriptor, + p_descriptor); + assert(p_bat->p_first_descriptor); + if (p_bat->p_first_descriptor == NULL) + return NULL; + + return p_descriptor; +} + +/***************************************************************************** * dvbpsi_bat_ts_add ***************************************************************************** * Add a TS description at the end of the BAT. @@ -226,30 +249,6 @@ dvbpsi_bat_ts_t *dvbpsi_bat_ts_add(dvbpsi_bat_t* p_bat, return p_ts; } -/***************************************************************************** - * dvbpsi_bat_bouquet_descriptor_add - ***************************************************************************** - * Add a descriptor in the BAT Bouquet descriptors (the first loop description), - * which is in the first loop of BAT. - *****************************************************************************/ -dvbpsi_descriptor_t *dvbpsi_bat_bouquet_descriptor_add( - dvbpsi_bat_t *p_bat, - 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 == NULL) - return NULL; - - p_bat->p_first_descriptor = dvbpsi_AddDescriptor(p_bat->p_first_descriptor, - p_descriptor); - assert(p_bat->p_first_descriptor); - if (p_bat->p_first_descriptor == NULL) - return NULL; - - return p_descriptor; -} /***************************************************************************** * dvbpsi_bat_ts_descriptor_add diff --git a/src/tables/bat.h b/src/tables/bat.h index 6eef4ca..37c5906 100644 --- a/src/tables/bat.h +++ b/src/tables/bat.h @@ -193,6 +193,59 @@ void dvbpsi_bat_empty(dvbpsi_bat_t *p_bat); void dvbpsi_bat_delete(dvbpsi_bat_t *p_bat); /***************************************************************************** + * dvbpsi_bat_descriptor_add + *****************************************************************************/ +/*! + * \fn dvbpsi_descriptor_t* dvbpsi_bat_bouquet_descriptor_add(dvbpsi_bat_t* p_bat, + uint8_t i_tag, + uint8_t i_length, + uint8_t* p_data) + * \brief Add a descriptor in the BAT. + * \param p_bat pointer to the BAT 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_bat_bouquet_descriptor_add(dvbpsi_bat_t* p_bat, + uint8_t i_tag, uint8_t i_length, + uint8_t* p_data); + +/***************************************************************************** + * dvbpsi_bat_ts_add + *****************************************************************************/ +/*! + * \fn dvbpsi_descriptor_t* dvbpsi_bat_ts_add(dvbpsi_bat_t* p_bat, + uint16_t i_ts_id, + uint16_t i_orig_network_id) + * \brief Add a TS description at the end of the BAT. + * \param p_bat pointer to the BAT structure + * \param i_ts_id descriptor's transport stream id + * \param i_orig_network_id descriptor's original network id + * \return a pointer to the added descriptor. + */ + +dvbpsi_bat_ts_t *dvbpsi_bat_ts_add(dvbpsi_bat_t* p_bat, + uint16_t i_ts_id, uint16_t i_orig_network_id); + +/***************************************************************************** + * dvbpsi_bat_ts_descriptor_add + *****************************************************************************/ +/*! + * \fn dvbpsi_descriptor_t* dvbpsi_bat_ts_descriptor_add(dvbpsi_bat_ts_t *p_ts, + uint8_t i_tag, + uint8_t i_length, + uint8_t *p_data) + * \brief Add a descriptor in the BAT TS descriptors. + * \param p_bat pointer to the BAT structure + * \param i_ts_id descriptor's transport stream id + * \param i_orig_network_id descriptor's original network id + * \return a pointer to the added descriptor. + */ +dvbpsi_descriptor_t *dvbpsi_bat_ts_descriptor_add(dvbpsi_bat_ts_t *p_ts, + uint8_t i_tag, uint8_t i_length, + uint8_t *p_data); +/***************************************************************************** * dvbpsi_bat_sections_generate *****************************************************************************/ /*! @@ -223,6 +276,19 @@ __attribute__((deprecated)) void dvbpsi_EmptyBAT(dvbpsi_bat_t *p_bat); __attribute__((deprecated)) dvbpsi_psi_section_t *dvbpsi_GenBATSections(dvbpsi_bat_t *p_bat); +__attribute__((deprecated)) +dvbpsi_bat_ts_t *dvbpsi_BATAddTS(dvbpsi_bat_t* p_bat, + uint16_t i_ts_id, uint16_t i_orig_network_id); +__attribute__((deprecated)) +dvbpsi_descriptor_t *dvbpsi_BATBouquetAddDescriptor( + dvbpsi_bat_t *p_bat, + uint8_t i_tag, uint8_t i_length, + uint8_t *p_data); +__attribute__((deprecated)) +dvbpsi_descriptor_t *dvbpsi_BATTSAddDescriptor( + dvbpsi_bat_ts_t *p_ts, + uint8_t i_tag, uint8_t i_length, + uint8_t *p_data); #ifdef __cplusplus }; diff --git a/src/tables/bat_private.h b/src/tables/bat_private.h index 8f8d36d..ac6f726 100644 --- a/src/tables/bat_private.h +++ b/src/tables/bat_private.h @@ -62,32 +62,7 @@ void dvbpsi_bat_sections_gather(dvbpsi_t* p_dvbpsi, dvbpsi_decoder_t* p_decoder, void dvbpsi_bat_sections_decode(dvbpsi_bat_t* p_bat, dvbpsi_psi_section_t* p_section); -/***************************************************************************** - * dvbpsi_bat_ts_add - ***************************************************************************** - * Add a TS description at the end of the BAT. - *****************************************************************************/ -dvbpsi_bat_ts_t *dvbpsi_bat_ts_add(dvbpsi_bat_t* p_bat, - uint16_t i_ts_id, uint16_t i_orig_network_id); -/***************************************************************************** - * dvbpsi_bat_bouquet_descriptor_add - ***************************************************************************** - * Add a descriptor in the BAT Bouquet descriptors (the first loop description), - * which is in the first loop of BAT. - *****************************************************************************/ -dvbpsi_descriptor_t *dvbpsi_bat_bouquet_descriptor_add(dvbpsi_bat_t *p_bat, - uint8_t i_tag, uint8_t i_length, - uint8_t *p_data); - -/***************************************************************************** - * dvbpsi_bat_ts_descriptor_add - ***************************************************************************** - * Add a descriptor in the BAT TS descriptors, which is in the second loop of BAT. - *****************************************************************************/ -dvbpsi_descriptor_t *dvbpsi_bat_ts_descriptor_add(dvbpsi_bat_ts_t *p_ts, - uint8_t i_tag, uint8_t i_length, - uint8_t *p_data); /***************************************************************************** * Deprecated API's @@ -98,19 +73,6 @@ void dvbpsi_GatherBATSections(dvbpsi_t* p_dvbpsi, dvbpsi_decoder_t* p_decoder, __attribute__((deprecated)) void dvbpsi_DecodeBATSections(dvbpsi_bat_t* p_bat, dvbpsi_psi_section_t* p_section); -__attribute__((deprecated)) -dvbpsi_bat_ts_t *dvbpsi_BATAddTS(dvbpsi_bat_t* p_bat, - uint16_t i_ts_id, uint16_t i_orig_network_id); -__attribute__((deprecated)) -dvbpsi_descriptor_t *dvbpsi_BATBouquetAddDescriptor( - dvbpsi_bat_t *p_bat, - uint8_t i_tag, uint8_t i_length, - uint8_t *p_data); -__attribute__((deprecated)) -dvbpsi_descriptor_t *dvbpsi_BATTSAddDescriptor( - dvbpsi_bat_ts_t *p_ts, - uint8_t i_tag, uint8_t i_length, - uint8_t *p_data); #else #error "Multiple inclusions of bat_private.h" #endif -- 1.7.5.4