mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-24 02:31:03 +00:00
gst-libs/gst/play/gstplay.c: seek on video sink element first.
Original commit message from CVS: 2004-01-28 Julien MOUTTE <julien@moutte.net> * 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.
This commit is contained in:
parent
a6b79b4f09
commit
f606249297
5 changed files with 15 additions and 7 deletions
|
@ -1,3 +1,10 @@
|
||||||
|
2004-01-28 Julien MOUTTE <julien@moutte.net>
|
||||||
|
|
||||||
|
* 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 <rbultje@ronald.bitfreak.net>
|
2004-01-28 Ronald Bultje <rbultje@ronald.bitfreak.net>
|
||||||
|
|
||||||
* sys/v4l/gstv4lsrc.c: (gst_v4lsrc_class_init), (gst_v4lsrc_init),
|
* sys/v4l/gstv4lsrc.c: (gst_v4lsrc_class_init), (gst_v4lsrc_init),
|
||||||
|
|
2
common
2
common
|
@ -1 +1 @@
|
||||||
Subproject commit 0bcde342015b96d9a6ba3b9d9102e2a543399d96
|
Subproject commit 5da247bb6f217c5c32e5ebab0d3a2014dfa452c3
|
|
@ -641,11 +641,11 @@ gst_play_seek_to_time (GstPlay * play, gint64 time_nanos)
|
||||||
GST_IS_ELEMENT (video_sink_element)) {
|
GST_IS_ELEMENT (video_sink_element)) {
|
||||||
gboolean s = FALSE;
|
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,
|
GST_SEEK_METHOD_SET | GST_SEEK_FLAG_FLUSH,
|
||||||
time_nanos);
|
time_nanos);
|
||||||
if (!s) {
|
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,
|
GST_SEEK_METHOD_SET | GST_SEEK_FLAG_FLUSH,
|
||||||
time_nanos);
|
time_nanos);
|
||||||
}
|
}
|
||||||
|
|
|
@ -641,11 +641,11 @@ gst_play_seek_to_time (GstPlay * play, gint64 time_nanos)
|
||||||
GST_IS_ELEMENT (video_sink_element)) {
|
GST_IS_ELEMENT (video_sink_element)) {
|
||||||
gboolean s = FALSE;
|
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,
|
GST_SEEK_METHOD_SET | GST_SEEK_FLAG_FLUSH,
|
||||||
time_nanos);
|
time_nanos);
|
||||||
if (!s) {
|
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,
|
GST_SEEK_METHOD_SET | GST_SEEK_FLAG_FLUSH,
|
||||||
time_nanos);
|
time_nanos);
|
||||||
}
|
}
|
||||||
|
|
|
@ -321,14 +321,15 @@ gst_videoscale_handle_src_event (GstPad *pad, GstEvent *event)
|
||||||
gst_structure_set (structure, "pointer_y", G_TYPE_DOUBLE,
|
gst_structure_set (structure, "pointer_y", G_TYPE_DOUBLE,
|
||||||
a*videoscale->from_height/videoscale->to_height, NULL);
|
a*videoscale->from_height/videoscale->to_height, NULL);
|
||||||
}
|
}
|
||||||
|
gst_event_unref (event);
|
||||||
new_event = gst_event_new (GST_EVENT_NAVIGATION);
|
new_event = gst_event_new (GST_EVENT_NAVIGATION);
|
||||||
new_event->event_data.structure.structure = structure;
|
new_event->event_data.structure.structure = structure;
|
||||||
gst_pad_send_event (gst_pad_get_peer (videoscale->sinkpad), new_event);
|
return gst_pad_event_default (pad, new_event);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
return gst_pad_event_default (pad, event);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
return TRUE;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
Loading…
Reference in a new issue