Split setting up and opening browser streams

Wait until we have the browser stream set up before opening stdin
in the browser, which means we might have a chance to get the stream
size.

With recent GStreamer changes, this means that download buffering would
work, and that we'd get download progress and seeking without needing
to wait until the end of the download.

Helps with https://bugzilla.gnome.org/show_bug.cgi?id=608301

4 files changed, 72 insertions, 14 deletions

diff --git a/browser-plugin/org_gnome_totem_PluginViewer.xml b/browser-plugin/org_gnome_totem_PluginViewer.xml
index efe97308c..2218d27e5 100644
--- a/browser-plugin/org_gnome_totem_PluginViewer.xml
+++ b/browser-plugin/org_gnome_totem_PluginViewer.xml
@@ -14,10 +14,13 @@
     <method name="UnsetWindow">
       <arg type="u" name="XID" direction="in" />
     </method>
-    <method name="OpenStream">
+    <method name="SetupStream">
       <arg type="s" name="URI" direction="in" />
       <arg type="s" name="BaseURI" direction="in" />
     </method>
+    <method name="OpenStream">
+      <arg type="x" name="Size" direction="in" />
+    </method>
     <method name="CloseStream" />
     <method name="OpenURI">
       <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="totem_embedded_open_uri" />
diff --git a/browser-plugin/totem-plugin-viewer.c b/browser-plugin/totem-plugin-viewer.c
index 0e40ce687..7459ea108 100644
--- a/browser-plugin/totem-plugin-viewer.c
+++ b/browser-plugin/totem-plugin-viewer.c
@@ -119,6 +119,7 @@ typedef struct _TotemEmbedded {
 	char *href_uri;
 	char *target;
 	char *stream_uri;
+	gint64 size; /* the size of the streamed file for fd://0 */
 	BaconVideoWidget *bvw;
 	TotemStates state;
 	GdkCursor *cursor;
@@ -403,14 +404,18 @@ totem_embedded_open_internal (TotemEmbedded *emb,
 			      GError **error)
 {
 	gboolean retval;
-	const char *uri;
+	char *uri;
 
 	/* FIXME: stop previous content, or is that automatic ? */
 
-	if (emb->is_browser_stream)
-		uri = "fd://0";
-	else
-		uri = emb->current_uri;
+	if (emb->is_browser_stream) {
+		if (emb->size > 0)
+			uri = g_strdup_printf ("fd://0?size=%"G_GINT64_FORMAT, emb->size);
+		else
+			uri = g_strdup ("fd://0");
+	} else {
+		uri = g_strdup (emb->current_uri);
+	}
 
 	if (!uri) {
 		g_set_error_literal (error,
@@ -428,6 +433,8 @@ totem_embedded_open_internal (TotemEmbedded *emb,
 	bacon_video_widget_set_logo_mode (emb->bvw, FALSE);
 
 	retval = bacon_video_widget_open (emb->bvw, uri, emb->current_subtitle_uri, NULL);
+	g_free (uri);
+
 	/* FIXME we shouldn't even do that here */
 	if (start_play)
 		totem_embedded_play (emb, NULL);
@@ -800,12 +807,12 @@ totem_embedded_open_uri (TotemEmbedded *emb,
 }
 
 static gboolean
-totem_embedded_open_stream (TotemEmbedded *emb,
-			    const char *uri,
-			    const char *base_uri,
-			    GError **error)
+totem_embedded_setup_stream (TotemEmbedded *emb,
+			     const char *uri,
+			     const char *base_uri,
+			     GError **error)
 {
-	g_message ("totem_embedded_open_stream called: uri %s, base_uri: %s", uri, base_uri);
+	g_message ("totem_embedded_setup_stream called: uri %s, base_uri: %s", uri, base_uri);
 
 	totem_embedded_clear_playlist (emb, NULL);
 
@@ -816,6 +823,18 @@ totem_embedded_open_stream (TotemEmbedded *emb,
 
 	/* FIXME: consume any remaining input from stdin */
 
+	return TRUE;
+}
+
+static gboolean
+totem_embedded_open_stream (TotemEmbedded *emb,
+			    gint64 size,
+			    GError **error)
+{
+	g_message ("totem_embedded_open_stream called: with size %"G_GINT64_FORMAT, size);
+
+	emb->size = size;
+
 	return totem_embedded_open_internal (emb, TRUE, error);
 }
 
diff --git a/browser-plugin/totemPlugin.cpp b/browser-plugin/totemPlugin.cpp
index 12e9ac51a..7c6f5a497 100644
--- a/browser-plugin/totemPlugin.cpp
+++ b/browser-plugin/totemPlugin.cpp
@@ -1064,7 +1064,7 @@ totemPlugin::RequestStream (bool aForceViewer)
         mRequestBaseURI = g_strdup (baseURI);
 
 	/* If the URL is supported and the caller isn't asking us to make
-	 * the viewer open the stream, we call OpenStream, and
+	 * the viewer open the stream, we call SetupStream, and
 	 * otherwise OpenURI. */
 	if (!aForceViewer && IsSchemeSupported (requestURI, baseURI)) {
 		/* This will fail for the 2nd stream, but we shouldn't
@@ -1072,8 +1072,8 @@ totemPlugin::RequestStream (bool aForceViewer)
 
 		mViewerPendingCall =
 			dbus_g_proxy_begin_call (mViewerProxy,
-						 "OpenStream",
-						 ViewerOpenStreamCallback,
+						 "SetupStream",
+						 ViewerSetupStreamCallback,
 						 reinterpret_cast<void*>(this),
 						 NULL,
 						 G_TYPE_STRING, requestURI,
@@ -1341,6 +1341,29 @@ totemPlugin::ViewerOpenStreamCallback (DBusGProxy *aProxy,
 	    plugin->mAutoPlay) {
 		plugin->Command (TOTEM_COMMAND_PLAY);
 	}
+}
+
+/* static */ void
+totemPlugin::ViewerSetupStreamCallback (DBusGProxy *aProxy,
+					DBusGProxyCall *aCall,
+					void *aData)
+{
+	totemPlugin *plugin = reinterpret_cast<totemPlugin*>(aData);
+
+	g_debug ("SetupStream reply");
+
+// 	assert (aCall == plugin->mViewerPendingCall, "OpenStream not the current call");
+        if (aCall != plugin->mViewerPendingCall)
+          return;
+
+	plugin->mViewerPendingCall = NULL;
+
+	GError *error = NULL;
+	if (!dbus_g_proxy_end_call (aProxy, aCall, &error, G_TYPE_INVALID)) {
+		g_warning ("SetupStream failed: %s", error->message);
+		g_error_free (error);
+		return;
+	}
 
 	assert (!plugin->mExpectingStream); /* Already expecting a stream */
 
@@ -2235,6 +2258,16 @@ totemPlugin::NewStream (NPMIMEType type,
 	mBytesStreamed = 0;
 	mBytesLength = stream->end;
 
+	gint64 length = mBytesLength;
+	mViewerPendingCall =
+		dbus_g_proxy_begin_call (mViewerProxy,
+					 "OpenStream",
+					 ViewerOpenStreamCallback,
+					 reinterpret_cast<void*>(this),
+					 NULL,
+					 G_TYPE_INT64, length,
+					 G_TYPE_INVALID);
+
 	return NPERR_NO_ERROR;
 }
 
diff --git a/browser-plugin/totemPlugin.h b/browser-plugin/totemPlugin.h
index 14c566736..251b51f74 100644
--- a/browser-plugin/totemPlugin.h
+++ b/browser-plugin/totemPlugin.h
@@ -157,6 +157,9 @@ class totemPlugin {
     static void ViewerOpenStreamCallback (DBusGProxy *aProxy,
 						      DBusGProxyCall *aCall,
 						      void *aData);
+    static void ViewerSetupStreamCallback (DBusGProxy *aProxy,
+						      DBusGProxyCall *aCall,
+						      void *aData);
     static void ViewerOpenURICallback (DBusGProxy *aProxy,
 						   DBusGProxyCall *aCall,
 						   void *aData);