7:44 a.m.
commit 276715dd16248178570b1d489cb0906da24fc80f
Author: Bastien Nocera <hadess(a)fedoraproject.org>
Date: Wed Jun 11 12:53:30 2008 +0000
- Add patch full of gio fixes
gstreamer-plugins-base-0.10.19-gio-fixes.patch | 267 +++++++++++++++++++++++++
gstreamer-plugins-base.spec | 10 +-
2 files changed, 276 insertions(+), 1 deletion(-)
---
diff --git a/gstreamer-plugins-base-0.10.19-gio-fixes.patch
b/gstreamer-plugins-base-0.10.19-gio-fixes.patch
new file mode 100644
index 0000000..62fa459
--- /dev/null
+++ b/gstreamer-plugins-base-0.10.19-gio-fixes.patch
@@ -0,0 +1,267 @@
+? .gstgiobasesrc.c.swp
+? .gstgiobasesrc.h.swp
+? .log.swp
+? log
+Index: gstgiobasesrc.c
+===================================================================
+RCS file: /cvs/gstreamer/gst-plugins-base/ext/gio/gstgiobasesrc.c,v
+retrieving revision 1.8
+diff -u -p -r1.8 gstgiobasesrc.c
+--- gstgiobasesrc.c 22 Mar 2008 14:13:55 -0000 1.8
++++ gstgiobasesrc.c 9 Jun 2008 16:03:43 -0000
+@@ -107,6 +107,11 @@ gst_gio_base_src_finalize (GObject * obj
+ src->stream = NULL;
+ }
+
++ if (src->cache) {
++ gst_buffer_unref (src->cache);
++ src->cache = NULL;
++ }
++
+ GST_CALL_PARENT (G_OBJECT_CLASS, finalize, (object));
+ }
+
+@@ -296,55 +301,110 @@ gst_gio_base_src_create (GstBaseSrc * ba
+ {
+ GstGioBaseSrc *src = GST_GIO_BASE_SRC (base_src);
+ GstBuffer *buf;
+- gssize read;
+- gboolean success, eos;
+ GstFlowReturn ret = GST_FLOW_OK;
+- GError *err = NULL;
+
+ g_return_val_if_fail (G_IS_INPUT_STREAM (src->stream), GST_FLOW_ERROR);
+
+- if (G_UNLIKELY (offset != src->position)) {
+- if (!GST_GIO_STREAM_IS_SEEKABLE (src->stream))
+- return GST_FLOW_NOT_SUPPORTED;
+-
+- ret = gst_gio_seek (src, G_SEEKABLE (src->stream), offset, src->cancel);
+-
+- if (ret == GST_FLOW_OK)
+- src->position = offset;
+- else
+- return ret;
+- }
+-
+- buf = gst_buffer_new_and_alloc (size);
++ /* If we have the requested part in our cache take a subbuffer of that,
++ * otherwise fill the cache again with at least 4096 bytes from the
++ * requested offset and return a subbuffer of that.
++ *
++ * We need caching because every read/seek operation will need to go
++ * over DBus if our backend is GVfs and this is painfully slow. */
++ if (src->cache && offset >= GST_BUFFER_OFFSET (src->cache)
&&
++ offset + size <= GST_BUFFER_OFFSET_END (src->cache)) {
++
++ GST_DEBUG_OBJECT (src, "Creating subbuffer from cached buffer: offset %"
++ G_GUINT64_FORMAT " length %u", offset, size);
++
++ buf = gst_buffer_create_sub (src->cache,
++ offset - GST_BUFFER_OFFSET (src->cache),
++ size);
++
++ GST_BUFFER_OFFSET (buf) = offset;
++ GST_BUFFER_OFFSET_END (buf) = offset + size;
++ GST_BUFFER_SIZE (buf) = size;
++ } else {
++ guint cachesize = MAX (4096, size);
++ gssize read, res;
++ gboolean success, eos;
++ GError *err = NULL;
+
+- GST_LOG_OBJECT (src, "reading %u bytes from offset %" G_GUINT64_FORMAT,
+- size, offset);
++ if (src->cache) {
++ gst_buffer_unref (src->cache);
++ src->cache = NULL;
++ }
++
++ if (G_UNLIKELY (offset != src->position)) {
++ if (!GST_GIO_STREAM_IS_SEEKABLE (src->stream))
++ return GST_FLOW_NOT_SUPPORTED;
++
++ GST_DEBUG_OBJECT (src, "Seeking to position %" G_GUINT64_FORMAT,
offset);
++ ret = gst_gio_seek (src, G_SEEKABLE (src->stream), offset, src->cancel);
++
++ if (ret == GST_FLOW_OK)
++ src->position = offset;
++ else
++ return ret;
++ }
+
+- read =
+- g_input_stream_read (G_INPUT_STREAM (src->stream), GST_BUFFER_DATA (buf),
+- size, src->cancel, &err);
+-
+- success = (read >= 0);
+- eos = (size > 0 && read == 0);
+-
+- if (!success && !gst_gio_error (src, "g_input_stream_read",
&err, &ret)) {
+- GST_ELEMENT_ERROR (src, RESOURCE, READ, (NULL),
+- ("Could not read from stream: %s", err->message));
+- g_clear_error (&err);
+- }
++ src->cache = gst_buffer_new_and_alloc (cachesize);
++
++ GST_LOG_OBJECT (src, "Reading %u bytes from offset %" G_GUINT64_FORMAT,
++ cachesize, offset);
++
++ /* GIO sometimes gives less bytes than requested although
++ * it's not at the end of file. SMB for example only
++ * supports reads up to 64k. So we loop here until we get at
++ * at least the requested amount of bytes or a read returns
++ * nothing. */
++ read = 0;
++ while (size - read > 0 && (res =
++ g_input_stream_read (G_INPUT_STREAM (src->stream),
++ GST_BUFFER_DATA (src->cache) + read, cachesize - read,
++ src->cancel, &err))) {
++ read += res;
++ }
++
++ success = (read >= 0);
++ eos = (cachesize > 0 && read == 0);
++
++ if (!success && !gst_gio_error (src, "g_input_stream_read",
&err, &ret)) {
++ GST_ELEMENT_ERROR (src, RESOURCE, READ, (NULL),
++ ("Could not read from stream: %s", err->message));
++ g_clear_error (&err);
++ }
+
+- if (success && !eos) {
+- src->position += read;
+- GST_BUFFER_OFFSET (buf) = offset;
+- GST_BUFFER_SIZE (buf) = read;
+- *buf_return = buf;
+- } else {
+- /* !success || eos */
+- gst_buffer_unref (buf);
++ if (success && !eos) {
++ src->position += read;
++ GST_BUFFER_SIZE (src->cache) = read;
++
++ GST_BUFFER_OFFSET (src->cache) = offset;
++ GST_BUFFER_OFFSET_END (src->cache) = offset + read;
++
++ GST_DEBUG_OBJECT (src, "Read successful");
++ GST_DEBUG_OBJECT (src, "Creating subbuffer from new "
++ "cached buffer: offset %" G_GUINT64_FORMAT " length %u",
offset,
++ size);
++
++ buf = gst_buffer_create_sub (src->cache,
++ 0, MIN (size, read));
++
++ GST_BUFFER_OFFSET (buf) = offset;
++ GST_BUFFER_OFFSET_END (buf) = offset + MIN (size, read);
++ GST_BUFFER_SIZE (buf) = MIN (size, read);
++ } else {
++ GST_DEBUG_OBJECT (src, "Read not successful");
++ gst_buffer_unref (src->cache);
++ src->cache = NULL;
++ buf = NULL;
++ }
++
++ if (eos)
++ ret = GST_FLOW_UNEXPECTED;
+ }
+
+- if (eos)
+- ret = GST_FLOW_UNEXPECTED;
++ *buf_return = buf;
+
+ return ret;
+ }
+Index: gstgiobasesrc.h
+===================================================================
+RCS file: /cvs/gstreamer/gst-plugins-base/ext/gio/gstgiobasesrc.h,v
+retrieving revision 1.2
+diff -u -p -r1.2 gstgiobasesrc.h
+--- gstgiobasesrc.h 29 Dec 2007 17:29:16 -0000 1.2
++++ gstgiobasesrc.h 9 Jun 2008 16:03:43 -0000
+@@ -49,6 +49,8 @@ struct _GstGioBaseSrc
+ GCancellable *cancel;
+ guint64 position;
+ GInputStream *stream;
++
++ GstBuffer *cache;
+ };
+
+ struct _GstGioBaseSrcClass
+Index: gstgiosrc.c
+===================================================================
+RCS file: /cvs/gstreamer/gst-plugins-base/ext/gio/gstgiosrc.c,v
+retrieving revision 1.10
+diff -u -p -r1.10 gstgiosrc.c
+--- gstgiosrc.c 20 Apr 2008 10:11:54 -0000 1.10
++++ gstgiosrc.c 9 Jun 2008 16:03:43 -0000
+@@ -72,6 +72,7 @@
+ #endif
+
+ #include "gstgiosrc.h"
++#include <string.h>
+
+ GST_DEBUG_CATEGORY_STATIC (gst_gio_src_debug);
+ #define GST_CAT_DEFAULT gst_gio_src_debug
+@@ -91,7 +92,9 @@ static void gst_gio_src_set_property (GO
+ const GValue * value, GParamSpec * pspec);
+ static void gst_gio_src_get_property (GObject * object, guint prop_id,
+ GValue * value, GParamSpec * pspec);
++
+ static gboolean gst_gio_src_start (GstBaseSrc * base_src);
++static gboolean gst_gio_src_check_get_range (GstBaseSrc * base_src);
+
+ static void
+ gst_gio_src_base_init (gpointer gclass)
+@@ -138,6 +141,8 @@ gst_gio_src_class_init (GstGioSrcClass *
+ G_TYPE_FILE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+ gstbasesrc_class->start = GST_DEBUG_FUNCPTR (gst_gio_src_start);
++ gstbasesrc_class->check_get_range =
++ GST_DEBUG_FUNCPTR (gst_gio_src_check_get_range);
+ }
+
+ static void
+@@ -248,6 +253,42 @@ gst_gio_src_get_property (GObject * obje
+ }
+
+ static gboolean
++gst_gio_src_check_get_range (GstBaseSrc * base_src)
++{
++ GstGioSrc *src = GST_GIO_SRC (base_src);
++ gchar *scheme;
++
++ if (src->file == NULL)
++ goto done;
++
++ scheme = g_file_get_uri_scheme (src->file);
++ if (scheme == NULL)
++ goto done;
++
++ if (strcmp (scheme, "file") == 0) {
++ GST_LOG_OBJECT (src, "local URI, assuming random access is possible");
++ g_free (scheme);
++ return TRUE;
++ } else if (strcmp (scheme, "http") == 0 ||
++ strcmp (scheme, "https") == 0) {
++ GST_LOG_OBJECT (src, "blacklisted protocol '%s', "
++ "no random access possible", scheme);
++ g_free (scheme);
++ return FALSE;
++ }
++
++ g_free (scheme);
++
++done:
++
++ GST_DEBUG_OBJECT (src, "undecided about random access, asking base class");
++
++ return GST_CALL_PARENT_WITH_DEFAULT (GST_BASE_SRC_CLASS,
++ check_get_range, (base_src), FALSE);
++}
++
++
++static gboolean
+ gst_gio_src_start (GstBaseSrc * base_src)
+ {
+ GstGioSrc *src = GST_GIO_SRC (base_src);
diff --git a/gstreamer-plugins-base.spec b/gstreamer-plugins-base.spec
index 7e07bfb..8245855 100644
--- a/gstreamer-plugins-base.spec
+++ b/gstreamer-plugins-base.spec
@@ -5,7 +5,7 @@
Name: %{gstreamer}-plugins-base
Version: 0.10.19
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: GStreamer streaming media framework base plug-ins
Group: Applications/Multimedia
@@ -17,6 +17,8 @@ BuildRoot:
%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0: gstpb-0.10.15-cd-speed.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=518082
Patch1: gstreamer-0.10.19-alsasink-mixed-record-playback-tracks.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=536849
+Patch2: gstreamer-plugins-base-0.10.19-gio-fixes.patch
Requires: %{gstreamer} >= %{_gst}
Requires: liboil >= 0.3.12-9
@@ -54,6 +56,9 @@ This package contains a set of well-maintained base plug-ins.
%setup -q -n gst-plugins-base-%{version}
%patch0 -p1 -b .cd-speed
%patch1 -p1 -b .alsasink
+pushd ext/gio/
+%patch2 -p0 -b .gio
+popd
%build
%configure \
@@ -241,6 +246,9 @@ GStreamer Base Plugins library development and header files.
%doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor}
%changelog
+* Wed Jun 11 2008 - Bastien Nocera <bnocera(a)redhat.com> - 0.10.19-6
+- Add patch full of gio fixes
+
* Mon Jun 02 2008 - Bastien Nocera <bnocera(a)redhat.com> - 0.10.19-5
- Let the package build its own documentation