From 1b5d548d52ea8bbc94d1e017c58bfd3777ad905b Mon Sep 17 00:00:00 2001 From: Julien Moutte Date: Wed, 28 Jan 2004 22:14:12 +0000 Subject: gst-libs/gst/play/gstplay.c: seek on video sink element first. Original commit message from CVS: 2004-01-28 Julien MOUTTE * gst-libs/gst/play/gstplay.c: (gst_play_seek_to_time): seek on video sink element first. * gst/videoscale/gstvideoscale.c: (gst_videoscale_handle_src_event): Fixing src event handler. --- ChangeLog | 7 +++++++ common | 2 +- gst-libs/gst/play/gstplay.c | 4 ++-- gst-libs/gst/play/play.c | 4 ++-- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index fbb86c6b..2e6ca9e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-01-28 Julien MOUTTE + + * gst-libs/gst/play/gstplay.c: (gst_play_seek_to_time): seek on video + sink element first. + * gst/videoscale/gstvideoscale.c: + (gst_videoscale_handle_src_event): Fixing src event handler. + 2004-01-28 Ronald Bultje * sys/v4l/gstv4lsrc.c: (gst_v4lsrc_class_init), (gst_v4lsrc_init), diff --git a/common b/common index 0bcde342..5da247bb 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 0bcde342015b96d9a6ba3b9d9102e2a543399d96 +Subproject commit 5da247bb6f217c5c32e5ebab0d3a2014dfa452c3 diff --git a/gst-libs/gst/play/gstplay.c b/gst-libs/gst/play/gstplay.c index d8658e49..f9389ea1 100644 --- a/gst-libs/gst/play/gstplay.c +++ b/gst-libs/gst/play/gstplay.c @@ -641,11 +641,11 @@ gst_play_seek_to_time (GstPlay * play, gint64 time_nanos) GST_IS_ELEMENT (video_sink_element)) { gboolean s = FALSE; - s = gst_element_seek (audio_sink_element, GST_FORMAT_TIME | + s = gst_element_seek (video_sink_element, GST_FORMAT_TIME | GST_SEEK_METHOD_SET | GST_SEEK_FLAG_FLUSH, time_nanos); if (!s) { - s = gst_element_seek (video_sink_element, GST_FORMAT_TIME | + s = gst_element_seek (audio_sink_element, GST_FORMAT_TIME | GST_SEEK_METHOD_SET | GST_SEEK_FLAG_FLUSH, time_nanos); } diff --git a/gst-libs/gst/play/play.c b/gst-libs/gst/play/play.c index d8658e49..f9389ea1 100644 --- a/gst-libs/gst/play/play.c +++ b/gst-libs/gst/play/play.c @@ -641,11 +641,11 @@ gst_play_seek_to_time (GstPlay * play, gint64 time_nanos) GST_IS_ELEMENT (video_sink_element)) { gboolean s = FALSE; - s = gst_element_seek (audio_sink_element, GST_FORMAT_TIME | + s = gst_element_seek (video_sink_element, GST_FORMAT_TIME | GST_SEEK_METHOD_SET | GST_SEEK_FLAG_FLUSH, time_nanos); if (!s) { - s = gst_element_seek (video_sink_element, GST_FORMAT_TIME | + s = gst_element_seek (audio_sink_element, GST_FORMAT_TIME | GST_SEEK_METHOD_SET | GST_SEEK_FLAG_FLUSH, time_nanos); } -- cgit v1.2.1