From: Thiago Santos <thiago.sousa.santos@collabora.com>
Date: Wed, 16 Jan 2013 18:28:19 +0000 (-0300)
Subject: mssdemux: error out when upstream doesn't implement URI query
X-Git-Tag: 1.19.3~507^2~13714
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0a4c077d2e348d58ca5ed7a0fe0fdb8f83dd4d6d;p=platform%2Fupstream%2Fgstreamer.git

mssdemux: error out when upstream doesn't implement URI query

Error out when upstream doesn't answer to URI query and mssdemux
doesn't know the URI to fetch the fragments from
---

diff --git a/ext/smoothstreaming/gstmssdemux.c b/ext/smoothstreaming/gstmssdemux.c
index 45a353f..df83cfc 100644
--- a/ext/smoothstreaming/gstmssdemux.c
+++ b/ext/smoothstreaming/gstmssdemux.c
@@ -88,7 +88,7 @@ static gboolean gst_mss_demux_src_query (GstPad * pad, GstQuery * query);
 static void gst_mss_demux_download_loop (GstMssDemuxStream * stream);
 static void gst_mss_demux_stream_loop (GstMssDemux * mssdemux);
 
-static void gst_mss_demux_process_manifest (GstMssDemux * mssdemux);
+static gboolean gst_mss_demux_process_manifest (GstMssDemux * mssdemux);
 
 static void
 gst_mss_demux_base_init (gpointer klass)
@@ -396,8 +396,8 @@ gst_mss_demux_event (GstPad * pad, GstEvent * event)
         break;
       }
 
-      gst_mss_demux_process_manifest (mssdemux);
-      gst_mss_demux_start (mssdemux);
+      if (gst_mss_demux_process_manifest (mssdemux))
+        gst_mss_demux_start (mssdemux);
       forward = FALSE;
       break;
     default:
@@ -710,7 +710,7 @@ gst_mss_demux_expose_stream (GstMssDemux * mssdemux, GstMssDemuxStream * stream)
   return TRUE;
 }
 
-static void
+static gboolean
 gst_mss_demux_process_manifest (GstMssDemux * mssdemux)
 {
   GstQuery *query;
@@ -718,8 +718,8 @@ gst_mss_demux_process_manifest (GstMssDemux * mssdemux)
   gboolean ret;
   GSList *iter;
 
-  g_return_if_fail (mssdemux->manifest_buffer != NULL);
-  g_return_if_fail (mssdemux->manifest == NULL);
+  g_return_val_if_fail (mssdemux->manifest_buffer != NULL, FALSE);
+  g_return_val_if_fail (mssdemux->manifest == NULL, FALSE);
 
   query = gst_query_new_uri ();
   ret = gst_pad_peer_query (mssdemux->sinkpad, query);
@@ -740,11 +740,18 @@ gst_mss_demux_process_manifest (GstMssDemux * mssdemux)
   }
   gst_query_unref (query);
 
+  if (mssdemux->base_url == NULL) {
+    GST_ELEMENT_ERROR (mssdemux, RESOURCE, NOT_FOUND,
+        (_("Couldn't get the Manifest's URI")),
+        ("need to get the manifest's URI from upstream elements"));
+    return FALSE;
+  }
+
   mssdemux->manifest = gst_mss_manifest_new (mssdemux->manifest_buffer);
   if (!mssdemux->manifest) {
     GST_ELEMENT_ERROR (mssdemux, STREAM, FORMAT, ("Bad manifest file"),
         ("Xml manifest file couldn't be parsed"));
-    return;
+    return FALSE;
   }
 
   gst_mss_demux_create_streams (mssdemux);
@@ -765,10 +772,11 @@ gst_mss_demux_process_manifest (GstMssDemux * mssdemux)
     GST_ELEMENT_ERROR (mssdemux, STREAM, DEMUX,
         (_("This file contains no playable streams.")),
         ("No known stream formats found at the Manifest"));
-    return;
+    return FALSE;
   }
 
   gst_element_no_more_pads (GST_ELEMENT_CAST (mssdemux));
+  return TRUE;
 }
 
 static void