virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avformat/mpegts: Detect changes in packet through CRC instead of just the 5bit version

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-05-01 02:14:14 +02:00
parent 4b6be54bed
commit e0153145f6
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/mpegts.c
View File

@ -76,6 +76,8 @@ typedef struct MpegTSSectionFilter {
int section_index; int section_index;
int section_h_size; int section_h_size;
int last_ver; int last_ver;
unsigned crc;
unsigned last_crc;
uint8_t *section_buf; uint8_t *section_buf;
unsigned int check_crc : 1; unsigned int check_crc : 1;
unsigned int end_of_section_reached : 1; unsigned int end_of_section_reached : 1;
@ -419,6 +421,9 @@ static void write_section_data(MpegTSContext *ts, MpegTSFilter *tss1,
if (tss->check_crc) { if (tss->check_crc) {
crc_valid = !av_crc(av_crc_get_table(AV_CRC_32_IEEE), -1, tss->section_buf, tss->section_h_size); crc_valid = !av_crc(av_crc_get_table(AV_CRC_32_IEEE), -1, tss->section_buf, tss->section_h_size);
if (tss->section_h_size >= 4)
tss->crc = AV_RB32(tss->section_buf + tss->section_h_size - 4);
if (crc_valid) { if (crc_valid) {
ts->crc_validity[ tss1->pid ] = 100; ts->crc_validity[ tss1->pid ] = 100;
}else if (ts->crc_validity[ tss1->pid ] > -10) { }else if (ts->crc_validity[ tss1->pid ] > -10) {
@ -585,10 +590,11 @@ typedef struct SectionHeader {
static int skip_identical(const SectionHeader *h, MpegTSSectionFilter *tssf) static int skip_identical(const SectionHeader *h, MpegTSSectionFilter *tssf)
{ {
if (h->version == tssf->last_ver) if (h->version == tssf->last_ver && tssf->last_crc == tssf->crc)
return 1; return 1;
tssf->last_ver = h->version; tssf->last_ver = h->version;
tssf->last_crc = tssf->crc;
return 0; return 0;
} }