CVS Root: /cvs/gstreamer
Module: gst-plugins-base
Changes by: ensonic
Date: Mon Nov 24 2008 20:12:07 UTC
Log message:
* gst-libs/gst/audio/gstbaseaudiosink.c:
Time is already in running_time. Remove base_time handling. Fixes
audiosinks not draining and thus chopping some audio in the end.
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.4211&r2=1.4212
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst-libs/gst/audio/gstbaseaudiosink.c.diff?r1=1.109&r2=1.110
====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-base/ChangeLog,v
retrieving revision 1.4211
retrieving revision 1.4212
diff -u -d -r1.4211 -r1.4212
--- ChangeLog 24 Nov 2008 19:18:57 -0000 1.4211
+++ ChangeLog 24 Nov 2008 20:11:51 -0000 1.4212
@@ -1,3 +1,9 @@
+2008-11-24 Stefan Kost <[email protected]>
+
+ * gst-libs/gst/audio/gstbaseaudiosink.c:
+ Time is already in running_time. Remove base_time handling. Fixes
+ audiosinks not draining and thus chopping some audio in the end.
2008-11-24 David Schleef <[email protected]>
* ext/ogg/gstoggmux.c:
Index: gstbaseaudiosink.c
RCS file: /cvs/gstreamer/gst-plugins-base/gst-libs/gst/audio/gstbaseaudiosink.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- gstbaseaudiosink.c 24 Nov 2008 12:56:54 -0000 1.109
+++ gstbaseaudiosink.c 24 Nov 2008 20:11:52 -0000 1.110
@@ -709,8 +709,6 @@
static gboolean
gst_base_audio_sink_drain (GstBaseAudioSink * sink)
{
- GstClockTime base_time;
-
if (!sink->ringbuffer)
return TRUE;
if (!sink->ringbuffer->spec.rate)
@@ -734,18 +732,6 @@
"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);
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.