RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-27 09:43:34 +00:00
Code Issues Projects Releases Wiki Activity

avformat/concatdec: don't call open_file when seek position within a file

Browse Source
This commit is contained in:
raymondzheng1412@gmail.com 2016-09-23 11:48:40 +08:00 committed by Nicolas George
parent 13dd5edb88
commit 2366efce3c
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libavformat/concatdec.c
View File

@ -689,7 +689,7 @@ static int try_seek(AVFormatContext *avf, int stream,
} }
static int real_seek(AVFormatContext *avf, int stream, static int real_seek(AVFormatContext *avf, int stream,
int64_t min_ts, int64_t ts, int64_t max_ts, int flags) int64_t min_ts, int64_t ts, int64_t max_ts, int flags, AVFormatContext *cur_avf)
{ {
ConcatContext *cat = avf->priv_data; ConcatContext *cat = avf->priv_data;
int ret, left, right; int ret, left, right;
@ -711,13 +711,19 @@ static int real_seek(AVFormatContext *avf, int stream,
left = mid; left = mid;
} }
if ((ret = open_file(avf, left)) < 0) if (cat->cur_file != &cat->files[left]) {
return ret; if ((ret = open_file(avf, left)) < 0)
return ret;
} else {
cat->avf = cur_avf;
}
ret = try_seek(avf, stream, min_ts, ts, max_ts, flags); ret = try_seek(avf, stream, min_ts, ts, max_ts, flags);
if (ret < 0 && if (ret < 0 &&
left < cat->nb_files - 1 && left < cat->nb_files - 1 &&
cat->files[left + 1].start_time < max_ts) { cat->files[left + 1].start_time < max_ts) {
if (cat->cur_file == &cat->files[left])
cat->avf = NULL;
if ((ret = open_file(avf, left + 1)) < 0) if ((ret = open_file(avf, left + 1)) < 0)
return ret; return ret;
ret = try_seek(avf, stream, min_ts, ts, max_ts, flags); ret = try_seek(avf, stream, min_ts, ts, max_ts, flags);
@ -738,13 +744,17 @@ static int concat_seek(AVFormatContext *avf, int stream,
if (flags & (AVSEEK_FLAG_BYTE | AVSEEK_FLAG_FRAME)) if (flags & (AVSEEK_FLAG_BYTE | AVSEEK_FLAG_FRAME))
return AVERROR(ENOSYS); return AVERROR(ENOSYS);
cat->avf = NULL; cat->avf = NULL;
if ((ret = real_seek(avf, stream, min_ts, ts, max_ts, flags)) < 0) { if ((ret = real_seek(avf, stream, min_ts, ts, max_ts, flags, cur_avf_saved)) < 0) {
if (cat->avf) if (cat->cur_file != cur_file_saved) {
avformat_close_input(&cat->avf); if (cat->avf)
avformat_close_input(&cat->avf);
}
cat->avf = cur_avf_saved; cat->avf = cur_avf_saved;
cat->cur_file = cur_file_saved; cat->cur_file = cur_file_saved;
} else { } else {
avformat_close_input(&cur_avf_saved); if (cat->cur_file != cur_file_saved) {
avformat_close_input(&cur_avf_saved);
}
cat->eof = 0; cat->eof = 0;
} }
return ret; return ret;