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

lavf: move stream==-1 handling from ff_subtitles_queue_seek() to avformat_seek_file()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-01-02 22:55:42 +01:00
parent fc86f86353
commit aa86d2d884
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/subtitles.c
View File

@ -104,16 +104,6 @@ int ff_subtitles_queue_seek(FFDemuxSubtitlesQueue *q, AVFormatContext *s, int st
int i, idx = -1; int i, idx = -1;
int64_t min_ts_diff = INT64_MAX; int64_t min_ts_diff = INT64_MAX;
int64_t ts_selected; int64_t ts_selected;
if (stream_index == -1) {
AVRational time_base = s->streams[0]->time_base;
ts = av_rescale_q(ts, AV_TIME_BASE_Q, time_base);
min_ts = av_rescale_rnd(min_ts, time_base.den,
time_base.num * (int64_t)AV_TIME_BASE,
AV_ROUND_UP);
max_ts = av_rescale_rnd(max_ts, time_base.den,
time_base.num * (int64_t)AV_TIME_BASE,
AV_ROUND_DOWN);
}
/* TODO: q->subs[] is sorted by pts so we could do a binary search */ /* TODO: q->subs[] is sorted by pts so we could do a binary search */
for (i = 0; i < q->nb_subs; i++) { for (i = 0; i < q->nb_subs; i++) {
int64_t pts = q->subs[i].pts; int64_t pts = q->subs[i].pts;

12
libavformat/utils.c
View File

@ -2086,6 +2086,18 @@ int avformat_seek_file(AVFormatContext *s, int stream_index, int64_t min_ts, int
if (s->iformat->read_seek2) { if (s->iformat->read_seek2) {
int ret; int ret;
ff_read_frame_flush(s); ff_read_frame_flush(s);
if (stream_index == -1 && s->nb_streams == 1) {
AVRational time_base = s->streams[0]->time_base;
ts = av_rescale_q(ts, AV_TIME_BASE_Q, time_base);
min_ts = av_rescale_rnd(min_ts, time_base.den,
time_base.num * (int64_t)AV_TIME_BASE,
AV_ROUND_UP);
max_ts = av_rescale_rnd(max_ts, time_base.den,
time_base.num * (int64_t)AV_TIME_BASE,
AV_ROUND_DOWN);
}
ret = s->iformat->read_seek2(s, stream_index, min_ts, ts, max_ts, flags); ret = s->iformat->read_seek2(s, stream_index, min_ts, ts, max_ts, flags);
if (ret >= 0) if (ret >= 0)