generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mpegts: fix Continuity Counter error detection

Browse Source 
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>
(cherry picked from commit 8923cfa328e8eb565aebcfe8672b276fd1c19bf7)

Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
This commit is contained in:
Jindrich Makovicka 2011-06-30 09:03:15 +00:00 committed by Reinhard Tartler
parent 81d5ceff04
commit 002e6d185c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/mpegts.c
View File

@ -1140,7 +1140,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;
@ -1158,7 +1158,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 */