mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-22 16:26:39 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/rtsp/gstrtpdec.c: Make state change to PAUSED NO_PREROLL because that's what it will be in the future and rtspsrc...

Browse source 
Original commit message from CVS:
* gst/rtsp/gstrtpdec.c: (gst_rtpdec_change_state):
Make state change to PAUSED NO_PREROLL because that's what it will be in
the future and rtspsrc relies on it.
* gst/rtsp/gstrtspsrc.c: (gst_rtspsrc_stream_configure_transport),
(gst_rtspsrc_change_state):
Don't error out when we don't get an error from the state change
function.
This commit is contained in:
Wim Taymans 2007-03-01 09:29:34 +00:00
parent 16490dc0cf
commit dc212cdb3d
3 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2007-03-01 Wim Taymans <wim@fluendo.com>
* gst/rtsp/gstrtpdec.c: (gst_rtpdec_change_state):
Make state change to PAUSED NO_PREROLL because that's what it will be in
the future and rtspsrc relies on it.
* gst/rtsp/gstrtspsrc.c: (gst_rtspsrc_stream_configure_transport),
(gst_rtspsrc_change_state):
Don't error out when we don't get an error from the state change
function.
2007-03-01 Sebastian Dröge <slomo@circular-chaos.org> 2007-03-01 Sebastian Dröge <slomo@circular-chaos.org>
* ext/hal/gsthalaudiosink.c: (do_toggle_element): * ext/hal/gsthalaudiosink.c: (do_toggle_element):

6
gst/rtsp/gstrtpdec.c
View file

@ -313,8 +313,6 @@ gst_rtpdec_change_state (GstElement * element, GstStateChange transition)
rtpdec = GST_RTPDEC (element); rtpdec = GST_RTPDEC (element);
switch (transition) { switch (transition) {
case GST_STATE_CHANGE_PAUSED_TO_READY:
break;
default: default:
break; break;
} }
@ -322,7 +320,9 @@ gst_rtpdec_change_state (GstElement * element, GstStateChange transition)
ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
switch (transition) { switch (transition) {
case GST_STATE_CHANGE_PAUSED_TO_READY: case GST_STATE_CHANGE_READY_TO_PAUSED:
case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
ret = GST_STATE_CHANGE_NO_PREROLL;
break; break;
default: default:
break; break;

3
gst/rtsp/gstrtspsrc.c
View file

@ -937,7 +937,7 @@ gst_rtspsrc_stream_configure_transport (GstRTSPStream * stream,
gst_bin_add (GST_BIN_CAST (src), stream->sess); gst_bin_add (GST_BIN_CAST (src), stream->sess);
ret = gst_element_set_state (stream->sess, GST_STATE_PAUSED); ret = gst_element_set_state (stream->sess, GST_STATE_PAUSED);
if (ret != GST_STATE_CHANGE_SUCCESS) if (ret == GST_STATE_CHANGE_FAILURE)
goto start_session_failure; goto start_session_failure;
/* we stream directly to the manager, FIXME, pad names should not be /* we stream directly to the manager, FIXME, pad names should not be
@ -2660,6 +2660,7 @@ gst_rtspsrc_change_state (GstElement * element, GstStateChange transition)
break; break;
case GST_STATE_CHANGE_PLAYING_TO_PAUSED: case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
gst_rtspsrc_pause (rtspsrc); gst_rtspsrc_pause (rtspsrc);
ret = GST_STATE_CHANGE_NO_PREROLL;
break; break;
case GST_STATE_CHANGE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
gst_rtspsrc_close (rtspsrc); gst_rtspsrc_close (rtspsrc);