wtay gst-plugins-base: gst-plugins-base/ gst-plugins-base/gst-libs/gst/audio/

CVS Root:       /cvs/gstreamer
Module:         gst-plugins-base
Changes by:     wtay
Date:           Sat Dec 20 2008  12:45:18 UTC

Log message:
* gst-libs/gst/audio/gstbaseaudiosink.c:
(gst_base_audio_sink_setcaps):
Pause the write thread before deactivating and releasing the ringbuffer
to avoid a deadlock when we do gapless playback with different sample
rates in playbin2.  Fixes #564929.

Modified files:
    .               : ChangeLog
    gst-libs/gst/audio: gstbaseaudiosink.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ChangeLog.diff?r1=1.4259&r2=1.4260
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst-libs/gst/audio/gstbaseaudiosink.c.diff?r1=1.112&r2=1.113

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-base/ChangeLog,v
retrieving revision 1.4259
retrieving revision 1.4260
diff -u -d -r1.4259 -r1.4260
--- ChangeLog	19 Dec 2008 13:02:59 -0000	1.4259
+++ ChangeLog	20 Dec 2008 12:45:00 -0000	1.4260
@@ -1,3 +1,11 @@
+2008-12-20  Wim Taymans  <[email protected]>
+
+	* gst-libs/gst/audio/gstbaseaudiosink.c:
+	(gst_base_audio_sink_setcaps):
+	Pause the write thread before deactivating and releasing the ringbuffer
+	to avoid a deadlock when we do gapless playback with different sample
+	rates in playbin2.  Fixes #564929.
 2008-12-19  Sebastian Dröge  <[email protected]>
 
 	* gst-libs/gst/audio/gstbaseaudiosrc.c:
Index: gstbaseaudiosink.c
RCS file: /cvs/gstreamer/gst-plugins-base/gst-libs/gst/audio/gstbaseaudiosink.c,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- gstbaseaudiosink.c	13 Dec 2008 06:57:09 -0000	1.112
+++ gstbaseaudiosink.c	20 Dec 2008 12:45:03 -0000	1.113
@@ -620,6 +620,7 @@
   GST_DEBUG_OBJECT (sink, "release old ringbuffer");
   /* release old ringbuffer */
+  gst_ring_buffer_pause (sink->ringbuffer);
   gst_ring_buffer_activate (sink->ringbuffer, FALSE);
   gst_ring_buffer_release (sink->ringbuffer);

------------------------------------------------------------------------------

_______________________________________________
gstreamer-cvs-verbose mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gstreamer-cvs-verbose