rpms/gstreamer-plugins-base/F-8 gst-plugins-base-0.10.15-audiosink-eos.patch, NONE, 1.1 gstreamer-plugins-base.spec, 1.41, 1.42

[Bastien Nocera (hadess)]

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-plugins-base/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16451

Modified Files:
	gstreamer-plugins-base.spec 
Added Files:
	gst-plugins-base-0.10.15-audiosink-eos.patch 
Log Message:
* Wed Jun 04 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.15-4
- Fix _wait_eos problem for BMPx (#427069)


gst-plugins-base-0.10.15-audiosink-eos.patch:

--- NEW FILE gst-plugins-base-0.10.15-audiosink-eos.patch ---
--- gstbaseaudiosink.c	2007/11/21 13:04:17	1.93
+++ gstbaseaudiosink.c	2007/11/21 18:02:21	1.94
@@ -639,6 +639,8 @@
 static gboolean
 gst_base_audio_sink_drain (GstBaseAudioSink * sink)
 {
+  GstClockTime base_time;
+
   if (!sink->ringbuffer)
     return TRUE;
   if (!sink->ringbuffer->spec.rate)
@@ -662,6 +664,18 @@
         "last sample %" G_GUINT64_FORMAT ", time %" GST_TIME_FORMAT,
         sink->next_sample, GST_TIME_ARGS (time));
 
+    /* our time already includes the base_time, _wait_eos() wants a running_time
+     * so we have to subtract the base_time again here. FIXME, store an
+     * unadjusted EOS time so that we don't have to do this. */
+    GST_OBJECT_LOCK (sink);
+    base_time = GST_ELEMENT_CAST (sink)->base_time;
+    GST_OBJECT_UNLOCK (sink);
+
+    if (time > base_time)
+      time -= base_time;
+    else
+      time = 0;
+
     /* wait for the EOS time to be reached, this is the time when the last
      * sample is played. */
     gst_base_sink_wait_eos (GST_BASE_SINK (sink), time, NULL);


Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/F-8/gstreamer-plugins-base.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- gstreamer-plugins-base.spec	7 Jan 2008 18:02:01 -0000	1.41
+++ gstreamer-plugins-base.spec	4 Jun 2008 14:32:45 -0000	1.42
@@ -5,7 +5,7 @@
 
 Name: 		%{gstreamer}-plugins-base
 Version: 	0.10.15
-Release:  	3%{?dist}	
+Release:  	4%{?dist}	
 Summary: 	GStreamer streaming media framework base plug-ins
 
 Group: 		Applications/Multimedia
@@ -41,6 +41,8 @@
 Patch0:         gst-plugins-base-alsa-mixer-thinkpad.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=486840
 Patch1:         gst-plugins-base-alsa-mixer-same-vols.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=498767
+Patch2:         gst-plugins-base-0.10.15-audiosink-eos.patch
 
 %description
 GStreamer is a streaming media framework, based on graphs of filters which
@@ -58,6 +60,9 @@
 %patch0 -p0 -b .mixer-thinkpad
 %patch1 -p0 -b .same-volumes
 popd
+pushd gst-libs/gst/audio/
+%patch2 -p0 -b .eos
+popd
 
 %build
 %configure \
@@ -249,6 +254,9 @@
 %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor}
 
 %changelog
+* Wed Jun 04 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.15-4
+- Fix _wait_eos problem for BMPx (#427069)
+
 * Mon Jan 07 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.15-3
 - Add the correct patch for the Thinkpad problem, and keep the old
   one as it fixes some bugs with the volume control (#344911)