Skip to content
GitLab
Explore
Sign in
Register
Commits on Source (2)
really identify duplicates
· 89f23e87
François Cartegnie
authored
Aug 07, 2018
89f23e87
really reset packet counter
· 9f2289a6
François Cartegnie
authored
Aug 07, 2018
9f2289a6
Hide whitespace changes
Inline
Side-by-side
src/dvbpsi.c
View file @
9f2289a6
...
...
@@ -98,6 +98,7 @@ void *dvbpsi_decoder_new(dvbpsi_callback_gather_t pf_gather,
p_decoder
->
i_section_max_size
=
i_section_max_size
;
p_decoder
->
b_discontinuity
=
b_discontinuity
;
p_decoder
->
i_continuity_counter
=
DVBPSI_INVALID_CC
;
p_decoder
->
prevpacket
[
0
]
=
0
;
p_decoder
->
p_current_section
=
NULL
;
p_decoder
->
b_current_valid
=
false
;
...
...
@@ -119,6 +120,9 @@ void dvbpsi_decoder_reset(dvbpsi_decoder_t* p_decoder, const bool b_force)
if
(
b_force
)
p_decoder
->
b_current_valid
=
false
;
p_decoder
->
i_continuity_counter
=
DVBPSI_INVALID_CC
;
p_decoder
->
prevpacket
[
0
]
=
0
;
/* Clear the section array */
dvbpsi_DeletePSISections
(
p_decoder
->
p_sections
);
p_decoder
->
p_sections
=
NULL
;
...
...
@@ -293,11 +297,19 @@ bool dvbpsi_packet_push(dvbpsi_t *p_dvbpsi, const uint8_t* p_data)
if
(
i_expected_counter
==
((
p_decoder
->
i_continuity_counter
+
1
)
&
0xf
)
&&
!
p_decoder
->
b_discontinuity
)
{
dvbpsi_error
(
p_dvbpsi
,
"PSI decoder"
,
"TS duplicate (received %d, expected %d) for PID %d"
,
p_decoder
->
i_continuity_counter
,
i_expected_counter
,
((
uint16_t
)(
p_data
[
1
]
&
0x1f
)
<<
8
)
|
p_data
[
2
]);
return
false
;
if
(
!
memcmp
(
p_decoder
->
prevpacket
,
p_data
,
188
))
{
dvbpsi_debug
(
p_dvbpsi
,
"PSI decoder"
,
"TS duplicate (received %d, expected %d) for PID %d"
,
p_decoder
->
i_continuity_counter
,
i_expected_counter
,
((
uint16_t
)(
p_data
[
1
]
&
0x1f
)
<<
8
)
|
p_data
[
2
]);
return
false
;
}
else
/* Fake duplicate */
{
/* force discontinuity */
i_expected_counter
=
p_decoder
->
i_continuity_counter
+
1
;
}
}
if
(
i_expected_counter
!=
p_decoder
->
i_continuity_counter
)
...
...
@@ -315,6 +327,8 @@ bool dvbpsi_packet_push(dvbpsi_t *p_dvbpsi, const uint8_t* p_data)
}
}
memcpy
(
p_decoder
->
prevpacket
,
p_data
,
188
);
/* Return if no payload in the TS packet */
if
(
!
(
p_data
[
3
]
&
0x10
))
return
false
;
...
...
src/dvbpsi.h
View file @
9f2289a6
...
...
@@ -264,6 +264,7 @@ typedef void (*dvbpsi_callback_del_t)(dvbpsi_t *p_dvbpsi, /*!< pointer to dvbp
bool b_discontinuity;
/*!< Discontinuity flag */
\
bool b_current_valid;
/*!< Current valid indicator */
\
uint8_t i_continuity_counter;
/*!< Continuity counter */
\
uint8_t prevpacket[188];
/*!< Previous packet data */
\
uint8_t i_last_section_number;
/*!< Last received section number */
\
dvbpsi_psi_section_t *p_current_section;
/*!< Current section */
\
dvbpsi_psi_section_t *p_sections;
/*!< List of received PSI sections */
\
...
...