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
e950dbfb
Commit
e950dbfb
authored
Mar 15, 2011
by
Jean-Paul Saman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
src/table/eit*: Cleanup
- Use bool for structure members that are used as bools - Indentation
parent
e1aee6aa
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
145 additions
and
152 deletions
+145
-152
src/tables/eit.c
src/tables/eit.c
+136
-142
src/tables/eit.h
src/tables/eit.h
+8
-9
src/tables/eit_private.h
src/tables/eit_private.h
+1
-1
No files found.
src/tables/eit.c
View file @
e950dbfb
/*****************************************************************************
/*****************************************************************************
* eit.c: EIT decoder/generator
* eit.c: EIT decoder/generator
*----------------------------------------------------------------------------
*----------------------------------------------------------------------------
* Copyright (C) 2004-201
0
VideoLAN
* Copyright (C) 2004-201
1
VideoLAN
* $Id: eit.c 88 2004-02-24 14:31:18Z sam $
* $Id: eit.c 88 2004-02-24 14:31:18Z sam $
*
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Authors: Christophe Massiot <massiot@via.ecp.fr>
...
@@ -98,7 +98,7 @@ bool dvbpsi_AttachEIT(dvbpsi_t *p_dvbpsi, uint8_t i_table_id, uint16_t i_extensi
...
@@ -98,7 +98,7 @@ bool dvbpsi_AttachEIT(dvbpsi_t *p_dvbpsi, uint8_t i_table_id, uint16_t i_extensi
p_eit_decoder
->
pf_eit_callback
=
pf_callback
;
p_eit_decoder
->
pf_eit_callback
=
pf_callback
;
p_eit_decoder
->
p_cb_data
=
p_cb_data
;
p_eit_decoder
->
p_cb_data
=
p_cb_data
;
/* EIT decoder initial state */
/* EIT decoder initial state */
p_eit_decoder
->
b_current_valid
=
0
;
p_eit_decoder
->
b_current_valid
=
false
;
p_eit_decoder
->
p_building_eit
=
NULL
;
p_eit_decoder
->
p_building_eit
=
NULL
;
for
(
unsigned
int
i
=
0
;
i
<=
255
;
i
++
)
for
(
unsigned
int
i
=
0
;
i
<=
255
;
i
++
)
p_eit_decoder
->
ap_sections
[
i
]
=
NULL
;
p_eit_decoder
->
ap_sections
[
i
]
=
NULL
;
...
@@ -157,7 +157,7 @@ void dvbpsi_DetachEIT(dvbpsi_t *p_dvbpsi, uint8_t i_table_id,
...
@@ -157,7 +157,7 @@ void dvbpsi_DetachEIT(dvbpsi_t *p_dvbpsi, uint8_t i_table_id,
* Initialize a pre-allocated dvbpsi_eit_t structure.
* Initialize a pre-allocated dvbpsi_eit_t structure.
*****************************************************************************/
*****************************************************************************/
void
dvbpsi_InitEIT
(
dvbpsi_eit_t
*
p_eit
,
uint16_t
i_service_id
,
uint8_t
i_version
,
void
dvbpsi_InitEIT
(
dvbpsi_eit_t
*
p_eit
,
uint16_t
i_service_id
,
uint8_t
i_version
,
int
b_current_next
,
uint16_t
i_ts_id
,
uint16_t
i_network_id
,
bool
b_current_next
,
uint16_t
i_ts_id
,
uint16_t
i_network_id
,
uint8_t
i_segment_last_section_number
,
uint8_t
i_segment_last_section_number
,
uint8_t
i_last_table_id
)
uint8_t
i_last_table_id
)
{
{
...
@@ -197,7 +197,7 @@ void dvbpsi_EmptyEIT(dvbpsi_eit_t* p_eit)
...
@@ -197,7 +197,7 @@ void dvbpsi_EmptyEIT(dvbpsi_eit_t* p_eit)
*****************************************************************************/
*****************************************************************************/
dvbpsi_eit_event_t
*
dvbpsi_EITAddEvent
(
dvbpsi_eit_t
*
p_eit
,
dvbpsi_eit_event_t
*
dvbpsi_EITAddEvent
(
dvbpsi_eit_t
*
p_eit
,
uint16_t
i_event_id
,
uint64_t
i_start_time
,
uint32_t
i_duration
,
uint16_t
i_event_id
,
uint64_t
i_start_time
,
uint32_t
i_duration
,
uint8_t
i_running_status
,
int
b_free_ca
)
uint8_t
i_running_status
,
bool
b_free_ca
)
{
{
dvbpsi_eit_event_t
*
p_event
;
dvbpsi_eit_event_t
*
p_event
;
p_event
=
(
dvbpsi_eit_event_t
*
)
calloc
(
1
,
sizeof
(
dvbpsi_eit_event_t
));
p_event
=
(
dvbpsi_eit_event_t
*
)
calloc
(
1
,
sizeof
(
dvbpsi_eit_event_t
));
...
@@ -260,8 +260,10 @@ void dvbpsi_GatherEITSections(dvbpsi_t *p_dvbpsi, void *p_private_decoder,
...
@@ -260,8 +260,10 @@ void dvbpsi_GatherEITSections(dvbpsi_t *p_dvbpsi, void *p_private_decoder,
dvbpsi_demux_t
*
p_demux
=
(
dvbpsi_demux_t
*
)
p_dvbpsi
->
p_private
;
dvbpsi_demux_t
*
p_demux
=
(
dvbpsi_demux_t
*
)
p_dvbpsi
->
p_private
;
dvbpsi_eit_decoder_t
*
p_eit_decoder
dvbpsi_eit_decoder_t
*
p_eit_decoder
=
(
dvbpsi_eit_decoder_t
*
)
p_private_decoder
;
=
(
dvbpsi_eit_decoder_t
*
)
p_private_decoder
;
int
b_append
=
1
;
bool
b_reinit
=
false
;
int
b_reinit
=
0
;
assert
(
p_dvbpsi
);
assert
(
p_dvbpsi
->
p_private
);
dvbpsi_debug
(
p_dvbpsi
,
"EIT decoder"
,
dvbpsi_debug
(
p_dvbpsi
,
"EIT decoder"
,
"Table version %2d, "
"i_table_id %2d, "
"i_extension %5d, "
"Table version %2d, "
"i_table_id %2d, "
"i_extension %5d, "
...
@@ -276,60 +278,60 @@ void dvbpsi_GatherEITSections(dvbpsi_t *p_dvbpsi, void *p_private_decoder,
...
@@ -276,60 +278,60 @@ void dvbpsi_GatherEITSections(dvbpsi_t *p_dvbpsi, void *p_private_decoder,
/* Invalid section_syntax_indicator */
/* Invalid section_syntax_indicator */
dvbpsi_error
(
p_dvbpsi
,
"EIT decoder"
,
dvbpsi_error
(
p_dvbpsi
,
"EIT decoder"
,
"invalid section (section_syntax_indicator == 0)"
);
"invalid section (section_syntax_indicator == 0)"
);
b_append
=
0
;
dvbpsi_DeletePSISections
(
p_section
);
return
;
}
}
/* Now if b_append is true then we have a valid EIT section */
/* We have a valid EIT section */
if
(
b_append
)
/* TS discontinuity check */
if
(
p_demux
->
b_discontinuity
)
{
b_reinit
=
true
;
p_demux
->
b_discontinuity
=
false
;
}
else
{
{
/*
TS discontinuity check
*/
/*
Perform a few sanity checks
*/
if
(
p_demux
->
b_discontinuity
)
if
(
p_eit_decoder
->
p_building_eit
)
{
{
b_reinit
=
1
;
if
(
p_eit_decoder
->
p_building_eit
->
i_service_id
p_demux
->
b_discontinuity
=
false
;
!=
p_section
->
i_extension
)
{
/* service_id */
dvbpsi_error
(
p_dvbpsi
,
"EIT decoder"
,
"'service_id' differs"
" whereas no TS discontinuity has occurred"
);
b_reinit
=
true
;
}
else
if
(
p_eit_decoder
->
p_building_eit
->
i_version
!=
p_section
->
i_version
)
{
/* version_number */
dvbpsi_error
(
p_dvbpsi
,
"EIT decoder"
,
"'version_number' differs"
" whereas no discontinuity has occurred"
);
b_reinit
=
true
;
}
else
if
(
p_eit_decoder
->
i_last_section_number
!=
p_section
->
i_last_number
)
{
/* last_section_number */
dvbpsi_error
(
p_dvbpsi
,
"EIT decoder"
,
"'last_section_number' differs"
" whereas no discontinuity has occured"
);
b_reinit
=
true
;
}
}
}
else
else
{
{
/* Perform a few sanity checks */
if
(
(
p_eit_decoder
->
b_current_valid
)
if
(
p_eit_decoder
->
p_building_eit
)
&&
(
p_eit_decoder
->
current_eit
.
i_version
==
p_section
->
i_version
)
{
&&
(
p_eit_decoder
->
current_eit
.
b_current_next
==
p_section
->
b_current_next
))
if
(
p_eit_decoder
->
p_building_eit
->
i_service_id
!=
p_section
->
i_extension
)
{
/* service_id */
dvbpsi_error
(
p_dvbpsi
,
"EIT decoder"
,
"'service_id' differs"
" whereas no TS discontinuity has occurred"
);
b_reinit
=
1
;
}
else
if
(
p_eit_decoder
->
p_building_eit
->
i_version
!=
p_section
->
i_version
)
{
/* version_number */
dvbpsi_error
(
p_dvbpsi
,
"EIT decoder"
,
"'version_number' differs"
" whereas no discontinuity has occurred"
);
b_reinit
=
1
;
}
else
if
(
p_eit_decoder
->
i_last_section_number
!=
p_section
->
i_last_number
)
{
/* last_section_number */
dvbpsi_error
(
p_dvbpsi
,
"EIT decoder"
,
"'last_section_number' differs"
" whereas no discontinuity has occured"
);
b_reinit
=
1
;
}
}
else
{
{
if
(
(
p_eit_decoder
->
b_current_valid
)
/* Don't decode since this version is already decoded */
&&
(
p_eit_decoder
->
current_eit
.
i_version
==
p_section
->
i_version
)
dvbpsi_DeletePSISections
(
p_section
);
&&
(
p_eit_decoder
->
current_eit
.
b_current_next
==
p_section
->
b_current_next
))
return
;
{
/* Don't decode since this version is already decoded */
b_append
=
0
;
}
}
}
}
}
}
}
...
@@ -338,7 +340,7 @@ void dvbpsi_GatherEITSections(dvbpsi_t *p_dvbpsi, void *p_private_decoder,
...
@@ -338,7 +340,7 @@ void dvbpsi_GatherEITSections(dvbpsi_t *p_dvbpsi, void *p_private_decoder,
if
(
b_reinit
)
if
(
b_reinit
)
{
{
/* Force redecoding */
/* Force redecoding */
p_eit_decoder
->
b_current_valid
=
0
;
p_eit_decoder
->
b_current_valid
=
false
;
/* Free structures */
/* Free structures */
if
(
p_eit_decoder
->
p_building_eit
)
if
(
p_eit_decoder
->
p_building_eit
)
{
{
...
@@ -356,15 +358,12 @@ void dvbpsi_GatherEITSections(dvbpsi_t *p_dvbpsi, void *p_private_decoder,
...
@@ -356,15 +358,12 @@ void dvbpsi_GatherEITSections(dvbpsi_t *p_dvbpsi, void *p_private_decoder,
}
}
}
}
/*
Append the section to the list if want
ed */
/*
Initialize the structures if it's the first section receiv
ed */
if
(
b_append
)
if
(
!
p_eit_decoder
->
p_building_eit
)
{
{
int
b_complete
;
p_eit_decoder
->
p_building_eit
=
(
dvbpsi_eit_t
*
)
calloc
(
1
,
sizeof
(
dvbpsi_eit_t
));
if
(
p_eit_decoder
->
p_building_eit
)
/* Initialize the structures if it's the first section received */
if
(
!
p_eit_decoder
->
p_building_eit
)
{
{
p_eit_decoder
->
p_building_eit
=
(
dvbpsi_eit_t
*
)
calloc
(
1
,
sizeof
(
dvbpsi_eit_t
));
dvbpsi_InitEIT
(
p_eit_decoder
->
p_building_eit
,
dvbpsi_InitEIT
(
p_eit_decoder
->
p_building_eit
,
p_section
->
i_extension
,
p_section
->
i_extension
,
p_section
->
i_version
,
p_section
->
i_version
,
...
@@ -378,102 +377,97 @@ void dvbpsi_GatherEITSections(dvbpsi_t *p_dvbpsi, void *p_private_decoder,
...
@@ -378,102 +377,97 @@ void dvbpsi_GatherEITSections(dvbpsi_t *p_dvbpsi, void *p_private_decoder,
p_eit_decoder
->
i_last_section_number
=
p_section
->
i_last_number
;
p_eit_decoder
->
i_last_section_number
=
p_section
->
i_last_number
;
p_eit_decoder
->
i_first_received_section_number
=
p_section
->
i_number
;
p_eit_decoder
->
i_first_received_section_number
=
p_section
->
i_number
;
}
}
else
dvbpsi_error
(
p_dvbpsi
,
"EIT decoder"
,
"failed decoding EIT section"
);
}
/* Fill the section array */
/* Fill the section array */
if
(
p_eit_decoder
->
ap_sections
[
p_section
->
i_number
]
!=
NULL
)
if
(
p_eit_decoder
->
ap_sections
[
p_section
->
i_number
]
!=
NULL
)
{
{
dvbpsi_debug
(
p_dvbpsi
,
"EIT decoder"
,
"overwrite section number %d"
,
dvbpsi_debug
(
p_dvbpsi
,
"EIT decoder"
,
"overwrite section number %d"
,
p_section
->
i_number
);
p_section
->
i_number
);
dvbpsi_DeletePSISections
(
p_eit_decoder
->
ap_sections
[
p_section
->
i_number
]);
dvbpsi_DeletePSISections
(
p_eit_decoder
->
ap_sections
[
p_section
->
i_number
]);
}
}
p_eit_decoder
->
ap_sections
[
p_section
->
i_number
]
=
p_section
;
p_eit_decoder
->
ap_sections
[
p_section
->
i_number
]
=
p_section
;
/* Check if we have all the sections */
/* Check if we have all the sections */
bool
b_complete
=
false
;
b_complete
=
0
;
/* As there may be gaps in the section_number fields (see below), we
/* As there may be gaps in the section_number fields (see below), we
* have to wait until we have received a section_number twice or
* have to wait until we have received a section_number twice or
* until we have a received a section_number which is
* until we have a received a section_number which is
* first_received_section_number - 1;
* first_received_section_number - 1;
* if the first_received_section_number is 0, it's enough to wait
* if the first_received_section_number is 0, it's enough to wait
* until the last_section_number has been received;
* until the last_section_number has been received;
* this is the only way to be sure that a complete table has been
* this is the only way to be sure that a complete table has been
* sent! */
* sent! */
if
((
p_eit_decoder
->
i_first_received_section_number
>
0
&&
if
((
p_eit_decoder
->
i_first_received_section_number
>
0
&&
(
p_section
->
i_number
==
p_eit_decoder
->
i_first_received_section_number
||
(
p_section
->
i_number
==
p_section
->
i_number
==
p_eit_decoder
->
i_first_received_section_number
-
1
))
||
p_eit_decoder
->
i_first_received_section_number
||
(
p_eit_decoder
->
i_first_received_section_number
==
0
&&
p_section
->
i_number
==
p_section
->
i_number
==
p_eit_decoder
->
i_last_section_number
))
p_eit_decoder
->
i_first_received_section_number
-
1
))
||
{
(
p_eit_decoder
->
i_first_received_section_number
==
0
&&
for
(
unsigned
int
i
=
0
;
i
<=
p_eit_decoder
->
i_last_section_number
;
i
++
)
p_section
->
i_number
==
p_eit_decoder
->
i_last_section_number
))
{
{
for
(
unsigned
int
i
=
0
;
i
<=
p_eit_decoder
->
i_last_section_number
;
i
++
)
if
(
!
p_eit_decoder
->
ap_sections
[
i
])
{
break
;
if
(
!
p_eit_decoder
->
ap_sections
[
i
])
break
;
if
(
i
==
p_eit_decoder
->
i_last_section_number
)
if
(
i
==
p_eit_decoder
->
i_last_section_number
)
{
{
b_complete
=
1
;
b_complete
=
true
;
break
;
break
;
}
}
/* ETSI EN 300 468 V1.5.1 section 5.2.4 says that the EIT
/* ETSI EN 300 468 V1.5.1 section 5.2.4 says that the EIT
* sections may be structured into a number of segments and
* sections may be structured into a number of segments and
* that there may be a gap in the section_number between
* that there may be a gap in the section_number between
* two segments (but not within a single segment); thus at
* two segments (but not within a single segment); thus at
* the end of a segment (indicated by
* the end of a segment (indicated by
* section_number == segment_last_section_number)
* section_number == segment_last_section_number)
* we have to search for the beginning of the next segment) */
* we have to search for the beginning of the next segment) */
if
(
i
==
p_eit_decoder
->
ap_sections
[
i
]
->
p_payload_start
[
4
])
if
(
i
==
p_eit_decoder
->
ap_sections
[
i
]
->
p_payload_start
[
4
])
{
while
(
!
p_eit_decoder
->
ap_sections
[
i
+
1
]
&&
(
i
+
1
<
p_eit_decoder
->
i_last_section_number
))
{
{
while
(
!
p_eit_decoder
->
ap_sections
[
i
+
1
]
&&
i
++
;
(
i
+
1
<
p_eit_decoder
->
i_last_section_number
))
{
i
++
;
}
}
}
}
}
}
}
}
if
(
b_complete
)
if
(
b_complete
)
{
/* Save the current information */
p_eit_decoder
->
current_eit
=
*
p_eit_decoder
->
p_building_eit
;
p_eit_decoder
->
b_current_valid
=
true
;
/* Chain the sections */
if
(
p_eit_decoder
->
i_last_section_number
)
{
{
/* Save the current information */
dvbpsi_psi_section_t
*
p_prev_section
;
p_eit_decoder
->
current_eit
=
*
p_eit_decoder
->
p_building_eit
;
p_prev_section
=
p_eit_decoder
->
ap_sections
[
0
];
p_eit_decoder
->
b_current_valid
=
1
;
for
(
unsigned
int
i
=
1
;
i
<=
p_eit_decoder
->
i_last_section_number
;
i
++
)
/* Chain the sections */
if
(
p_eit_decoder
->
i_last_section_number
)
{
{
dvbpsi_psi_section_t
*
p_prev_section
;
if
(
p_eit_decoder
->
ap_sections
[
i
]
!=
NULL
)
p_prev_section
=
p_eit_decoder
->
ap_sections
[
0
];
for
(
unsigned
int
i
=
1
;
i
<=
p_eit_decoder
->
i_last_section_number
;
i
++
)
{
{
if
(
p_eit_decoder
->
ap_sections
[
i
]
!=
NULL
)
p_prev_section
->
p_next
=
p_eit_decoder
->
ap_sections
[
i
];
{
p_prev_section
=
p_eit_decoder
->
ap_sections
[
i
];
p_prev_section
->
p_next
=
p_eit_decoder
->
ap_sections
[
i
];
p_prev_section
=
p_eit_decoder
->
ap_sections
[
i
];
}
}
}
}
}
/* Decode the sections */
dvbpsi_DecodeEITSections
(
p_eit_decoder
->
p_building_eit
,
p_eit_decoder
->
ap_sections
[
0
]);
/* Delete the sections */
dvbpsi_DeletePSISections
(
p_eit_decoder
->
ap_sections
[
0
]);
/* signal the new EIT */
p_eit_decoder
->
pf_eit_callback
(
p_eit_decoder
->
p_cb_data
,
p_eit_decoder
->
p_building_eit
);
/* Reinitialize the structures */
p_eit_decoder
->
p_building_eit
=
NULL
;
for
(
unsigned
int
i
=
0
;
i
<=
p_eit_decoder
->
i_last_section_number
;
i
++
)
p_eit_decoder
->
ap_sections
[
i
]
=
NULL
;
}
}
}
else
/* Decode the sections */
{
dvbpsi_DecodeEITSections
(
p_eit_decoder
->
p_building_eit
,
p_eit_decoder
->
ap_sections
[
0
]);
dvbpsi_DeletePSISections
(
p_section
);
/* Delete the sections */
dvbpsi_DeletePSISections
(
p_eit_decoder
->
ap_sections
[
0
]);
/* signal the new EIT */
p_eit_decoder
->
pf_eit_callback
(
p_eit_decoder
->
p_cb_data
,
p_eit_decoder
->
p_building_eit
);
/* Reinitialize the structures */
p_eit_decoder
->
p_building_eit
=
NULL
;
for
(
unsigned
int
i
=
0
;
i
<=
p_eit_decoder
->
i_last_section_number
;
i
++
)
p_eit_decoder
->
ap_sections
[
i
]
=
NULL
;
}
}
}
}
...
@@ -500,7 +494,7 @@ void dvbpsi_DecodeEITSections(dvbpsi_eit_t* p_eit,
...
@@ -500,7 +494,7 @@ void dvbpsi_DecodeEITSections(dvbpsi_eit_t* p_eit,
uint32_t
i_duration
=
((
uint32_t
)(
p_byte
[
7
])
<<
16
)
uint32_t
i_duration
=
((
uint32_t
)(
p_byte
[
7
])
<<
16
)
|
((
uint32_t
)(
p_byte
[
8
])
<<
8
)
|
p_byte
[
9
];
|
((
uint32_t
)(
p_byte
[
8
])
<<
8
)
|
p_byte
[
9
];
uint8_t
i_running_status
=
(
uint8_t
)(
p_byte
[
10
])
>>
5
;
uint8_t
i_running_status
=
(
uint8_t
)(
p_byte
[
10
])
>>
5
;
int
b_free_ca
=
(
int
)(
p_byte
[
10
]
&
0x10
)
>>
4
;
bool
b_free_ca
=
(
int
)(
p_byte
[
10
]
&
0x10
)
>>
4
;
uint16_t
i_ev_length
=
((
uint16_t
)(
p_byte
[
10
]
&
0xf
)
<<
8
)
|
p_byte
[
11
];
uint16_t
i_ev_length
=
((
uint16_t
)(
p_byte
[
10
]
&
0xf
)
<<
8
)
|
p_byte
[
11
];
dvbpsi_eit_event_t
*
p_event
=
dvbpsi_EITAddEvent
(
p_eit
,
dvbpsi_eit_event_t
*
p_event
=
dvbpsi_EITAddEvent
(
p_eit
,
i_event_id
,
i_start_time
,
i_duration
,
i_event_id
,
i_start_time
,
i_duration
,
...
...
src/tables/eit.h
View file @
e950dbfb
/*****************************************************************************
/*****************************************************************************
* eit.h
* eit.h
* Copyright (C) 2004-201
0
VideoLAN
* Copyright (C) 2004-201
1
VideoLAN
* $Id: eit.h 88 2004-02-24 14:31:18Z sam $
* $Id: eit.h 88 2004-02-24 14:31:18Z sam $
*
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Authors: Christophe Massiot <massiot@via.ecp.fr>
...
@@ -58,7 +58,7 @@ typedef struct dvbpsi_eit_event_s
...
@@ -58,7 +58,7 @@ typedef struct dvbpsi_eit_event_s
uint64_t
i_start_time
;
/*!< start_time */
uint64_t
i_start_time
;
/*!< start_time */
uint32_t
i_duration
;
/*!< duration */
uint32_t
i_duration
;
/*!< duration */
uint8_t
i_running_status
;
/*!< Running status */
uint8_t
i_running_status
;
/*!< Running status */
int
b_free_ca
;
/*!< Free CA mode flag */
bool
b_free_ca
;
/*!< Free CA mode flag */
uint16_t
i_descriptors_length
;
/*!< Descriptors loop
uint16_t
i_descriptors_length
;
/*!< Descriptors loop
length */
length */
dvbpsi_descriptor_t
*
p_first_descriptor
;
/*!< First of the following
dvbpsi_descriptor_t
*
p_first_descriptor
;
/*!< First of the following
...
@@ -87,7 +87,7 @@ typedef struct dvbpsi_eit_s
...
@@ -87,7 +87,7 @@ typedef struct dvbpsi_eit_s
{
{
uint16_t
i_service_id
;
/*!< service_id */
uint16_t
i_service_id
;
/*!< service_id */
uint8_t
i_version
;
/*!< version_number */
uint8_t
i_version
;
/*!< version_number */
int
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 section number */
uint8_t
i_segment_last_section_number
;
/*!< segment last section number */
...
@@ -138,15 +138,14 @@ bool dvbpsi_AttachEIT(dvbpsi_t *p_dvbpsi, uint8_t i_table_id,
...
@@ -138,15 +138,14 @@ bool dvbpsi_AttachEIT(dvbpsi_t *p_dvbpsi, uint8_t i_table_id,
* \param i_extension Table ID extension, here service ID.
* \param i_extension Table ID extension, here service ID.
* \return nothing.
* \return nothing.
*/
*/
void
dvbpsi_DetachEIT
(
dvbpsi_t
*
p_dvbpsi
,
uint8_t
i_table_id
,
void
dvbpsi_DetachEIT
(
dvbpsi_t
*
p_dvbpsi
,
uint8_t
i_table_id
,
uint16_t
i_extension
);
uint16_t
i_extension
);
/*****************************************************************************
/*****************************************************************************
* dvbpsi_InitEIT/dvbpsi_NewEIT
* dvbpsi_InitEIT/dvbpsi_NewEIT
*****************************************************************************/
*****************************************************************************/
/*!
/*!
* \fn void dvbpsi_InitEIT(dvbpsi_eit_t* p_eit, uint16_t i_service_id,
* \fn void dvbpsi_InitEIT(dvbpsi_eit_t* p_eit, uint16_t i_service_id,
uint8_t i_version,
int
b_current_next, uint16_t i_ts_id,
uint8_t i_version,
bool
b_current_next, uint16_t i_ts_id,
uint16_t i_network_id, uint8_t i_segment_last_section_number,
uint16_t i_network_id, uint8_t i_segment_last_section_number,
uint8_t i_last_table_id)
uint8_t i_last_table_id)
* \brief Initialize a user-allocated dvbpsi_eit_t structure.
* \brief Initialize a user-allocated dvbpsi_eit_t structure.
...
@@ -161,7 +160,7 @@ void dvbpsi_DetachEIT(dvbpsi_t *p_dvbpsi, uint8_t i_table_id,
...
@@ -161,7 +160,7 @@ void dvbpsi_DetachEIT(dvbpsi_t *p_dvbpsi, uint8_t i_table_id,
* \return nothing.
* \return nothing.
*/
*/
void
dvbpsi_InitEIT
(
dvbpsi_eit_t
*
p_eit
,
uint16_t
i_service_id
,
uint8_t
i_version
,
void
dvbpsi_InitEIT
(
dvbpsi_eit_t
*
p_eit
,
uint16_t
i_service_id
,
uint8_t
i_version
,
int
b_current_next
,
uint16_t
i_ts_id
,
uint16_t
i_network_id
,
bool
b_current_next
,
uint16_t
i_ts_id
,
uint16_t
i_network_id
,
uint8_t
i_segment_last_section_number
,
uint8_t
i_segment_last_section_number
,
uint8_t
i_last_table_id
);
uint8_t
i_last_table_id
);
...
@@ -217,7 +216,7 @@ do { \
...
@@ -217,7 +216,7 @@ do { \
uint64_t i_start_time,
uint64_t i_start_time,
uint32_t i_duration,
uint32_t i_duration,
uint8_t i_running_status,
uint8_t i_running_status,
int
b_free_ca)
bool
b_free_ca)
* \brief Add a service description at the end of the EIT.
* \brief Add a service description at the end of the EIT.
* \param p_eit pointer to the EIT structure
* \param p_eit pointer to the EIT structure
* \param i_event_id Event ID
* \param i_event_id Event ID
...
@@ -229,7 +228,7 @@ do { \
...
@@ -229,7 +228,7 @@ do { \
*/
*/
dvbpsi_eit_event_t
*
dvbpsi_EITAddEvent
(
dvbpsi_eit_t
*
p_eit
,
dvbpsi_eit_event_t
*
dvbpsi_EITAddEvent
(
dvbpsi_eit_t
*
p_eit
,
uint16_t
i_event_id
,
uint64_t
i_start_time
,
uint32_t
i_duration
,
uint16_t
i_event_id
,
uint64_t
i_start_time
,
uint32_t
i_duration
,
uint8_t
i_running_status
,
int
b_free_ca
);
uint8_t
i_running_status
,
bool
b_free_ca
);
/*****************************************************************************
/*****************************************************************************
* dvbpsi_EITEventAddDescriptor
* dvbpsi_EITEventAddDescriptor
...
...
src/tables/eit_private.h
View file @
e950dbfb
...
@@ -43,7 +43,7 @@ typedef struct dvbpsi_eit_decoder_s
...
@@ -43,7 +43,7 @@ typedef struct dvbpsi_eit_decoder_s
dvbpsi_eit_t
current_eit
;
dvbpsi_eit_t
current_eit
;
dvbpsi_eit_t
*
p_building_eit
;
dvbpsi_eit_t
*
p_building_eit
;
int
b_current_valid
;
bool
b_current_valid
;
uint8_t
i_last_section_number
;
uint8_t
i_last_section_number
;
uint8_t
i_first_received_section_number
;
uint8_t
i_first_received_section_number
;
...
...
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