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

avformat/mpegts: Improve probe heuristic by considering the overall frequency of 0x47 headers

Browse Source 
Fixes Ticket3939

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 296cd9c432)
This commit is contained in:
Michael Niedermayer
2014-09-13 22:08:21 +02:00
committed by Carl Eugen Hoyos
parent 10464ca0eb
commit 63ed7e09dd
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/mpegts.c
View File

@@ -504,9 +504,9 @@ static void mpegts_close_filter(MpegTSContext *ts, MpegTSFilter *filter)
static int analyze(const uint8_t *buf, int size, int packet_size, int *index) static int analyze(const uint8_t *buf, int size, int packet_size, int *index)
{ {
int stat[TS_MAX_PACKET_SIZE]; int stat[TS_MAX_PACKET_SIZE];
int stat_all = 0;
int i; int i;
int best_score = 0; int best_score = 0;
int best_score2 = 0;
memset(stat, 0, packet_size * sizeof(*stat)); memset(stat, 0, packet_size * sizeof(*stat));
@@ -514,17 +514,16 @@ static int analyze(const uint8_t *buf, int size, int packet_size, int *index)
if (buf[i] == 0x47 && !(buf[i + 1] & 0x80) && buf[i + 3] != 0x47) { if (buf[i] == 0x47 && !(buf[i + 1] & 0x80) && buf[i + 3] != 0x47) {
int x = i % packet_size; int x = i % packet_size;
stat[x]++; stat[x]++;
stat_all++;
if (stat[x] > best_score) { if (stat[x] > best_score) {
best_score = stat[x]; best_score = stat[x];
if (index) if (index)
*index = x; *index = x;
} else if (stat[x] > best_score2) {
best_score2 = stat[x];
} }
} }
} }
return best_score - best_score2; return best_score - FFMAX(stat_all - 10*best_score, 0)/10;
} }
/* autodetect fec presence. Must have at least 1024 bytes */ /* autodetect fec presence. Must have at least 1024 bytes */