gst: improve error when agent/stream/component is unset
authorIlya Konstantinov <ilya.konstantinov@gmail.com>
Thu, 9 Apr 2015 04:56:48 +0000 (07:56 +0300)
committerOlivier CrĂȘte <olivier.crete@collabora.com>
Mon, 20 Apr 2015 19:36:05 +0000 (15:36 -0400)
https://bugs.freedesktop.org/show_bug.cgi?id=89962

gst/gstnicesink.c
gst/gstnicesrc.c

index 49161c2..abbc039 100644 (file)
@@ -555,6 +555,18 @@ gst_nice_sink_change_state (GstElement * element, GstStateChange transition)
               "Trying to start Nice sink without an agent set");
           return GST_STATE_CHANGE_FAILURE;
         }
+      else if (sink->stream_id == 0)
+          {
+            GST_ERROR_OBJECT (element,
+                "Trying to start Nice sink without a stream set");
+            return GST_STATE_CHANGE_FAILURE;
+          }
+      else if (sink->component_id == 0)
+          {
+            GST_ERROR_OBJECT (element,
+                "Trying to start Nice sink without a component set");
+            return GST_STATE_CHANGE_FAILURE;
+          }
       break;
     case GST_STATE_CHANGE_READY_TO_PAUSED:
     case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
index a113406..f1e17c5 100644 (file)
@@ -403,12 +403,24 @@ gst_nice_src_change_state (GstElement * element, GstStateChange transition)
 
   switch (transition) {
     case GST_STATE_CHANGE_NULL_TO_READY:
-      if (src->agent == NULL || src->stream_id == 0 || src->component_id == 0)
+      if (src->agent == NULL)
         {
           GST_ERROR_OBJECT (element,
               "Trying to start Nice source without an agent set");
           return GST_STATE_CHANGE_FAILURE;
         }
+      else if (src->stream_id == 0)
+          {
+            GST_ERROR_OBJECT (element,
+                "Trying to start Nice source without a stream set");
+            return GST_STATE_CHANGE_FAILURE;
+          }
+      else if (src->component_id == 0)
+          {
+            GST_ERROR_OBJECT (element,
+                "Trying to start Nice source without a component set");
+            return GST_STATE_CHANGE_FAILURE;
+          }
       else
         {
           nice_agent_attach_recv (src->agent, src->stream_id, src->component_id,