History

avformat/avidec: Check required demuxing buffer sizes in guess_ni_flag()

Fixes Ticket3421

Michael Niedermayer committed 12 years ago

Commit 5d757301 parent 01000061 file · +14 −3Browse files

Unified · Split

libavformat/avidec.c+14−3
@@ -1542,6 +1542,7 @@ static int guess_ni_flag(AVFormatContext *s) · 1541 unmodified lines
15421542 return 0;
15431543 for (min_pos=pos=0; min_pos!=INT64_MAX; pos= min_pos+1LU) {
15441544 int64_t max_dts = INT64_MIN/2, min_dts= INT64_MAX/2;
1545+ int64_t max_buffer = 0;
15451546 min_pos = INT64_MAX;
15461547
15471548 for (i=0; i<s->nb_streams; i++) {
@@ -1554,10 +1555,20 @@ static int guess_ni_flag(AVFormatContext *s) · 6 unmodified lines
15541555 min_dts = FFMIN(min_dts, av_rescale_q(st->index_entries[idx[i]].timestamp/FFMAX(ast->sample_size, 1), st->time_base, AV_TIME_BASE_Q));
15551556 min_pos = FFMIN(min_pos, st->index_entries[idx[i]].pos);
15561557 }
1557− if (idx[i])
1558− max_dts = FFMAX(max_dts, av_rescale_q(st->index_entries[idx[i]-1].timestamp/FFMAX(ast->sample_size, 1), st->time_base, AV_TIME_BASE_Q));
15591558 }
1560− if (max_dts - min_dts > 2*AV_TIME_BASE) {
1559+ for (i=0; i<s->nb_streams; i++) {
1560+ AVStream *st = s->streams[i];
1561+ AVIStream *ast = st->priv_data;
1562+
1563+ if (idx[i] && min_dts != INT64_MAX/2) {
1564+ int64_t dts = av_rescale_q(st->index_entries[idx[i]-1].timestamp/FFMAX(ast->sample_size, 1), st->time_base, AV_TIME_BASE_Q);
1565+ max_dts = FFMAX(max_dts, dts);
1566+ max_buffer = FFMAX(max_buffer, av_rescale(dts - min_dts, st->codec->bit_rate, AV_TIME_BASE));
1567+ }
1568+ }
1569+ if (max_dts - min_dts > 2*AV_TIME_BASE ||
1570+ max_buffer > 1024 * 1024 * 8 *8
1571+ ) {
15611572 av_free(idx);
15621573 return 1;
15631574 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t