diff options
| author | Marton Balint <cus@passwd.hu> | 2018-02-17 19:31:33 +0100 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2018-03-01 22:03:53 +0100 |
| commit | f50741147ccac999a8a3e8a15244cbe525537622 (patch) | |
| tree | 0a9136863d25ad22c4221294caf50553cdd0f15b | |
| parent | e8e1c22f21eecca9269f6bb18c615acaf29d974f (diff) | |
| download | ffmpeg-f50741147ccac999a8a3e8a15244cbe525537622.tar.gz | |
avformat/mxfdec: always use a stream which matches the first index table when seeking
Obviously this is still not perfect, but better then it was. Using the first
index table and mxf->current_edit_unit is still hardcoded in many places, so
this change has hopefully the less chance of breaking anything that works
now.
Signed-off-by: Marton Balint <cus@passwd.hu>
| -rw-r--r-- | libavformat/mxfdec.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 21fd2a876b..e0a4b5bd11 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -3451,6 +3451,20 @@ static int mxf_read_seek(AVFormatContext *s, int stream_index, int64_t sample_ti mxf->current_edit_unit = sample_time; } else { t = &mxf->index_tables[0]; + if (t->index_sid != source_track->index_sid) { + /* If the first index table does not belong to the stream, then find a stream which does belong to the index table */ + for (i = 0; i < s->nb_streams; i++) { + MXFTrack *new_source_track = s->streams[i]->priv_data; + if (new_source_track && new_source_track->index_sid == t->index_sid) { + sample_time = av_rescale_q(sample_time, new_source_track->edit_rate, source_track->edit_rate); + source_track = new_source_track; + st = s->streams[i]; + break; + } + } + if (i == s->nb_streams) + return AVERROR_INVALIDDATA; + } /* clamp above zero, else ff_index_search_timestamp() returns negative * this also means we allow seeking before the start */ |