RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-27 17:21:05 +00:00
Code Issues Projects Releases Wiki Activity

avformat/mxfdec: always use a stream which matches the first index table when seeking

Browse Source 
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>
This commit is contained in:
Marton Balint 2018-02-17 19:31:33 +01:00
parent e8e1c22f21
commit f50741147c
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/mxfdec.c
View File

@ -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 */