RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-31 04:02:06 +00:00
Code Issues Releases Wiki Activity

Matroska seeking fixes

Browse Source 
If a relative seek forward went past the last index position the
Matroska demuxer did not seek to any index position. It did however set
the mkv_d->skip_to_timecode variable which meant that the next
fill_buffer() call would read from the current position until the target
position (probably the end of the file). Fix this by changing the code
to seek to the last index position if that is between the current and
target positions.

Also change backwards relative seek to accept an exactly matching index
position (<= vs <) and reorganize the seeking conditionals to allow
making the above change without turning the code into a complete mess.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22634 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
uau 2007-03-16 14:55:41 +00:00
parent 95089cd853
commit 8b59dd4d83
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libmpdemux/demux_mkv.c
View File

@ -28,6 +28,8 @@
#include "libass/ass.h"
#include "libass/ass_mp.h"
#include "libavutil/common.h"
#ifdef USE_QTX_CODECS
#include "loader/qtx/qtxsdk/components.h"
#endif
@ -3554,18 +3556,26 @@ demux_mkv_seek (demuxer_t *demuxer, float rel_seek_secs, float audio_delay, int
diff = target_timecode + mkv_d->first_tc -
(int64_t) mkv_d->indexes[i].timecode * mkv_d->tc_scale / 1000000.0;
if ((flags & 1 || target_timecode <= mkv_d->last_pts*1000)
&& diff >= 0 && diff < min_diff)
{
min_diff = diff;
index = mkv_d->indexes + i;
}
else if (target_timecode > mkv_d->last_pts*1000
&& diff < 0 && -diff < min_diff)
{
min_diff = -diff;
index = mkv_d->indexes + i;
}
if ((flags & 1 || target_timecode <= mkv_d->last_pts*1000)) {
// Absolute seek or seek backward: find the last index
// position before target time
if (diff < 0 || diff >= min_diff)
continue;
}
else {
// Relative seek forward: find the first index position
// after target time. If no such index exists, find last
// position between current position and target time.
if (diff <= 0) {
if (min_diff <= 0 && diff <= min_diff)
continue;
}
else if (diff >= FFMIN(target_timecode - mkv_d->last_pts,
min_diff))
continue;
}
min_diff = diff;
index = mkv_d->indexes + i;
}
if (index) /* We've found an entry. */