hls: Use GstURIDownloader from the library for now to keep everything in a usable state

4 files changed, 2 insertions, 426 deletions

diff --git a/ext/hls/Makefile.am b/ext/hls/Makefile.am
index 5cb041f9a..573b67b3e 100644
--- a/ext/hls/Makefile.am
+++ b/ext/hls/Makefile.am
@@ -5,13 +5,13 @@ libgstfragmented_la_SOURCES =			\
 	m3u8.c					\
 	gsthlsdemux.c				\
 	gstfragment.c				\
-	gsturidownloader.c			\
 	gstfragmentedplugin.c 			\
 	gsthlssink.c 				\
 	gstm3u8playlist.c
 
 libgstfragmented_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GIO_CFLAGS) $(GNUTLS_CFLAGS)
 libgstfragmented_la_LIBADD = \
+	$(top_builddir)/gst-libs/gst/uridownloader/libgsturidownloader-@GST_API_VERSION@.la \
 	$(GST_PLUGINS_BASE_LIBS) -lgstpbutils-$(GST_API_VERSION) -lgstvideo-$(GST_API_VERSION) \
 	$(GST_BASE_LIBS) $(GST_LIBS) $(GIO_LIBS) $(LIBM) $(GNUTLS_LIBS)
 libgstfragmented_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -no-undefined
@@ -24,7 +24,6 @@ noinst_HEADERS = 			\
 	gsthlsdemux.h			\
 	gsthlssink.h			\
 	gstm3u8playlist.h		\
-	gsturidownloader.h		\
 	m3u8.h
 
 Android.mk: Makefile.am $(BUILT_SOURCES)
diff --git a/ext/hls/gsthlsdemux.h b/ext/hls/gsthlsdemux.h
index 5211f8cb7..1bd50754f 100644
--- a/ext/hls/gsthlsdemux.h
+++ b/ext/hls/gsthlsdemux.h
@@ -28,7 +28,7 @@
 #include <gst/base/gstadapter.h>
 #include "m3u8.h"
 #include "gstfragmented.h"
-#include "gsturidownloader.h"
+#include <gst/uridownloader/gsturidownloader.h>
 
 G_BEGIN_DECLS
 #define GST_TYPE_HLS_DEMUX \
diff --git a/ext/hls/gsturidownloader.c b/ext/hls/gsturidownloader.c
deleted file mode 100644
index eb7888bd9..000000000
--- a/ext/hls/gsturidownloader.c
+++ /dev/null
@@ -1,359 +0,0 @@
-/* GStreamer
- * Copyright (C) 2011 Andoni Morales Alastruey <ylatuya@gmail.com>
- *
- * gstfragment.c:
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include <glib.h>
-#include "gstfragmented.h"
-#include "gstfragment.h"
-#include "gsturidownloader.h"
-
-GST_DEBUG_CATEGORY_STATIC (uridownloader_debug);
-#define GST_CAT_DEFAULT (uridownloader_debug)
-
-#define GST_URI_DOWNLOADER_GET_PRIVATE(obj)  \
-   (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
-    GST_TYPE_URI_DOWNLOADER, GstUriDownloaderPrivate))
-
-struct _GstUriDownloaderPrivate
-{
-  /* Fragments fetcher */
-  GstElement *urisrc;
-  GstBus *bus;
-  GstPad *pad;
-  GTimeVal *timeout;
-  GstFragment *download;
-  GMutex lock;
-  GCond cond;
-};
-
-static void gst_uri_downloader_finalize (GObject * object);
-static void gst_uri_downloader_dispose (GObject * object);
-
-static GstFlowReturn gst_uri_downloader_chain (GstPad * pad, GstObject * parent,
-    GstBuffer * buf);
-static gboolean gst_uri_downloader_sink_event (GstPad * pad, GstObject * parent,
-    GstEvent * event);
-static GstBusSyncReply gst_uri_downloader_bus_handler (GstBus * bus,
-    GstMessage * message, gpointer data);
-
-static GstStaticPadTemplate sinkpadtemplate = GST_STATIC_PAD_TEMPLATE ("sink",
-    GST_PAD_SINK,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS_ANY);
-
-#define _do_init \
-{ \
-  GST_DEBUG_CATEGORY_INIT (uridownloader_debug, "uridownloader", 0, "URI downloader"); \
-}
-
-G_DEFINE_TYPE_WITH_CODE (GstUriDownloader, gst_uri_downloader, GST_TYPE_OBJECT,
-    _do_init);
-
-static void
-gst_uri_downloader_class_init (GstUriDownloaderClass * klass)
-{
-  GObjectClass *gobject_class;
-
-  gobject_class = (GObjectClass *) klass;
-
-  g_type_class_add_private (klass, sizeof (GstUriDownloaderPrivate));
-
-  gobject_class->dispose = gst_uri_downloader_dispose;
-  gobject_class->finalize = gst_uri_downloader_finalize;
-}
-
-static void
-gst_uri_downloader_init (GstUriDownloader * downloader)
-{
-  downloader->priv = GST_URI_DOWNLOADER_GET_PRIVATE (downloader);
-
-  /* Initialize the sink pad. This pad will be connected to the src pad of the
-   * element created with gst_element_make_from_uri and will handle the download */
-  downloader->priv->pad =
-      gst_pad_new_from_static_template (&sinkpadtemplate, "sink");
-  gst_pad_set_chain_function (downloader->priv->pad,
-      GST_DEBUG_FUNCPTR (gst_uri_downloader_chain));
-  gst_pad_set_event_function (downloader->priv->pad,
-      GST_DEBUG_FUNCPTR (gst_uri_downloader_sink_event));
-  gst_pad_set_element_private (downloader->priv->pad, downloader);
-  gst_pad_set_active (downloader->priv->pad, TRUE);
-
-  /* Create a bus to handle error and warning message from the source element */
-  downloader->priv->bus = gst_bus_new ();
-
-  g_mutex_init (&downloader->priv->lock);
-  g_cond_init (&downloader->priv->cond);
-}
-
-static void
-gst_uri_downloader_dispose (GObject * object)
-{
-  GstUriDownloader *downloader = GST_URI_DOWNLOADER (object);
-
-  if (downloader->priv->urisrc != NULL) {
-    gst_object_unref (downloader->priv->urisrc);
-    downloader->priv->urisrc = NULL;
-  }
-
-  if (downloader->priv->bus != NULL) {
-    gst_object_unref (downloader->priv->bus);
-    downloader->priv->bus = NULL;
-  }
-
-  if (downloader->priv->pad) {
-    gst_object_unref (downloader->priv->pad);
-    downloader->priv->pad = NULL;
-  }
-
-  if (downloader->priv->download) {
-    g_object_unref (downloader->priv->download);
-    downloader->priv->download = NULL;
-  }
-
-  G_OBJECT_CLASS (gst_uri_downloader_parent_class)->dispose (object);
-}
-
-static void
-gst_uri_downloader_finalize (GObject * object)
-{
-  GstUriDownloader *downloader = GST_URI_DOWNLOADER (object);
-
-  g_mutex_clear (&downloader->priv->lock);
-  g_cond_clear (&downloader->priv->cond);
-
-  G_OBJECT_CLASS (gst_uri_downloader_parent_class)->finalize (object);
-}
-
-GstUriDownloader *
-gst_uri_downloader_new (void)
-{
-  return g_object_new (GST_TYPE_URI_DOWNLOADER, NULL);
-}
-
-static gboolean
-gst_uri_downloader_sink_event (GstPad * pad, GstObject * parent,
-    GstEvent * event)
-{
-  gboolean ret = FALSE;
-  GstUriDownloader *downloader;
-
-  downloader = GST_URI_DOWNLOADER (gst_pad_get_element_private (pad));
-
-  switch (event->type) {
-    case GST_EVENT_EOS:{
-      GST_OBJECT_LOCK (downloader);
-      GST_DEBUG_OBJECT (downloader, "Got EOS on the fetcher pad");
-      if (downloader->priv->download != NULL) {
-        /* signal we have fetched the URI */
-        downloader->priv->download->completed = TRUE;
-        downloader->priv->download->download_stop_time =
-            gst_util_get_timestamp ();
-        GST_OBJECT_UNLOCK (downloader);
-        GST_DEBUG_OBJECT (downloader, "Signaling chain funtion");
-        g_mutex_lock (&downloader->priv->lock);
-        g_cond_signal (&downloader->priv->cond);
-        g_mutex_unlock (&downloader->priv->lock);
-      } else {
-        GST_OBJECT_UNLOCK (downloader);
-      }
-      gst_event_unref (event);
-      break;
-    }
-    default:
-      ret = gst_pad_event_default (pad, parent, event);
-      break;
-  }
-
-  return ret;
-}
-
-static GstBusSyncReply
-gst_uri_downloader_bus_handler (GstBus * bus,
-    GstMessage * message, gpointer data)
-{
-  GstUriDownloader *downloader = (GstUriDownloader *) (data);
-
-  if (GST_MESSAGE_TYPE (message) == GST_MESSAGE_ERROR ||
-      GST_MESSAGE_TYPE (message) == GST_MESSAGE_WARNING) {
-    GError *err = NULL;
-    gchar *dbg_info = NULL;
-
-    gst_message_parse_error (message, &err, &dbg_info);
-    GST_WARNING_OBJECT (downloader,
-        "Received error: %s from %s, the download will be cancelled",
-        GST_OBJECT_NAME (message->src), err->message);
-    GST_DEBUG ("Debugging info: %s\n", (dbg_info) ? dbg_info : "none");
-    g_error_free (err);
-    g_free (dbg_info);
-
-    /* remove the sync handler to avoid duplicated messages */
-    gst_bus_set_sync_handler (downloader->priv->bus, NULL, NULL, NULL);
-    gst_uri_downloader_cancel (downloader);
-  }
-
-  gst_message_unref (message);
-  return GST_BUS_DROP;
-}
-
-static GstFlowReturn
-gst_uri_downloader_chain (GstPad * pad, GstObject * parent, GstBuffer * buf)
-{
-  GstUriDownloader *downloader;
-
-  downloader = GST_URI_DOWNLOADER (gst_pad_get_element_private (pad));
-
-  /* HTML errors (404, 500, etc...) are also pushed through this pad as
-   * response but the source element will also post a warning or error message
-   * in the bus, which is handled synchronously cancelling the download.
-   */
-  GST_OBJECT_LOCK (downloader);
-  if (downloader->priv->download == NULL) {
-    /* Download cancelled, quit */
-    GST_OBJECT_UNLOCK (downloader);
-    goto done;
-  }
-
-  GST_LOG_OBJECT (downloader, "The uri fetcher received a new buffer "
-      "of size %" G_GSIZE_FORMAT, gst_buffer_get_size (buf));
-  if (!gst_fragment_add_buffer (downloader->priv->download, buf))
-    GST_WARNING_OBJECT (downloader, "Could not add buffer to fragment");
-  GST_OBJECT_UNLOCK (downloader);
-
-done:
-  {
-    return GST_FLOW_OK;
-  }
-}
-
-static void
-gst_uri_downloader_stop (GstUriDownloader * downloader)
-{
-  GstPad *pad;
-
-  GST_DEBUG_OBJECT (downloader, "Stopping source element");
-
-  /* remove the bus' sync handler */
-  gst_bus_set_sync_handler (downloader->priv->bus, NULL, NULL, NULL);
-  /* unlink the source element from the internal pad */
-  pad = gst_pad_get_peer (downloader->priv->pad);
-  if (pad) {
-    gst_pad_unlink (pad, downloader->priv->pad);
-    gst_object_unref (pad);
-  }
-  /* set the element state to NULL */
-  gst_element_set_state (downloader->priv->urisrc, GST_STATE_NULL);
-  gst_element_get_state (downloader->priv->urisrc, NULL, NULL,
-      GST_CLOCK_TIME_NONE);
-}
-
-void
-gst_uri_downloader_cancel (GstUriDownloader * downloader)
-{
-  GST_OBJECT_LOCK (downloader);
-  if (downloader->priv->download != NULL) {
-    GST_DEBUG_OBJECT (downloader, "Cancelling download");
-    g_object_unref (downloader->priv->download);
-    downloader->priv->download = NULL;
-    GST_OBJECT_UNLOCK (downloader);
-    GST_DEBUG_OBJECT (downloader, "Signaling chain funtion");
-    g_mutex_lock (&downloader->priv->lock);
-    g_cond_signal (&downloader->priv->cond);
-    g_mutex_unlock (&downloader->priv->lock);
-  } else {
-    GST_OBJECT_UNLOCK (downloader);
-    GST_DEBUG_OBJECT (downloader,
-        "Trying to cancell a download that was alredy cancelled");
-  }
-}
-
-static gboolean
-gst_uri_downloader_set_uri (GstUriDownloader * downloader, const gchar * uri)
-{
-  GstPad *pad;
-
-  if (!gst_uri_is_valid (uri))
-    return FALSE;
-
-  GST_DEBUG_OBJECT (downloader, "Creating source element for the URI:%s", uri);
-  downloader->priv->urisrc =
-      gst_element_make_from_uri (GST_URI_SRC, uri, NULL, NULL);
-  if (!downloader->priv->urisrc)
-    return FALSE;
-
-  /* add a sync handler for the bus messages to detect errors in the download */
-  gst_element_set_bus (GST_ELEMENT (downloader->priv->urisrc),
-      downloader->priv->bus);
-  gst_bus_set_sync_handler (downloader->priv->bus,
-      gst_uri_downloader_bus_handler, downloader, NULL);
-
-  pad = gst_element_get_static_pad (downloader->priv->urisrc, "src");
-  if (!pad)
-    return FALSE;
-  gst_pad_link (pad, downloader->priv->pad);
-  gst_object_unref (pad);
-  return TRUE;
-}
-
-GstFragment *
-gst_uri_downloader_fetch_uri (GstUriDownloader * downloader, const gchar * uri)
-{
-  GstStateChangeReturn ret;
-  GstFragment *download = NULL;
-
-  g_mutex_lock (&downloader->priv->lock);
-
-  if (!gst_uri_downloader_set_uri (downloader, uri)) {
-    goto quit;
-  }
-
-  downloader->priv->download = gst_fragment_new ();
-
-  ret = gst_element_set_state (downloader->priv->urisrc, GST_STATE_PLAYING);
-  if (ret == GST_STATE_CHANGE_FAILURE) {
-    g_object_unref (downloader->priv->download);
-    downloader->priv->download = NULL;
-    goto quit;
-  }
-
-  /* wait until:
-   *   - the download succeed (EOS in the src pad)
-   *   - the download failed (Error message on the fetcher bus)
-   *   - the download was canceled
-   */
-  GST_DEBUG_OBJECT (downloader, "Waiting to fetch the URI");
-  g_cond_wait (&downloader->priv->cond, &downloader->priv->lock);
-
-  GST_OBJECT_LOCK (downloader);
-  download = downloader->priv->download;
-  downloader->priv->download = NULL;
-  GST_OBJECT_UNLOCK (downloader);
-
-  if (download != NULL)
-    GST_INFO_OBJECT (downloader, "URI fetched successfully");
-  else
-    GST_INFO_OBJECT (downloader, "Error fetching URI");
-
-quit:
-  {
-    gst_uri_downloader_stop (downloader);
-    g_mutex_unlock (&downloader->priv->lock);
-    return download;
-  }
-}
diff --git a/ext/hls/gsturidownloader.h b/ext/hls/gsturidownloader.h
deleted file mode 100644
index 8c1a6ec28..000000000
--- a/ext/hls/gsturidownloader.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* GStreamer
- * Copyright (C) 2011 Andoni Morales Alastruey <ylatuya@gmail.com>
- *
- * gsturidownloader.h:
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * Youshould have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef __GSTURI_DOWNLOADER_H__
-#define __GSTURI_DOWNLOADER_H__
-
-#include <glib-object.h>
-#include <gst/gst.h>
-#include "gstfragment.h"
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_URI_DOWNLOADER (gst_uri_downloader_get_type())
-#define GST_URI_DOWNLOADER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_URI_DOWNLOADER,GstUriDownloader))
-#define GST_URI_DOWNLOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_URI_DOWNLOADER,GstUriDownloaderClass))
-#define GST_IS_URI_DOWNLOADER(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_URI_DOWNLOADER))
-#define GST_IS_URI_DOWNLOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_URI_DOWNLOADER))
-
-typedef struct _GstUriDownloader GstUriDownloader;
-typedef struct _GstUriDownloaderPrivate GstUriDownloaderPrivate;
-typedef struct _GstUriDownloaderClass GstUriDownloaderClass;
-
-struct _GstUriDownloader
-{
-  GstObject parent;
-
-  GstUriDownloaderPrivate *priv;
-};
-
-struct _GstUriDownloaderClass
-{
-  GstObjectClass parent_class;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_uri_downloader_get_type (void);
-
-GstUriDownloader * gst_uri_downloader_new (void);
-GstFragment * gst_uri_downloader_fetch_uri (GstUriDownloader * downloader, const gchar * uri);
-void gst_uri_downloader_cancel (GstUriDownloader *downloader);
-void gst_uri_downloader_free (GstUriDownloader *downloader);
-
-G_END_DECLS
-#endif /* __GSTURIDOWNLOADER_H__ */