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
71126f5c
Commit
71126f5c
authored
Nov 26, 2015
by
Jean-Paul Saman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
PAT: implement as chained decoder
parent
a856c423
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
91 additions
and
30 deletions
+91
-30
examples/decode_pat.c
examples/decode_pat.c
+25
-6
src/tables/pat.c
src/tables/pat.c
+56
-19
src/tables/pat.h
src/tables/pat.h
+10
-5
No files found.
examples/decode_pat.c
View file @
71126f5c
...
...
@@ -42,10 +42,12 @@
#ifdef DVBPSI_DIST
#include "../src/dvbpsi.h"
#include "../src/psi.h"
#include "../src/chain.h"
#include "../src/tables/pat.h"
#else
#include <dvbpsi/dvbpsi.h>
#include <dvbpsi/psi.h>
#include <dvbpsi/chain.h>
#include <dvbpsi/pat.h>
#endif
...
...
@@ -96,6 +98,21 @@ static void DumpPAT(void* p_zero, dvbpsi_pat_t* p_pat)
dvbpsi_pat_delete
(
p_pat
);
}
/*****************************************************************************
* AttachPAT
*****************************************************************************/
static
void
AttachPAT
(
dvbpsi_t
*
p_dvbpsi
,
uint8_t
i_table_id
,
uint16_t
i_extension
,
void
*
p_zero
)
{
if
(
!
dvbpsi_pat_attach
(
p_dvbpsi
,
i_table_id
,
i_extension
,
DumpPAT
,
NULL
))
fprintf
(
stderr
,
"Failed to attach PAT decoder
\n
"
);
}
static
void
DetachPAT
(
dvbpsi_t
*
p_dvbpsi
,
uint8_t
i_table_id
,
uint16_t
i_extension
)
{
dvbpsi_pat_detach
(
p_dvbpsi
,
i_table_id
,
i_extension
);
}
static
void
message
(
dvbpsi_t
*
handle
,
const
dvbpsi_msg_level_t
level
,
const
char
*
msg
)
{
switch
(
level
)
...
...
@@ -115,22 +132,23 @@ static void message(dvbpsi_t *handle, const dvbpsi_msg_level_t level, const char
int
main
(
int
i_argc
,
char
*
pa_argv
[])
{
int
i_fd
;
int
ret
=
1
;
uint8_t
data
[
188
];
dvbpsi_t
*
p_dvbpsi
;
bool
b_ok
;
if
(
i_argc
!=
2
)
return
1
;
return
ret
;
i_fd
=
open
(
pa_argv
[
1
],
0
);
if
(
i_fd
<
0
)
return
1
;
return
ret
;
p_dvbpsi
=
dvbpsi_new
(
&
message
,
DVBPSI_MSG_DEBUG
);
if
(
p_dvbpsi
==
NULL
)
goto
out
;
if
(
!
dvbpsi_
pat_attach
(
p_dvbpsi
,
Dump
PAT
,
NULL
))
if
(
!
dvbpsi_
decoder_chain_new
(
p_dvbpsi
,
AttachPAT
,
Detach
PAT
,
NULL
))
goto
out
;
b_ok
=
ReadPacket
(
i_fd
,
data
);
...
...
@@ -143,14 +161,15 @@ int main(int i_argc, char* pa_argv[])
b_ok
=
ReadPacket
(
i_fd
,
data
);
}
ret
=
0
;
out:
if
(
p_dvbpsi
)
{
dvbpsi_pat_detach
(
p_dvbpsi
);
if
(
!
dvbpsi_decoder_chain_delete
(
p_dvbpsi
))
ret
=
1
;
dvbpsi_delete
(
p_dvbpsi
);
}
close
(
i_fd
);
return
0
;
return
ret
;
}
src/tables/pat.c
View file @
71126f5c
...
...
@@ -42,6 +42,7 @@
#include "../dvbpsi.h"
#include "../dvbpsi_private.h"
#include "../psi.h"
#include "../chain.h"
#include "pat.h"
#include "pat_private.h"
...
...
@@ -50,13 +51,21 @@
*****************************************************************************
* Initialize a PAT decoder and return a handle on it.
*****************************************************************************/
bool
dvbpsi_pat_attach
(
dvbpsi_t
*
p_dvbpsi
,
dvbpsi_pat_callback
pf_callback
,
void
*
p_cb_data
)
bool
dvbpsi_pat_attach
(
dvbpsi_t
*
p_dvbpsi
,
uint8_t
i_table_id
,
uint16_t
i_extension
,
dvbpsi_pat_callback
pf_callback
,
void
*
p_cb_data
)
{
assert
(
p_dvbpsi
);
assert
(
p_dvbpsi
->
p_decoder
==
NULL
);
/* PSI decoder configuration and initial state */
dvbpsi_decoder_t
*
p_dec
=
dvbpsi_decoder_chain_get
(
p_dvbpsi
,
i_table_id
,
i_extension
);
if
(
p_dec
!=
NULL
)
{
dvbpsi_error
(
p_dvbpsi
,
"PAT decoder"
,
"Already a decoder for (table_id == 0x%02x,"
"extension == 0x%02x)"
,
i_table_id
,
i_extension
);
return
false
;
}
dvbpsi_pat_decoder_t
*
p_pat_decoder
;
p_pat_decoder
=
(
dvbpsi_pat_decoder_t
*
)
dvbpsi_decoder_new
(
&
dvbpsi_pat_sections_gather
,
1024
,
true
,
sizeof
(
dvbpsi_pat_decoder_t
));
...
...
@@ -68,7 +77,16 @@ bool dvbpsi_pat_attach(dvbpsi_t *p_dvbpsi, dvbpsi_pat_callback pf_callback,
p_pat_decoder
->
p_cb_data
=
p_cb_data
;
p_pat_decoder
->
p_building_pat
=
NULL
;
p_dvbpsi
->
p_decoder
=
DVBPSI_DECODER
(
p_pat_decoder
);
p_pat_decoder
->
i_table_id
=
i_table_id
;
p_pat_decoder
->
i_extension
=
i_extension
;
/* Add pat decoder to decoder chain */
if
(
!
dvbpsi_decoder_chain_add
(
p_dvbpsi
,
DVBPSI_DECODER
(
p_pat_decoder
)))
{
dvbpsi_decoder_delete
(
DVBPSI_DECODER
(
p_pat_decoder
));
return
false
;
}
return
true
;
}
...
...
@@ -77,18 +95,36 @@ bool dvbpsi_pat_attach(dvbpsi_t *p_dvbpsi, dvbpsi_pat_callback pf_callback,
*****************************************************************************
* Close a PAT decoder. The handle isn't valid any more.
*****************************************************************************/
void
dvbpsi_pat_detach
(
dvbpsi_t
*
p_dvbpsi
)
void
dvbpsi_pat_detach
(
dvbpsi_t
*
p_dvbpsi
,
uint8_t
i_table_id
,
uint16_t
i_extension
)
{
assert
(
p_dvbpsi
);
assert
(
p_dvbpsi
->
p_decoder
);
dvbpsi_pat_decoder_t
*
p_pat_decoder
=
(
dvbpsi_pat_decoder_t
*
)
p_dvbpsi
->
p_decoder
;
dvbpsi_pat_decoder_t
*
p_pat_decoder
=
(
dvbpsi_pat_decoder_t
*
)
dvbpsi_decoder_chain_get
(
p_dvbpsi
,
i_table_id
,
i_extension
);
if
(
!
p_pat_decoder
)
{
dvbpsi_error
(
p_dvbpsi
,
"PAT Decoder"
,
"No such PAT 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_pat_decoder
)))
{
dvbpsi_error
(
p_dvbpsi
,
"PAT Decoder"
,
"Failed to remove"
"extension == 0x%02x)"
,
i_table_id
,
i_extension
);
return
;
}
if
(
p_pat_decoder
->
p_building_pat
)
dvbpsi_pat_delete
(
p_pat_decoder
->
p_building_pat
);
p_pat_decoder
->
p_building_pat
=
NULL
;
dvbpsi_decoder_delete
(
p_dvbpsi
->
p_decoder
);
p_dvbpsi
->
p_decoder
=
NULL
;
dvbpsi_decoder_delete
(
DVBPSI_DECODER
(
p_pat_decoder
));
p_pat_decoder
=
NULL
;
}
/*****************************************************************************
...
...
@@ -204,13 +240,10 @@ static void dvbpsi_ReInitPAT(dvbpsi_pat_decoder_t* p_decoder, const bool b_force
p_decoder
->
p_building_pat
=
NULL
;
}
static
bool
dvbpsi_CheckPAT
(
dvbpsi_t
*
p_dvbpsi
,
dvbpsi_psi_section_t
*
p_section
)
static
bool
dvbpsi_CheckPAT
(
dvbpsi_t
*
p_dvbpsi
,
dvbpsi_pat_decoder_t
*
p_pat_decoder
,
dvbpsi_psi_section_t
*
p_section
)
{
bool
b_reinit
=
false
;
assert
(
p_dvbpsi
->
p_decoder
);
dvbpsi_pat_decoder_t
*
p_pat_decoder
;
p_pat_decoder
=
(
dvbpsi_pat_decoder_t
*
)
p_dvbpsi
->
p_decoder
;
/* Perform a few sanity checks */
if
(
p_pat_decoder
->
p_building_pat
->
i_ts_id
!=
p_section
->
i_extension
)
...
...
@@ -273,10 +306,8 @@ static bool dvbpsi_AddSectionPAT(dvbpsi_t *p_dvbpsi, dvbpsi_pat_decoder_t *p_pat
*****************************************************************************/
void
dvbpsi_pat_sections_gather
(
dvbpsi_t
*
p_dvbpsi
,
dvbpsi_psi_section_t
*
p_section
)
{
dvbpsi_pat_decoder_t
*
p_pat_decoder
;
assert
(
p_dvbpsi
);
assert
(
p_dvbpsi
->
p_decoder
);
if
(
!
dvbpsi_CheckPSISection
(
p_dvbpsi
,
p_section
,
0x00
,
"PAT decoder"
))
{
...
...
@@ -285,9 +316,15 @@ void dvbpsi_pat_sections_gather(dvbpsi_t* p_dvbpsi, dvbpsi_psi_section_t* p_sect
}
/* Now we have a valid PAT section */
p_pat_decoder
=
(
dvbpsi_pat_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_pat_decoder_t
*
p_pat_decoder
=
(
dvbpsi_pat_decoder_t
*
)
p_dec
;
if
(
p_pat_decoder
->
b_discontinuity
)
{
dvbpsi_ReInitPAT
(
p_pat_decoder
,
true
);
...
...
@@ -297,7 +334,7 @@ void dvbpsi_pat_sections_gather(dvbpsi_t* p_dvbpsi, dvbpsi_psi_section_t* p_sect
{
if
(
p_pat_decoder
->
p_building_pat
)
{
if
(
dvbpsi_CheckPAT
(
p_dvbpsi
,
p_section
))
if
(
dvbpsi_CheckPAT
(
p_dvbpsi
,
p_
pat_decoder
,
p_
section
))
dvbpsi_ReInitPAT
(
p_pat_decoder
,
true
);
}
else
...
...
src/tables/pat.h
View file @
71126f5c
...
...
@@ -101,28 +101,33 @@ typedef void (* dvbpsi_pat_callback)(void* p_cb_data, dvbpsi_pat_t* p_new_pat);
* dvbpsi_pat_attach
*****************************************************************************/
/*!
* \fn bool dvbpsi_pat_attach(dvbpsi_t *p_dvbpsi, dvbpsi_pat_callback pf_callback, void* p_cb_data)
* \fn bool dvbpsi_pat_attach(dvbpsi_t *p_dvbpsi, uint8_t i_table_id, uint16_t i_extension,
* dvbpsi_pat_callback pf_callback, void* p_cb_data)
* \brief Creation and initialization of a PAT decoder. The decoder will be attached to 'p_dvbpsi' argument.
* \param p_dvbpsi handle to dvbpsi with attached decoder
* \param i_table_id Table ID
* \param i_extension Table ID extension
* \param pf_callback function to call back on new PAT
* \param p_cb_data private data given in argument to the callback
* \return true on success, false on failure
*/
bool
dvbpsi_pat_attach
(
dvbpsi_t
*
p_dvbpsi
,
dvbpsi_pat_callback
pf_callback
,
void
*
p_cb_data
);
bool
dvbpsi_pat_attach
(
dvbpsi_t
*
p_dvbpsi
,
uint8_t
i_table_id
,
uint16_t
i_extension
,
dvbpsi_pat_callback
pf_callback
,
void
*
p_cb_data
);
/*****************************************************************************
* dvbpsi_pat_detach
*****************************************************************************/
/*!
* \fn void dvbpsi_pat_detach(dvbpsi_t *p_dvbpsi)
* \fn void dvbpsi_pat_detach(dvbpsi_t *p_dvbpsi
, uint8_t i_table_id, uint16_t i_extension
)
* \brief Destroy a PAT decoder.
* \param p_dvbpsi pointer to dvbpsi_t handle
* \param i_table_id Table ID
* \param i_extension Table ID extension
* \return nothing.
*
* The handle isn't valid any more.
*/
void
dvbpsi_pat_detach
(
dvbpsi_t
*
p_dvbpsi
);
void
dvbpsi_pat_detach
(
dvbpsi_t
*
p_dvbpsi
,
uint8_t
i_table_id
,
uint16_t
i_extension
);
/*****************************************************************************
* dvbpsi_pat_init/dvbpsi_pat_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