projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ec0718d
)
media: wait for buffering to complete
author
Wim Taymans
<wim.taymans@collabora.co.uk>
Tue, 9 Apr 2013 18:39:58 +0000
(20:39 +0200)
committer
Wim Taymans
<wim.taymans@collabora.co.uk>
Tue, 9 Apr 2013 18:39:58 +0000
(20:39 +0200)
Wait for buffering to complete before changing the state to the target state.
gst/rtsp-server/rtsp-media.c
patch
|
blob
|
history
diff --git
a/gst/rtsp-server/rtsp-media.c
b/gst/rtsp-server/rtsp-media.c
index
551d1a1
..
1cce85d
100644
(file)
--- a/
gst/rtsp-server/rtsp-media.c
+++ b/
gst/rtsp-server/rtsp-media.c
@@
-1725,7
+1725,13
@@
gst_rtsp_media_set_state (GstRTSPMedia * media, GstState state,
GST_INFO ("state %s media %p", gst_element_state_get_name (state),
media);
priv->target_state = state;
- gst_element_set_state (priv->pipeline, state);
+ /* when we are buffering, don't update the state yet, this will be done
+ * when buffering finishes */
+ if (priv->buffering) {
+ GST_INFO ("Buffering busy, delay state change");
+ } else {
+ gst_element_set_state (priv->pipeline, state);
+ }
}
}
g_signal_emit (media, gst_rtsp_media_signals[SIGNAL_NEW_STATE], 0, state,