media: check state

Make sure we are in the right state when collecting the position and duration.
Only make ourselves PREPARED when we were previously PREPARING.

diff --git a/gst/rtsp-server/rtsp-media.c b/gst/rtsp-server/rtsp-media.c
index 26897dc..f09f326 100644 (file)
--- a/gst/rtsp-server/rtsp-media.c
+++ b/gst/rtsp-server/rtsp-media.c
@@ -309,6 +309,10 @@ collect_media_stats (GstRTSPMedia * media)
   GstRTSPMediaPrivate *priv = media->priv;
   gint64 position, duration;
 
+  if (priv->status != GST_RTSP_MEDIA_STATUS_PREPARED &&
+      priv->status != GST_RTSP_MEDIA_STATUS_PREPARING)
+    return;
+
   priv->range.unit = GST_RTSP_RANGE_NPT;
 
   GST_INFO ("collect media stats");
@@ -1092,9 +1096,7 @@ gst_rtsp_media_set_status (GstRTSPMedia * media, GstRTSPMediaStatus status)
   GstRTSPMediaPrivate *priv = media->priv;
 
   g_mutex_lock (&priv->lock);
-  /* never overwrite the error status */
-  if (priv->status != GST_RTSP_MEDIA_STATUS_ERROR)
-    priv->status = status;
+  priv->status = status;
   GST_DEBUG ("setting new status to %d", status);
   g_cond_broadcast (&priv->cond);
   g_mutex_unlock (&priv->lock);
@@ -1222,7 +1224,8 @@ default_handle_message (GstRTSPMedia * media, GstMessage * message)
         GST_INFO ("%p: got ASYNC_DONE", media);
         collect_media_stats (media);
 
-        gst_rtsp_media_set_status (media, GST_RTSP_MEDIA_STATUS_PREPARED);
+        if (priv->status == GST_RTSP_MEDIA_STATUS_PREPARING)
+          gst_rtsp_media_set_status (media, GST_RTSP_MEDIA_STATUS_PREPARED);
       } else {
         GST_INFO ("%p: ignoring ASYNC_DONE", media);
       }