rpms/gstreamer/F-13 0001-queue2-don-t-wait-for-data-when-EOS.patch, NONE, 1.1 gstreamer.spec, 1.121, 1.122

[Bastien Nocera]

Author: hadess

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

Modified Files:
	gstreamer.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.29-2
- Add patch to fix download buffering in Totem


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.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer/F-13/gstreamer.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- gstreamer.spec	28 Apr 2010 11:56:26 -0000	1.121
+++ gstreamer.spec	7 Jun 2010 17:05:11 -0000	1.122
@@ -8,7 +8,7 @@
 
 Name: 		%{gstreamer}
 Version: 	0.10.29
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	GStreamer streaming media framework runtime
 
 Group: 		Applications/Multimedia
@@ -42,6 +42,9 @@ Patch1:		gstreamer-inspect-rpm-format.pa
 Source1:	gstreamer.prov
 Source2:	macros.gstreamer
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=620500
+Patch2: 0001-queue2-don-t-wait-for-data-when-EOS.patch
+
 ### documentation requirements
 BuildRequires:  python2
 BuildRequires:  openjade
@@ -120,6 +123,7 @@ with different major/minor versions of G
 %setup -q -n gstreamer-%{version}
 
 %patch1 -p1 -b .rpm-provides
+%patch2 -p1 -b .wait-eos
 
 %build
 # 0.10.0: manuals do not build due to an openjade error; disable for now
@@ -245,6 +249,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/gtk-doc/html/gstreamer-plugins-%{majorminor}
 
 %changelog
+* Mon Jun 07 2010 Bastien Nocera <bnocera at redhat.com> 0.10.29-2
+- Add patch to fix download buffering in Totem
+
 * Wed Apr 28 2010 Benjamin Otte <otte at redhat.com> 0.10.29-1
 - Update to 0.10.29
 - Make a noarch devel-docs subpackage to avoid conflicts