Commit 5739f5f3 authored by René Stadler's avatar René Stadler Committed by Sebastian Dröge

Add a GIO/GVFS plugin with source and sink elements. This will only be enabled...

Add a GIO/GVFS plugin with source and sink elements. This will only be enabled when --enable-experimental is given to...

Original commit message from CVS:
Patch by: René Stadler <mail at renestadler dot de>
* configure.ac:
* ext/Makefile.am:
* ext/gio/Makefile.am:
* ext/gio/gstgio.c: (gst_gio_error), (gst_gio_seek),
(gst_gio_get_supported_protocols),
(gst_gio_uri_handler_get_type_sink),
(gst_gio_uri_handler_get_type_src),
(gst_gio_uri_handler_get_protocols), (gst_gio_uri_handler_get_uri),
(gst_gio_uri_handler_set_uri), (gst_gio_uri_handler_init),
(gst_gio_uri_handler_do_init), (plugin_init):
* ext/gio/gstgio.h:
* ext/gio/gstgiosink.c: (gst_gio_sink_base_init),
(gst_gio_sink_class_init), (gst_gio_sink_init),
(gst_gio_sink_finalize), (gst_gio_sink_set_property),
(gst_gio_sink_get_property), (gst_gio_sink_start),
(gst_gio_sink_stop), (gst_gio_sink_unlock),
(gst_gio_sink_unlock_stop), (gst_gio_sink_event),
(gst_gio_sink_render), (gst_gio_sink_query):
* ext/gio/gstgiosink.h:
* ext/gio/gstgiosrc.c: (gst_gio_src_base_init),
(gst_gio_src_class_init), (gst_gio_src_init),
(gst_gio_src_finalize), (gst_gio_src_set_property),
(gst_gio_src_get_property), (gst_gio_src_start),
(gst_gio_src_stop), (gst_gio_src_get_size),
(gst_gio_src_is_seekable), (gst_gio_src_unlock),
(gst_gio_src_unlock_stop), (gst_gio_src_check_get_range),
(gst_gio_src_create):
* ext/gio/gstgiosrc.h:
Add a GIO/GVFS plugin with source and sink elements. This will
only be enabled when --enable-experimental is given to configure
for now as the GIO API is not stable yet. Fixes #476916.
parent 78960f29
2007-09-21 Sebastian Dröge <slomo@circular-chaos.org>
Patch by: René Stadler <mail at renestadler dot de>
* configure.ac:
* ext/Makefile.am:
* ext/gio/Makefile.am:
* ext/gio/gstgio.c: (gst_gio_error), (gst_gio_seek),
(gst_gio_get_supported_protocols),
(gst_gio_uri_handler_get_type_sink),
(gst_gio_uri_handler_get_type_src),
(gst_gio_uri_handler_get_protocols), (gst_gio_uri_handler_get_uri),
(gst_gio_uri_handler_set_uri), (gst_gio_uri_handler_init),
(gst_gio_uri_handler_do_init), (plugin_init):
* ext/gio/gstgio.h:
* ext/gio/gstgiosink.c: (gst_gio_sink_base_init),
(gst_gio_sink_class_init), (gst_gio_sink_init),
(gst_gio_sink_finalize), (gst_gio_sink_set_property),
(gst_gio_sink_get_property), (gst_gio_sink_start),
(gst_gio_sink_stop), (gst_gio_sink_unlock),
(gst_gio_sink_unlock_stop), (gst_gio_sink_event),
(gst_gio_sink_render), (gst_gio_sink_query):
* ext/gio/gstgiosink.h:
* ext/gio/gstgiosrc.c: (gst_gio_src_base_init),
(gst_gio_src_class_init), (gst_gio_src_init),
(gst_gio_src_finalize), (gst_gio_src_set_property),
(gst_gio_src_get_property), (gst_gio_src_start),
(gst_gio_src_stop), (gst_gio_src_get_size),
(gst_gio_src_is_seekable), (gst_gio_src_unlock),
(gst_gio_src_unlock_stop), (gst_gio_src_check_get_range),
(gst_gio_src_create):
* ext/gio/gstgiosrc.h:
Add a GIO/GVFS plugin with source and sink elements. This will
only be enabled when --enable-experimental is given to configure
for now as the GIO API is not stable yet. Fixes #476916.
2007-09-21 Thijs Vermeir <thijsvermeir@gmail.com>
* gst/librfb/gstrfbsrc.c:
......
common @ 34d7d649
Subproject commit 76752780462a3c4da712d56d54c45402144b3d0f
Subproject commit 34d7d649b972ea4915611a6ed88f01613bf32777
......@@ -122,7 +122,7 @@ AG_GST_ARG_ENABLE_EXTERNAL
AG_GST_ARG_ENABLE_EXPERIMENTAL
USE_TARKIN=$BUILD_EXPERIMENTAL
USE_GIO=$BUILD_EXPERIMENTAL
dnl *** checks for platform ***
......@@ -278,7 +278,6 @@ fi
AC_SUBST(GST_PLUGINS_SELECTED)
dnl *** sys plug-ins ***
dnl OpenGL
......@@ -331,7 +330,6 @@ AG_GST_CHECK_FEATURE(X, [X libraries and plugins],
CPPFLAGS="$ac_cppflags_save"
])
dnl *** ext plug-ins ***
dnl keep this list sorted alphabetically !
......@@ -531,6 +529,17 @@ AG_GST_CHECK_FEATURE(FAAD, [AAC decoder plug-in], faad, [
AC_SUBST(FAAD_IS_NEAAC)
])
dnl *** libgio ***
translit(dnm, m, l) AM_CONDITIONAL(USE_GIO, true)
AG_GST_CHECK_FEATURE(GIO, [GIO standalone library], gio, [
PKG_CHECK_MODULES(GIO, gio-standalone >= 0.0.1, HAVE_GIO="yes", [
HAVE_GIO="no"
AC_MSG_RESULT(no)
])
AC_SUBST(GIO_CFLAGS)
AC_SUBST(GIO_LIBS)
])
dnl *** gsm ***
translit(dnm, m, l) AM_CONDITIONAL(USE_GSM, true)
AG_GST_CHECK_FEATURE(GSM, [GSM library], gsmenc gsmdec, [
......@@ -899,6 +908,7 @@ AM_CONDITIONAL(USE_DTS, false)
AM_CONDITIONAL(USE_DIVX, false)
AM_CONDITIONAL(USE_FAAC, false)
AM_CONDITIONAL(USE_FAAD, false)
AM_CONDITIONAL(USE_GIO, false)
AM_CONDITIONAL(USE_GSM, false)
AM_CONDITIONAL(USE_IVORBIS, false)
AM_CONDITIONAL(USE_JACK, false)
......@@ -1029,6 +1039,7 @@ ext/divx/Makefile
ext/dts/Makefile
ext/faac/Makefile
ext/faad/Makefile
ext/gio/Makefile
ext/gsm/Makefile
ext/ivorbis/Makefile
ext/jack/Makefile
......
......@@ -88,6 +88,12 @@ else
FAAD_DIR=
endif
if USE_GIO
GIO_DIR=gio
else
GIO_DIR=
endif
if USE_GSM
GSM_DIR=gsm
else
......@@ -278,6 +284,7 @@ SUBDIRS=\
$(DTS_DIR) \
$(FAAC_DIR) \
$(FAAD_DIR) \
$(GIO_DIR) \
$(GSM_DIR) \
$(HERMES_DIR) \
$(IVORBIS_DIR) \
......@@ -317,6 +324,7 @@ DIST_SUBDIRS = \
directfb \
faac \
faad \
gio \
gsm \
ivorbis \
ladspa \
......
# plugindir is set in configure
plugin_LTLIBRARIES = libgstgio.la
# sources used to compile this plug-in
libgstgio_la_SOURCES = gstgio.c gstgiosink.c gstgiosrc.c
libgstgio_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GIO_CFLAGS)
libgstgio_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(GIO_LIBS)
libgstgio_la_LDFLAGS = $(GST_GIO_LDFLAGS)
# headers we need but don't want installed
noinst_HEADERS = gstgio.h gstgiosink.h gstgiosrc.h
/* GStreamer
*
* Copyright (C) 2007 Rene Stadler <mail@renestadler.de>
*
* 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., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "gstgio.h"
#include "gstgiosink.h"
#include "gstgiosrc.h"
#include <gio/gvfs.h>
GST_DEBUG_CATEGORY_STATIC (gst_gio_debug);
#define GST_CAT_DEFAULT gst_gio_debug
/* @func_name: Name of the GIO function, for debugging messages.
* @err: Error location. *err may be NULL, but err must be non-NULL.
* @ret: Flow return location. May be NULL. Is set to either #GST_FLOW_ERROR
* or #GST_FLOW_WRONG_STATE.
*
* Returns: TRUE to indicate a handled error. Error at given location err will
* be freed and *err will be set to NULL. A FALSE return indicates an unhandled
* error: The err location is unchanged and guaranteed to be != NULL. ret, if
* given, is set to GST_FLOW_ERROR.
*/
gboolean
gst_gio_error (gpointer element, const gchar * func_name, GError ** err,
GstFlowReturn * ret)
{
gboolean handled = TRUE;
if (ret)
*ret = GST_FLOW_ERROR;
if (GST_GIO_ERROR_MATCHES (*err, CANCELLED)) {
GST_DEBUG_OBJECT (element, "blocking I/O call cancelled (%s)", func_name);
if (ret)
*ret = GST_FLOW_WRONG_STATE;
} else if (*err != NULL) {
handled = FALSE;
} else {
GST_ELEMENT_ERROR (element, LIBRARY, FAILED, (NULL),
("%s call failed without error set", func_name));
}
if (handled)
g_clear_error (err);
return handled;
}
GstFlowReturn
gst_gio_seek (gpointer element, GSeekable * stream, guint64 offset,
GCancellable * cancel)
{
gboolean success;
GstFlowReturn ret;
GError *err = NULL;
GST_LOG_OBJECT (element, "seeking to offset %" G_GINT64_FORMAT, offset);
success = g_seekable_seek (stream, offset, G_SEEK_SET, cancel, &err);
if (success)
ret = GST_FLOW_OK;
else if (!gst_gio_error (element, "g_seekable_seek", &err, &ret)) {
GST_ELEMENT_ERROR (element, RESOURCE, SEEK, (NULL),
("Could not seek: %s", err->message));
g_clear_error (&err);
}
return ret;
}
static gchar **
gst_gio_get_supported_protocols (void)
{
/* FIXME: Figure out supported schemes enumeration method for GIO. */
const gchar *protocols[] = { "file", "ftp", "sftp", "smb", NULL };
return g_strdupv ((gchar **) protocols);
}
static GstURIType
gst_gio_uri_handler_get_type_sink (void)
{
return GST_URI_SINK;
}
static GstURIType
gst_gio_uri_handler_get_type_src (void)
{
return GST_URI_SRC;
}
static gchar **
gst_gio_uri_handler_get_protocols (void)
{
static gchar **protocols = NULL;
if (!protocols)
protocols = gst_gio_get_supported_protocols ();
return protocols;
}
static const gchar *
gst_gio_uri_handler_get_uri (GstURIHandler * handler)
{
GstElement *element = GST_ELEMENT (handler);
const gchar *uri;
g_return_val_if_fail (GST_IS_ELEMENT (element), FALSE);
g_object_get (G_OBJECT (element), "location", &uri, NULL);
return uri;
}
static gboolean
gst_gio_uri_handler_set_uri (GstURIHandler * handler, const gchar * uri)
{
GstElement *element = GST_ELEMENT (handler);
g_return_val_if_fail (GST_IS_ELEMENT (element), FALSE);
if (GST_STATE (element) == GST_STATE_PLAYING ||
GST_STATE (element) == GST_STATE_PAUSED)
return FALSE;
g_object_set (G_OBJECT (element), "location", uri, NULL);
return TRUE;
}
static void
gst_gio_uri_handler_init (gpointer g_iface, gpointer iface_data)
{
GstURIHandlerInterface *iface = (GstURIHandlerInterface *) g_iface;
gboolean sink = GPOINTER_TO_INT (iface_data); /* See in do_init below. */
if (sink)
iface->get_type = gst_gio_uri_handler_get_type_sink;
else
iface->get_type = gst_gio_uri_handler_get_type_src;
iface->get_protocols = gst_gio_uri_handler_get_protocols;
iface->get_uri = gst_gio_uri_handler_get_uri;
iface->set_uri = gst_gio_uri_handler_set_uri;
}
void
gst_gio_uri_handler_do_init (GType type)
{
GInterfaceInfo uri_handler_info = {
gst_gio_uri_handler_init,
NULL,
NULL
};
/* Store information for uri_handler_init to use for distinguishing the
* element types. This lets us use a single interface implementation for both
* classes. */
uri_handler_info.interface_data = GINT_TO_POINTER (g_type_is_a (type,
GST_TYPE_BASE_SINK));
g_type_add_interface_static (type, GST_TYPE_URI_HANDLER, &uri_handler_info);
}
static gboolean
plugin_init (GstPlugin * plugin)
{
gboolean ret = TRUE;
GST_DEBUG_CATEGORY_INIT (gst_gio_debug, "gio", 0, "GIO elements");
/* FIXME: This is needed to prevent a crash. Needs further investigation
* probably. */
if (g_vfs_get_default () == NULL) {
GST_WARNING ("Failed to initialize default VFS, not registering plugin");
return FALSE;
}
/* FIXME: Rank is MARGINAL for now, should be at least SECONDARY+1 in the future
* to replace gnomevfssink/src. For testing purposes PRIMARY+1 one makes sense
* so it gets autoplugged and preferred over filesrc/sink. */
ret &= gst_element_register (plugin, "giosink", GST_RANK_MARGINAL,
GST_TYPE_GIO_SINK);
ret &= gst_element_register (plugin, "giosrc", GST_RANK_MARGINAL,
GST_TYPE_GIO_SRC);
return ret;
}
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, "gio",
"GIO elements", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME,
GST_PACKAGE_ORIGIN)
/* GStreamer
*
* Copyright (C) 2007 Rene Stadler <mail@renestadler.de>
*
* 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., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#ifndef __GSTGIO_H__
#define __GSTGIO_H__
#include <gio/gioerror.h>
#include <gio/gseekable.h>
#include <gst/gst.h>
G_BEGIN_DECLS
#define GST_GIO_ERROR_MATCHES(err, code) g_error_matches (err, G_IO_ERROR, G_IO_ERROR_##code)
gboolean gst_gio_error (gpointer element, const gchar *func_name,
GError **err, GstFlowReturn *ret);
GstFlowReturn gst_gio_seek (gpointer element, GSeekable *stream, guint64 offset,
GCancellable *cancel);
void gst_gio_uri_handler_do_init (GType type);
G_END_DECLS
#endif /* __GSTGIO_H__ */
/* GStreamer
*
* Copyright (C) 2007 Rene Stadler <mail@renestadler.de>
*
* 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., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
/**
* SECTION:element-giosink
*
* <refsect2>
* <title>Example launch line</title>
* <para>
* <programlisting>
* gst-launch audiotestsrc num-buffers=100 ! flacenc ! giosink location=file:///home/foo/bar.flac
* </programlisting>
* </para>
* </refsect2>
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "gstgiosink.h"
GST_DEBUG_CATEGORY_STATIC (gst_gio_sink_debug);
#define GST_CAT_DEFAULT gst_gio_sink_debug
/* Filter signals and args */
enum
{
LAST_SIGNAL
};
enum
{
ARG_0,
ARG_LOCATION
};
static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
GST_STATIC_CAPS ("ANY")
);
GST_BOILERPLATE_FULL (GstGioSink, gst_gio_sink, GstBaseSink, GST_TYPE_BASE_SINK,
gst_gio_uri_handler_do_init);
static void gst_gio_sink_finalize (GObject * object);
static void gst_gio_sink_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec);
static void gst_gio_sink_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec);
static gboolean gst_gio_sink_start (GstBaseSink * base_sink);
static gboolean gst_gio_sink_stop (GstBaseSink * base_sink);
static gboolean gst_gio_sink_unlock (GstBaseSink * base_sink);
static gboolean gst_gio_sink_unlock_stop (GstBaseSink * base_sink);
static gboolean gst_gio_sink_event (GstBaseSink * base_sink, GstEvent * event);
static GstFlowReturn gst_gio_sink_render (GstBaseSink * base_sink,
GstBuffer * buffer);
static gboolean gst_gio_sink_query (GstPad * pad, GstQuery * query);
static void
gst_gio_sink_base_init (gpointer gclass)
{
static GstElementDetails element_details = {
"GIO sink",
"Sink/File",
"Write to any GVFS-supported location",
"Ren\xc3\xa9 Stadler <mail@renestadler.de>"
};
GstElementClass *element_class = GST_ELEMENT_CLASS (gclass);
GST_DEBUG_CATEGORY_INIT (gst_gio_sink_debug, "giosink", 0, "GIO source");
gst_element_class_add_pad_template (element_class,
gst_static_pad_template_get (&sink_factory));
gst_element_class_set_details (element_class, &element_details);
}
static void
gst_gio_sink_class_init (GstGioSinkClass * klass)
{
GObjectClass *gobject_class;
GstElementClass *gstelement_class;
GstBaseSinkClass *gstbasesink_class;
gobject_class = (GObjectClass *) klass;
gstelement_class = (GstElementClass *) klass;
gstbasesink_class = (GstBaseSinkClass *) klass;
gobject_class->finalize = gst_gio_sink_finalize;
gobject_class->set_property = gst_gio_sink_set_property;
gobject_class->get_property = gst_gio_sink_get_property;
g_object_class_install_property (gobject_class, ARG_LOCATION,
g_param_spec_string ("location", "Location", "URI location to write to",
NULL, G_PARAM_READWRITE));
gstbasesink_class->start = GST_DEBUG_FUNCPTR (gst_gio_sink_start);
gstbasesink_class->stop = GST_DEBUG_FUNCPTR (gst_gio_sink_stop);
gstbasesink_class->unlock = GST_DEBUG_FUNCPTR (gst_gio_sink_unlock);
gstbasesink_class->unlock_stop = GST_DEBUG_FUNCPTR (gst_gio_sink_unlock_stop);
gstbasesink_class->event = GST_DEBUG_FUNCPTR (gst_gio_sink_event);
gstbasesink_class->render = GST_DEBUG_FUNCPTR (gst_gio_sink_render);
}
static void
gst_gio_sink_init (GstGioSink * sink, GstGioSinkClass * gclass)
{
gst_pad_set_query_function (GST_BASE_SINK_PAD (sink),
GST_DEBUG_FUNCPTR (gst_gio_sink_query));
GST_BASE_SINK (sink)->sync = FALSE;
sink->cancel = g_cancellable_new ();
}
static void
gst_gio_sink_finalize (GObject * object)
{
GstGioSink *sink = GST_GIO_SINK (object);
g_object_unref (sink->cancel);
if (sink->file)
g_object_unref (sink->file);
g_free (sink->location);
GST_CALL_PARENT (G_OBJECT_CLASS, finalize, (object));
}
static void
gst_gio_sink_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec)
{
GstGioSink *sink = GST_GIO_SINK (object);
switch (prop_id) {
case ARG_LOCATION:
g_free (sink->location);
sink->location = g_strdup (g_value_get_string (value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
static void
gst_gio_sink_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec)
{
GstGioSink *sink = GST_GIO_SINK (object);
switch (prop_id) {
case ARG_LOCATION:
g_value_set_string (value, sink->location);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
static gboolean
gst_gio_sink_start (GstBaseSink * base_sink)
{
GstGioSink *sink = GST_GIO_SINK (base_sink);
gboolean success;
GError *err = NULL;
if (sink->location == NULL) {
GST_ELEMENT_ERROR (sink, RESOURCE, OPEN_WRITE, (NULL),
("No location given"));
return FALSE;
}
sink->file = g_file_new_for_uri (sink->location);
if (sink->file == NULL) {
GST_ELEMENT_ERROR (sink, RESOURCE, OPEN_WRITE, (NULL),
("Malformed URI or protocol not supported (%s)", sink->location));
return FALSE;
}
sink->stream = g_file_create (sink->file, sink->cancel, &err);
success = (sink->stream != NULL);
if (!success && !gst_gio_error (sink, "g_file_create", &err, NULL)) {
/*if (GST_GIO_ERROR_MATCHES (err, EXISTS)) */
/* FIXME: Retry with replace if overwrite == TRUE! */
if (GST_GIO_ERROR_MATCHES (err, NOT_FOUND))
GST_ELEMENT_ERROR (sink, RESOURCE, NOT_FOUND, (NULL),
("Could not open location %s for writing: %s",
sink->location, err->message));
else
GST_ELEMENT_ERROR (sink, RESOURCE, OPEN_READ, (NULL),
("Could not open location %s for writing: %s",
sink->location, err->message));
g_clear_error (&err);
}
if (!success) {
g_object_unref (sink->file);
sink->file = NULL;
return FALSE;
}
sink->position = 0;
GST_DEBUG_OBJECT (sink, "opened location %s", sink->location);
return TRUE;
}