mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-02 21:48:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/matroska/matroska-demux.c: When seeking, seek to closest index entry at or before the requested seek position, no...

Browse source 
Original commit message from CVS:
Reviewed by: Tim-Philipp Müller  <tim at centricular dot net>
* gst/matroska/matroska-demux.c: (gst_matroskademux_do_index_seek):
When seeking, seek to closest index entry at or before the requested
seek position, not just the closest one (#321001).
This commit is contained in:
Tim-Philipp Müller 2005-11-15 19:41:21 +00:00
parent 12aed9b96e
commit 7f63b50f3f
2 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2005-11-15 Vincent Torri <torri at iecn dot u-nancy dot fr>
Reviewed by: Tim-Philipp Müller <tim at centricular dot net>
* gst/matroska/matroska-demux.c: (gst_matroskademux_do_index_seek):
When seeking, seek to closest index entry at or before the requested
seek position, not just the closest one (#321001).
2005-11-15 Tim-Philipp Müller <tim at centricular dot net> 2005-11-15 Tim-Philipp Müller <tim at centricular dot net>
* gst/avi/gstavidemux.c: (swap_line), (gst_avi_demux_invert), * gst/avi/gstavidemux.c: (swap_line), (gst_avi_demux_invert),

27
gst/matroska/matroska-demux.c
View file

@ -992,27 +992,22 @@ gst_matroska_demux_handle_src_query (GstPad * pad, GstQuery * query)
static GstMatroskaIndex * static GstMatroskaIndex *
gst_matroskademux_do_index_seek (GstMatroskaDemux * demux, guint64 seek_pos) gst_matroskademux_do_index_seek (GstMatroskaDemux * demux, guint64 seek_pos)
{ {
guint entry = (guint) - 1; guint entry = demux->num_indexes - 1;
guint n; guint n = 0;
for (n = 0; n < demux->num_indexes; n++) { if (!demux->num_indexes)
if (entry == (guint) - 1) { return NULL;
while (n < demux->num_indexes - 1) {
if ((demux->index[n].time <= seek_pos) &&
(demux->index[n + 1].time > seek_pos)) {
entry = n; entry = n;
} else { break;
gfloat diff_old = fabs (1. * (demux->index[entry].time - seek_pos)),
diff_new = fabs (1. * (demux->index[n].time - seek_pos));
if (diff_new < diff_old) {
entry = n;
}
} }
n++;
} }
if (entry != (guint) - 1) { return &demux->index[entry];
return &demux->index[entry];
}
return NULL;
} }
/* takes ownership of the passed event! */ /* takes ownership of the passed event! */