mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-09-08 13:18:52 +00:00
Code Issues 1 Projects Releases Wiki Activity

matroskademux: Only search for the index entry once

Browse source
This commit is contained in:
Sebastian Dröge 2009-05-11 18:21:13 +02:00
parent 4cb39bc723
commit a1fe742e80
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2031,7 +2031,7 @@ static gboolean
gst_matroska_demux_handle_seek_event (GstMatroskaDemux * demux, gst_matroska_demux_handle_seek_event (GstMatroskaDemux * demux,
GstPad * pad, GstEvent * event) GstPad * pad, GstEvent * event)
{ {
GstMatroskaIndex *entry; GstMatroskaIndex *entry = NULL;
GstSeekFlags flags; GstSeekFlags flags;
GstSeekType cur_type, stop_type; GstSeekType cur_type, stop_type;
GstFormat format; GstFormat format;
@ -2063,7 +2063,9 @@ gst_matroska_demux_handle_seek_event (GstMatroskaDemux * demux,
/* check sanity before we start flushing and all that */ /* check sanity before we start flushing and all that */
if (cur_type == GST_SEEK_TYPE_SET) { if (cur_type == GST_SEEK_TYPE_SET) {
GST_OBJECT_LOCK (demux); GST_OBJECT_LOCK (demux);
if (!gst_matroskademux_do_index_seek (demux, track, cur, -1, FALSE)) { if ((entry =
gst_matroskademux_do_index_seek (demux, track, cur, -1,
FALSE)) == NULL) {
GST_DEBUG_OBJECT (demux, "No matching seek entry in index"); GST_DEBUG_OBJECT (demux, "No matching seek entry in index");
GST_OBJECT_UNLOCK (demux); GST_OBJECT_UNLOCK (demux);
return FALSE; return FALSE;
@ -2118,8 +2120,9 @@ gst_matroska_demux_handle_seek_event (GstMatroskaDemux * demux,
"New segment positions: %" GST_TIME_FORMAT "-%" GST_TIME_FORMAT, "New segment positions: %" GST_TIME_FORMAT "-%" GST_TIME_FORMAT,
GST_TIME_ARGS (segment_start), GST_TIME_ARGS (segment_stop)); GST_TIME_ARGS (segment_start), GST_TIME_ARGS (segment_stop));
entry = gst_matroskademux_do_index_seek (demux, track, segment_start, if (entry == NULL)
segment_stop, keyunit); entry = gst_matroskademux_do_index_seek (demux, track, segment_start,
segment_stop, keyunit);
if (!entry) { if (!entry) {
GST_DEBUG_OBJECT (demux, "No matching seek entry in index"); GST_DEBUG_OBJECT (demux, "No matching seek entry in index");