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

avidemux: restore considering of pull mode KEY_UNIT seeking

Browse source 
... by using the original seek event's flags rather than the corresponding
segment flags, which do not have such counterpart flags (and
do no longer have them covertly sneaking in nowadays).
This commit is contained in:
Mark Nauwelaerts 2016-12-28 13:04:54 +01:00
parent c950672809
commit 002cfd00b7
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gst/avi/gstavidemux.c
View file

@ -98,7 +98,8 @@ static gboolean gst_avi_demux_handle_src_query (GstPad * pad,
static gboolean gst_avi_demux_src_convert (GstPad * pad, GstFormat src_format, static gboolean gst_avi_demux_src_convert (GstPad * pad, GstFormat src_format,
gint64 src_value, GstFormat * dest_format, gint64 * dest_value); gint64 src_value, GstFormat * dest_format, gint64 * dest_value);
static gboolean gst_avi_demux_do_seek (GstAviDemux * avi, GstSegment * segment); static gboolean gst_avi_demux_do_seek (GstAviDemux * avi, GstSegment * segment,
GstSeekFlags flags);
static gboolean gst_avi_demux_handle_seek (GstAviDemux * avi, GstPad * pad, static gboolean gst_avi_demux_handle_seek (GstAviDemux * avi, GstPad * pad,
GstEvent * event); GstEvent * event);
static gboolean gst_avi_demux_handle_seek_push (GstAviDemux * avi, GstPad * pad, static gboolean gst_avi_demux_handle_seek_push (GstAviDemux * avi, GstPad * pad,
@ -4307,7 +4308,7 @@ skipping_done:
gst_avi_demux_expose_streams (avi, FALSE); gst_avi_demux_expose_streams (avi, FALSE);
/* do initial seek to the default segment values */ /* do initial seek to the default segment values */
gst_avi_demux_do_seek (avi, &avi->segment); gst_avi_demux_do_seek (avi, &avi->segment, 0);
/* create initial NEWSEGMENT event */ /* create initial NEWSEGMENT event */
if (avi->seg_event) if (avi->seg_event)
@ -4439,7 +4440,8 @@ gst_avi_demux_move_stream (GstAviDemux * avi, GstAviStream * stream,
* Do the actual seeking. * Do the actual seeking.
*/ */
static gboolean static gboolean
gst_avi_demux_do_seek (GstAviDemux * avi, GstSegment * segment) gst_avi_demux_do_seek (GstAviDemux * avi, GstSegment * segment,
GstSeekFlags flags)
{ {
GstClockTime seek_time; GstClockTime seek_time;
gboolean keyframe, before, after; gboolean keyframe, before, after;
@ -4447,9 +4449,9 @@ gst_avi_demux_do_seek (GstAviDemux * avi, GstSegment * segment)
GstAviStream *stream; GstAviStream *stream;
seek_time = segment->position; seek_time = segment->position;
keyframe = ! !(segment->flags & GST_SEEK_FLAG_KEY_UNIT); keyframe = ! !(flags & GST_SEEK_FLAG_KEY_UNIT);
before = ! !(segment->flags & GST_SEEK_FLAG_SNAP_BEFORE); before = ! !(flags & GST_SEEK_FLAG_SNAP_BEFORE);
after = ! !(segment->flags & GST_SEEK_FLAG_SNAP_AFTER); after = ! !(flags & GST_SEEK_FLAG_SNAP_AFTER);
GST_DEBUG_OBJECT (avi, "seek to: %" GST_TIME_FORMAT GST_DEBUG_OBJECT (avi, "seek to: %" GST_TIME_FORMAT
" keyframe seeking:%d, %s", GST_TIME_ARGS (seek_time), keyframe, " keyframe seeking:%d, %s", GST_TIME_ARGS (seek_time), keyframe,
@ -4614,7 +4616,7 @@ gst_avi_demux_handle_seek (GstAviDemux * avi, GstPad * pad, GstEvent * event)
} }
/* do the seek, seeksegment.position contains the new position, this /* do the seek, seeksegment.position contains the new position, this
* actually never fails. */ * actually never fails. */
gst_avi_demux_do_seek (avi, &seeksegment); gst_avi_demux_do_seek (avi, &seeksegment, flags);
if (flush) { if (flush) {
GstEvent *fevent = gst_event_new_flush_stop (TRUE); GstEvent *fevent = gst_event_new_flush_stop (TRUE);