Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
libdvbpsi
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
libdvbpsi
Commits
d6e0e5c6
Commit
d6e0e5c6
authored
Nov 26, 2015
by
Jean-Paul Saman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
RST: implement as chained decoder
parent
6441136a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
63 additions
and
20 deletions
+63
-20
src/tables/rst.c
src/tables/rst.c
+54
-15
src/tables/rst.h
src/tables/rst.h
+9
-5
No files found.
src/tables/rst.c
View file @
d6e0e5c6
...
...
@@ -42,8 +42,8 @@
#include "../dvbpsi.h"
#include "../dvbpsi_private.h"
#include "../psi.h"
#include "../chain.h"
#include "../descriptor.h"
#include "../demux.h"
#include "rst.h"
#include "rst_private.h"
...
...
@@ -53,11 +53,20 @@
*****************************************************************************
* Initialize a RST decoder and return a handle on it.
*****************************************************************************/
bool
dvbpsi_rst_attach
(
dvbpsi_t
*
p_dvbpsi
,
dvbpsi_rst_callback
pf_callback
,
void
*
p_cb_data
)
bool
dvbpsi_rst_attach
(
dvbpsi_t
*
p_dvbpsi
,
uint8_t
i_table_id
,
uint16_t
i_extension
,
dvbpsi_rst_callback
pf_callback
,
void
*
p_cb_data
)
{
assert
(
p_dvbpsi
);
assert
(
p_dvbpsi
->
p_decoder
==
NULL
);
dvbpsi_decoder_t
*
p_dec
=
dvbpsi_decoder_chain_get
(
p_dvbpsi
,
i_table_id
,
i_extension
);
if
(
p_dec
!=
NULL
)
{
dvbpsi_error
(
p_dvbpsi
,
"RST decoder"
,
"Already a decoder for (table_id == 0x%02x,"
"extension == 0x%02x)"
,
i_table_id
,
i_extension
);
return
false
;
}
dvbpsi_rst_decoder_t
*
p_rst_decoder
;
p_rst_decoder
=
(
dvbpsi_rst_decoder_t
*
)
dvbpsi_decoder_new
(
&
dvbpsi_rst_sections_gather
,
...
...
@@ -70,7 +79,16 @@ bool dvbpsi_rst_attach(dvbpsi_t *p_dvbpsi, dvbpsi_rst_callback pf_callback,
p_rst_decoder
->
p_cb_data
=
p_cb_data
;
p_rst_decoder
->
p_building_rst
=
NULL
;
p_dvbpsi
->
p_decoder
=
DVBPSI_DECODER
(
p_rst_decoder
);
p_rst_decoder
->
i_table_id
=
i_table_id
;
p_rst_decoder
->
i_extension
=
i_extension
;
/* Add decoder to decoder chain */
if
(
!
dvbpsi_decoder_chain_add
(
p_dvbpsi
,
DVBPSI_DECODER
(
p_rst_decoder
)))
{
dvbpsi_decoder_delete
(
DVBPSI_DECODER
(
p_rst_decoder
));
return
false
;
}
return
true
;
}
...
...
@@ -79,19 +97,36 @@ bool dvbpsi_rst_attach(dvbpsi_t *p_dvbpsi, dvbpsi_rst_callback pf_callback,
*****************************************************************************
* Close a RST decoder. The handle isn't valid any more.
*****************************************************************************/
void
dvbpsi_rst_detach
(
dvbpsi_t
*
p_dvbpsi
)
void
dvbpsi_rst_detach
(
dvbpsi_t
*
p_dvbpsi
,
uint8_t
i_table_id
,
uint16_t
i_extension
)
{
assert
(
p_dvbpsi
);
assert
(
p_dvbpsi
->
p_decoder
);
dvbpsi_rst_decoder_t
*
p_rst_decoder
=
(
dvbpsi_rst_decoder_t
*
)
p_dvbpsi
->
p_decoder
;
dvbpsi_rst_decoder_t
*
p_rst_decoder
=
(
dvbpsi_rst_decoder_t
*
)
dvbpsi_decoder_chain_get
(
p_dvbpsi
,
i_table_id
,
i_extension
);
if
(
!
p_rst_decoder
)
{
dvbpsi_error
(
p_dvbpsi
,
"RST Decoder"
,
"No such RST decoder (table_id == 0x%02x,"
"extension == 0x%02x)"
,
i_table_id
,
i_extension
);
return
;
}
/* Remove table decoder from chain */
if
(
!
dvbpsi_decoder_chain_remove
(
p_dvbpsi
,
DVBPSI_DECODER
(
p_rst_decoder
)))
{
dvbpsi_error
(
p_dvbpsi
,
"RST Decoder"
,
"Failed to remove"
"extension == 0x%02x)"
,
i_table_id
,
i_extension
);
return
;
}
if
(
p_rst_decoder
->
p_building_rst
)
dvbpsi_rst_delete
(
p_rst_decoder
->
p_building_rst
);
p_rst_decoder
->
p_building_rst
=
NULL
;
dvbpsi_decoder_delete
(
p_dvbpsi
->
p_decoder
);
p_dvbpsi
->
p_decoder
=
NULL
;
dvbpsi_decoder_delete
(
DVBPSI_DECODER
(
p_rst_decoder
));
p_rst_decoder
=
NULL
;
}
/*****************************************************************************
...
...
@@ -347,7 +382,6 @@ void dvbpsi_rst_sections_gather(dvbpsi_t *p_dvbpsi,
dvbpsi_psi_section_t
*
p_section
)
{
assert
(
p_dvbpsi
);
assert
(
p_dvbpsi
->
p_decoder
);
if
(
!
dvbpsi_rst_section_check
(
p_dvbpsi
,
p_section
,
0x71
,
"RST decoder"
))
{
...
...
@@ -356,10 +390,15 @@ void dvbpsi_rst_sections_gather(dvbpsi_t *p_dvbpsi,
}
/* */
dvbpsi_rst_decoder_t
*
p_rst_decoder
=
(
dvbpsi_rst_decoder_t
*
)
p_dvbpsi
->
p_decoder
;
dvbpsi_decoder_t
*
p_dec
=
dvbpsi_decoder_chain_get
(
p_dvbpsi
,
p_section
->
i_table_id
,
p_section
->
i_extension
);
if
(
!
p_dec
)
{
dvbpsi_DeletePSISections
(
p_section
);
return
;
}
/* TS discontinuity check */
dvbpsi_rst_decoder_t
*
p_rst_decoder
=
(
dvbpsi_rst_decoder_t
*
)
p_dec
;
if
(
p_rst_decoder
->
b_discontinuity
)
{
dvbpsi_rst_reset
(
p_rst_decoder
,
true
);
...
...
src/tables/rst.h
View file @
d6e0e5c6
...
...
@@ -99,29 +99,33 @@ typedef void (* dvbpsi_rst_callback)(void* p_cb_data, dvbpsi_rst_t* p_new_rst);
*****************************************************************************/
/*!
* \fn bool dvbpsi_rst_attach(dvbpsi_t *p_dvbpsi,
* uint8_t i_table_id, uint16_t i_extension,
dvbpsi_rst_callback pf_callback, void* p_cb_data)
* \brief Creation and initialization of a RST decoder. It will be attached to p_dvbpsi
* \param p_dvbpsi is a pointer to dvbpsi_t which holds a pointer to the decoder
* \param i_table_id Table ID
* \param i_extension Table ID extension
* \param pf_callback function to call back on new RST
* \param p_cb_data private data given in argument to the callback
* \return true on success, false on failure
*/
bool
dvbpsi_rst_attach
(
dvbpsi_t
*
p_dvbpsi
,
dvbpsi_rst_callback
pf_callback
,
void
*
p_cb_data
);
bool
dvbpsi_rst_attach
(
dvbpsi_t
*
p_dvbpsi
,
uint8_t
i_table_id
,
uint16_t
i_extension
,
dvbpsi_rst_callback
pf_callback
,
void
*
p_cb_data
);
/*****************************************************************************
* dvbpsi_rst_detach
*****************************************************************************/
/*!
* \fn void dvbpsi_rst_detach(dvbpsi_t *p_dvbpsi)
* \fn void dvbpsi_rst_detach(dvbpsi_t *p_dvbpsi
, uint8_t i_table_id, uint16_t i_extension
)
* \brief Destroy a RST decoder.
* \param p_dvbpsi handle to dvbpsi with attached decoder
* \param p_dvbpsi handle holds the decoder pointer
* \param i_table_id Table ID
* \param i_extension Table ID extension
* \return nothing.
*
* The handle isn't valid any more.
*/
void
dvbpsi_rst_detach
(
dvbpsi_t
*
p_dvbpsi
);
void
dvbpsi_rst_detach
(
dvbpsi_t
*
p_dvbpsi
,
uint8_t
i_table_id
,
uint16_t
i_extension
);
/*****************************************************************************
* dvbpsi_rst_init/dvbpsi_rst_new
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment