mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-24 02:31:03 +00:00
Code Issues 1 Projects Releases Wiki Activity

avidemux: handle unseekable streams

Browse source 
Handle streams that we can't seek in and ignore them in the
seek logic.
This commit is contained in:
Wim Taymans 2013-09-04 15:50:42 +02:00
parent 6f0e8a8b87
commit 5d2ff288b3
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst/avi/gstavidemux.c
View file

@ -2596,10 +2596,11 @@ gst_avi_demux_index_for_time (GstAviDemux * avi,
} else { } else {
index = avi_stream_convert_time_to_frames_unchecked (stream, time); index = avi_stream_convert_time_to_frames_unchecked (stream, time);
} }
} else { } else if (stream->strh->type == GST_RIFF_FCC_auds) {
/* constant rate stream */ /* constant rate stream */
total = avi_stream_convert_time_to_bytes_unchecked (stream, time); total = avi_stream_convert_time_to_bytes_unchecked (stream, time);
} } else
return -1;
if (index == -1) { if (index == -1) {
GstAviIndexEntry *entry; GstAviIndexEntry *entry;
@ -4125,6 +4126,8 @@ gst_avi_demux_do_seek (GstAviDemux * avi, GstSegment * segment)
/* get the entry index for the requested position */ /* get the entry index for the requested position */
index = gst_avi_demux_index_for_time (avi, stream, seek_time); index = gst_avi_demux_index_for_time (avi, stream, seek_time);
GST_DEBUG_OBJECT (avi, "Got entry %u", index); GST_DEBUG_OBJECT (avi, "Got entry %u", index);
if (index == -1)
return FALSE;
/* check if we are already on a keyframe */ /* check if we are already on a keyframe */
if (!ENTRY_IS_KEYFRAME (&stream->index[index])) { if (!ENTRY_IS_KEYFRAME (&stream->index[index])) {
@ -4176,6 +4179,8 @@ gst_avi_demux_do_seek (GstAviDemux * avi, GstSegment * segment)
/* get the entry index for the requested position */ /* get the entry index for the requested position */
index = gst_avi_demux_index_for_time (avi, ostream, seek_time); index = gst_avi_demux_index_for_time (avi, ostream, seek_time);
if (index == -1)
continue;
/* move to previous keyframe */ /* move to previous keyframe */
if (!ENTRY_IS_KEYFRAME (&ostream->index[index])) if (!ENTRY_IS_KEYFRAME (&ostream->index[index]))
@ -4403,6 +4408,8 @@ avi_demux_handle_seek_push (GstAviDemux * avi, GstPad * pad, GstEvent * event)
index = gst_avi_demux_index_for_time (avi, stream, cur); index = gst_avi_demux_index_for_time (avi, stream, cur);
GST_DEBUG_OBJECT (avi, "str %u: Found entry %u for %" GST_TIME_FORMAT, GST_DEBUG_OBJECT (avi, "str %u: Found entry %u for %" GST_TIME_FORMAT,
str_num, index, GST_TIME_ARGS (cur)); str_num, index, GST_TIME_ARGS (cur));
if (index == -1)
return -1;
/* check if we are already on a keyframe */ /* check if we are already on a keyframe */
if (!ENTRY_IS_KEYFRAME (&stream->index[index])) { if (!ENTRY_IS_KEYFRAME (&stream->index[index])) {
@ -4453,6 +4460,8 @@ avi_demux_handle_seek_push (GstAviDemux * avi, GstPad * pad, GstEvent * event)
idx = gst_avi_demux_index_for_time (avi, str, cur); idx = gst_avi_demux_index_for_time (avi, str, cur);
GST_DEBUG_OBJECT (avi, "str %u: Found entry %u for %" GST_TIME_FORMAT, n, GST_DEBUG_OBJECT (avi, "str %u: Found entry %u for %" GST_TIME_FORMAT, n,
idx, GST_TIME_ARGS (cur)); idx, GST_TIME_ARGS (cur));
if (idx == -1)
continue;
/* check if we are already on a keyframe */ /* check if we are already on a keyframe */
if (!ENTRY_IS_KEYFRAME (&str->index[idx])) { if (!ENTRY_IS_KEYFRAME (&str->index[idx])) {