mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-30 13:41:48 +00:00
Code Issues 1 Projects Releases Wiki Activity

tests/examples/seek/seek.c: Don't go to READY on EOS as this avoids testing of seeking and restarting after EOS, use ...

Browse source 
Original commit message from CVS:
* tests/examples/seek/seek.c: (msg_segment_done), (main):
Don't go to READY on EOS as this avoids testing of seeking and
restarting after EOS, use the stop button when you want to READY.
Don't try to do a flushing seek in segment-done, it does not make
sense to use this for gapless playback and is not needed.
This commit is contained in:
Wim Taymans 2007-12-14 19:06:24 +00:00
parent 671d766d8a
commit d8e7a32aed
2 changed files with 14 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2007-12-14 Wim Taymans <wim.taymans@collabora.co.uk>
* tests/examples/seek/seek.c: (msg_segment_done), (main):
Don't go to READY on EOS as this avoids testing of seeking and
restarting after EOS, use the stop button when you want to READY.
Don't try to do a flushing seek in segment-done, it does not make
sense to use this for gapless playback and is not needed.
2007-12-14 Wim Taymans <wim.taymans@collabora.co.uk> 2007-12-14 Wim Taymans <wim.taymans@collabora.co.uk>
* gst/playback/gstqueue2.c: (gst_queue_init), (gst_queue_finalize), * gst/playback/gstqueue2.c: (gst_queue_init), (gst_queue_finalize),

43
tests/examples/seek/seek.c
View file

@ -1473,23 +1473,6 @@ message_received (GstBus * bus, GstMessage * message, GstPipeline * pipeline)
} }
} }
static void
msg_eos (GstBus * bus, GstMessage * message, GstPipeline * pipeline)
{
GstStateChangeReturn ret;
GST_DEBUG ("position is %" GST_TIME_FORMAT, GST_TIME_ARGS (position));
g_print ("READY pipeline\n");
ret = gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_READY);
if (ret == GST_STATE_CHANGE_FAILURE)
g_print ("READY failed\n");
set_scale (0.0);
state = GST_STATE_READY;
}
static void static void
msg_state_changed (GstBus * bus, GstMessage * message, GstPipeline * pipeline) msg_state_changed (GstBus * bus, GstMessage * message, GstPipeline * pipeline)
{ {
@ -1521,15 +1504,14 @@ msg_segment_done (GstBus * bus, GstMessage * message, GstPipeline * pipeline)
GstFormat format; GstFormat format;
GST_DEBUG ("position is %" GST_TIME_FORMAT, GST_TIME_ARGS (position)); GST_DEBUG ("position is %" GST_TIME_FORMAT, GST_TIME_ARGS (position));
format = GST_FORMAT_TIME;
gst_message_parse_segment_done (message, &format, &position); gst_message_parse_segment_done (message, &format, &position);
GST_DEBUG ("end of segment at %" GST_TIME_FORMAT, GST_TIME_ARGS (position)); GST_DEBUG ("end of segment at %" GST_TIME_FORMAT, GST_TIME_ARGS (position));
set_update_scale (FALSE); flags = 0;
/* in the segment-done callback we never flush as this would not make sense
flags = GST_SEEK_FLAG_SEGMENT; * for seamless playback. */
if (flush_seek) if (loop_seek)
flags |= GST_SEEK_FLAG_FLUSH; flags = GST_SEEK_FLAG_SEGMENT;
s_event = gst_event_new_seek (rate, s_event = gst_event_new_seek (rate,
GST_FORMAT_TIME, flags, GST_SEEK_TYPE_SET, G_GINT64_CONSTANT (0), GST_FORMAT_TIME, flags, GST_SEEK_TYPE_SET, G_GINT64_CONSTANT (0),
@ -1539,16 +1521,8 @@ msg_segment_done (GstBus * bus, GstMessage * message, GstPipeline * pipeline)
rate, GST_TIME_ARGS (duration)); rate, GST_TIME_ARGS (duration));
res = send_event (s_event); res = send_event (s_event);
if (res) { if (!res)
if (flush_seek) {
gst_pipeline_set_new_stream_time (GST_PIPELINE (pipeline), 0);
gst_element_get_state (GST_ELEMENT (pipeline), NULL, NULL, SEEK_TIMEOUT);
}
} else
g_print ("segment seek failed\n"); g_print ("segment seek failed\n");
position = 0;
set_update_scale (TRUE);
} }
static void static void
@ -1738,7 +1712,6 @@ main (int argc, char **argv)
bus = gst_pipeline_get_bus (GST_PIPELINE (pipeline)); bus = gst_pipeline_get_bus (GST_PIPELINE (pipeline));
gst_bus_add_signal_watch_full (bus, G_PRIORITY_HIGH); gst_bus_add_signal_watch_full (bus, G_PRIORITY_HIGH);
g_signal_connect (bus, "message::eos", (GCallback) msg_eos, pipeline);
g_signal_connect (bus, "message::state-changed", g_signal_connect (bus, "message::state-changed",
(GCallback) msg_state_changed, pipeline); (GCallback) msg_state_changed, pipeline);
g_signal_connect (bus, "message::segment-done", g_signal_connect (bus, "message::segment-done",
@ -1758,10 +1731,6 @@ main (int argc, char **argv)
pipeline); pipeline);
g_signal_connect (bus, "message::segment-done", g_signal_connect (bus, "message::segment-done",
(GCallback) message_received, pipeline); (GCallback) message_received, pipeline);
/*g_signal_connect (bus, "message::state-changed",
(GCallback) message_received, pipeline);
*/
} }
gtk_main (); gtk_main ();