mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-30 12:49:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtsp-media: Fix handling in default_unsuspend()

Browse source 
Handle the case when streams are not blocked and media
is suspended from PAUSED.

Change-Id: I2f3d222ea7b9b20a0732ea5dc81a32d17ab75040

https://bugzilla.gnome.org/show_bug.cgi?id=790674
This commit is contained in:
Patricia Muscalu 2017-11-23 20:34:03 +01:00 committed by Edward Hervey
parent de930f2e4d
commit bb29d2e2ee
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gst/rtsp-server/rtsp-media.c
View file

@ -3685,11 +3685,16 @@ default_unsuspend (GstRTSPMedia * media)
case GST_RTSP_SUSPEND_MODE_NONE: case GST_RTSP_SUSPEND_MODE_NONE:
if ((priv->transport_mode & GST_RTSP_TRANSPORT_MODE_RECORD)) if ((priv->transport_mode & GST_RTSP_TRANSPORT_MODE_RECORD))
break; break;
gst_rtsp_media_set_status (media, GST_RTSP_MEDIA_STATUS_PREPARING); if (media_streams_blocking (media)) {
/* at this point the media pipeline has been updated and contain all gst_rtsp_media_set_status (media, GST_RTSP_MEDIA_STATUS_PREPARING);
* specific transport parts: all active streams contain at least one sink /* at this point the media pipeline has been updated and contain all
* element and it's safe to unblock any blocked streams that are active */ * specific transport parts: all active streams contain at least one sink
media_unblock_linked (media); * element and it's safe to unblock any blocked streams that are active */
media_unblock_linked (media);
} else {
/* streams are not blocked and media is suspended from PAUSED */
gst_rtsp_media_set_status (media, GST_RTSP_MEDIA_STATUS_PREPARED);
}
g_rec_mutex_unlock (&priv->state_lock); g_rec_mutex_unlock (&priv->state_lock);
if (gst_rtsp_media_get_status (media) == GST_RTSP_MEDIA_STATUS_ERROR) { if (gst_rtsp_media_get_status (media) == GST_RTSP_MEDIA_STATUS_ERROR) {
g_rec_mutex_lock (&priv->state_lock); g_rec_mutex_lock (&priv->state_lock);