rpms/gstreamer-plugins-good/F-13 0001-queue2-don-t-wait-for-data-when-EOS.patch, NONE, 1.1 gstreamer-plugins-good.spec, 1.131, 1.132

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-plugins-good/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv16291

Modified Files:
	gstreamer-plugins-good.spec 
Added Files:
	0001-queue2-don-t-wait-for-data-when-EOS.patch 
Log Message:
* Mon Jun 07 2010 Bastien Nocera <bnocera at redhat.com> 0.10.23-2
- Add patch to fix download buffering


0001-queue2-don-t-wait-for-data-when-EOS.patch:
 gstqueue2.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0001-queue2-don-t-wait-for-data-when-EOS.patch ---
>From 15141b3954fdfb46002783463f1cace148480fe9 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans at collabora.co.uk>
Date: Mon, 7 Jun 2010 10:16:04 +0200
Subject: [PATCH] queue2: don't wait for data when EOS

When in download mode and we need to provide data for an offset that we don't
have, also perform a seek to the requested location when we are EOS. The reason
why we shouldn't wait for more data is because after EOS, there simply will be
no more data and we end up waiting forever.

Fixes #620500
---
 plugins/elements/gstqueue2.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/plugins/elements/gstqueue2.c b/plugins/elements/gstqueue2.c
index d3e8e2c..df8aaea 100644
--- a/plugins/elements/gstqueue2.c
+++ b/plugins/elements/gstqueue2.c
@@ -1051,7 +1051,7 @@ gst_queue2_have_data (GstQueue2 * queue, guint64 offset, guint length)
     GST_INFO_OBJECT (queue, "not found in any range");
     /* we don't have the range, see how far away we are, FIXME, find a good
      * threshold based on the incomming rate. */
-    if (queue->current) {
+    if (!queue->is_eos && queue->current) {
       if (offset < queue->current->writing_pos + 200000) {
         update_cur_pos (queue, queue->current, offset + length);
         GST_INFO_OBJECT (queue, "wait for data");
-- 
1.7.0.1



Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/F-13/gstreamer-plugins-good.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- gstreamer-plugins-good.spec	31 May 2010 16:03:33 -0000	1.131
+++ gstreamer-plugins-good.spec	7 Jun 2010 16:58:39 -0000	1.132
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}-plugins-good
 Version: 	0.10.23
-Release:  	1%{?dist}
+Release:  	2%{?dist}
 Summary: 	GStreamer plug-ins with good code and licensing
 
 Group: 		Applications/Multimedia
@@ -64,6 +64,9 @@ BuildRequires:  python-devel PyXML
 Provides: gstreamer-plugins-pulse = 0.9.8-1
 Obsoletes: gstreamer-plugins-pulse < 0.9.8
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=620500
+Patch0: 0001-queue2-don-t-wait-for-data-when-EOS.patch
+
 %description
 GStreamer is a streaming media framework, based on graphs of filters which
 operate on media data. Applications using this library can do anything
@@ -103,6 +106,7 @@ This package contains documentation for 
 
 %prep
 %setup -q -n gst-plugins-good-%{version}
+%patch0 -p1 -b .wait-eos
 
 %build
 
@@ -240,6 +244,9 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
 
 %changelog
+* Mon Jun 07 2010 Bastien Nocera <bnocera at redhat.com> 0.10.23-2
+- Add patch to fix download buffering
+
 * Mon May 31 2010 Benjamin Otte <otte at redhat.com> 0.10.23-1
 - Update to 0.10.23