mirror of https://git.ffmpeg.org/ffmpeg.git
mpegts: fix Continuity Counter error detection
According to MPEG-TS specs, the continuity_counter shall not be incremented when the adaptation_field_control of the packet equals '00' or '10'. Signed-off-by: Jindrich Makovicka <jindrich.makovicka@nangu.tv> Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
parent
ca9036155d
commit
8923cfa328
|
@ -1248,7 +1248,7 @@ static int handle_packet(MpegTSContext *ts, const uint8_t *packet)
|
||||||
{
|
{
|
||||||
AVFormatContext *s = ts->stream;
|
AVFormatContext *s = ts->stream;
|
||||||
MpegTSFilter *tss;
|
MpegTSFilter *tss;
|
||||||
int len, pid, cc, cc_ok, afc, is_start;
|
int len, pid, cc, expected_cc, cc_ok, afc, is_start;
|
||||||
const uint8_t *p, *p_end;
|
const uint8_t *p, *p_end;
|
||||||
int64_t pos;
|
int64_t pos;
|
||||||
|
|
||||||
|
@ -1266,7 +1266,8 @@ static int handle_packet(MpegTSContext *ts, const uint8_t *packet)
|
||||||
|
|
||||||
/* continuity check (currently not used) */
|
/* continuity check (currently not used) */
|
||||||
cc = (packet[3] & 0xf);
|
cc = (packet[3] & 0xf);
|
||||||
cc_ok = (tss->last_cc < 0) || ((((tss->last_cc + 1) & 0x0f) == cc));
|
expected_cc = (packet[3] & 0x10) ? (tss->last_cc + 1) & 0x0f : tss->last_cc;
|
||||||
|
cc_ok = (tss->last_cc < 0) || (expected_cc == cc);
|
||||||
tss->last_cc = cc;
|
tss->last_cc = cc;
|
||||||
|
|
||||||
/* skip adaptation field */
|
/* skip adaptation field */
|
||||||
|
|
Loading…
Reference in New Issue