har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavf/utils: ignore outlier subtitle and data stream end times as well

Browse Source
This commit is contained in:
Rodger Combs 2016-10-05 06:37:57 -05:00
parent 54220ce731
commit 4c9c4fe8b2
No known key found for this signature in database
GPG Key ID: E3E54DCDCD3CB843
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/utils.c
View File

@ -2524,7 +2524,7 @@ static int has_duration(AVFormatContext *ic)
*/ */
static void update_stream_timings(AVFormatContext *ic) static void update_stream_timings(AVFormatContext *ic)
{ {
int64_t start_time, start_time1, start_time_text, end_time, end_time1; int64_t start_time, start_time1, start_time_text, end_time, end_time1, end_time_text;
int64_t duration, duration1, filesize; int64_t duration, duration1, filesize;
int i; int i;
AVStream *st; AVStream *st;
@ -2533,6 +2533,7 @@ static void update_stream_timings(AVFormatContext *ic)
start_time = INT64_MAX; start_time = INT64_MAX;
start_time_text = INT64_MAX; start_time_text = INT64_MAX;
end_time = INT64_MIN; end_time = INT64_MIN;
end_time_text = INT64_MIN;
duration = INT64_MIN; duration = INT64_MIN;
for (i = 0; i < ic->nb_streams; i++) { for (i = 0; i < ic->nb_streams; i++) {
st = ic->streams[i]; st = ic->streams[i];
@ -2549,7 +2550,10 @@ static void update_stream_timings(AVFormatContext *ic)
AV_ROUND_NEAR_INF|AV_ROUND_PASS_MINMAX); AV_ROUND_NEAR_INF|AV_ROUND_PASS_MINMAX);
if (end_time1 != AV_NOPTS_VALUE && (end_time1 > 0 ? start_time1 <= INT64_MAX - end_time1 : start_time1 >= INT64_MIN - end_time1)) { if (end_time1 != AV_NOPTS_VALUE && (end_time1 > 0 ? start_time1 <= INT64_MAX - end_time1 : start_time1 >= INT64_MIN - end_time1)) {
end_time1 += start_time1; end_time1 += start_time1;
end_time = FFMAX(end_time, end_time1); if (st->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE || st->codecpar->codec_type == AVMEDIA_TYPE_DATA)
end_time_text = FFMAX(end_time_text, end_time1);
else
end_time = FFMAX(end_time, end_time1);
} }
for (p = NULL; (p = av_find_program_from_stream(ic, p, i)); ) { for (p = NULL; (p = av_find_program_from_stream(ic, p, i)); ) {
if (p->start_time == AV_NOPTS_VALUE || p->start_time > start_time1) if (p->start_time == AV_NOPTS_VALUE || p->start_time > start_time1)
@ -2569,6 +2573,12 @@ static void update_stream_timings(AVFormatContext *ic)
else if (start_time > start_time_text) else if (start_time > start_time_text)
av_log(ic, AV_LOG_VERBOSE, "Ignoring outlier non primary stream starttime %f\n", start_time_text / (float)AV_TIME_BASE); av_log(ic, AV_LOG_VERBOSE, "Ignoring outlier non primary stream starttime %f\n", start_time_text / (float)AV_TIME_BASE);
if (end_time == INT64_MIN || (end_time < end_time_text && end_time_text - end_time < AV_TIME_BASE)) {
end_time = end_time_text;
} else if (end_time < end_time_text) {
av_log(ic, AV_LOG_VERBOSE, "Ignoring outlier non primary stream endtime %f\n", end_time_text / (float)AV_TIME_BASE);
}
if (start_time != INT64_MAX) { if (start_time != INT64_MAX) {
ic->start_time = start_time; ic->start_time = start_time;
if (end_time != INT64_MIN) { if (end_time != INT64_MIN) {