From 11bcac7c9015c4db85514e7837cbd2d0f47b9ff1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Fri, 8 Apr 2011 14:35:04 +0200 Subject: [PATCH] Revert "Pulsesink: Allow chunks up to bufsize instead of segsize" This reverts commit 1e2c1467ae042a3c6bb1a6bc0c07aeff13ec5edb. The commit causes pulsesink to ignore the latency-time baseaudiosink property. --- ext/pulse/pulsesink.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ext/pulse/pulsesink.c b/ext/pulse/pulsesink.c index d93e5c890a..986f4a2f77 100644 --- a/ext/pulse/pulsesink.c +++ b/ext/pulse/pulsesink.c @@ -1351,11 +1351,11 @@ gst_pulseringbuffer_commit (GstRingBuffer * buf, guint64 * sample, towrite = out_samples * bps; - /* Only ever write bufsize bytes at once. This will - * also limit the PA shm buffer to bufsize + /* Only ever write segsize bytes at once. This will + * also limit the PA shm buffer to segsize */ - if (towrite > bufsize) - towrite = bufsize; + if (towrite > buf->spec.segsize) + towrite = buf->spec.segsize; if ((pbuf->m_writable < towrite) || (offset != pbuf->m_lastoffset)) { /* if no room left or discontinuity in offset, @@ -1404,9 +1404,9 @@ gst_pulseringbuffer_commit (GstRingBuffer * buf, guint64 * sample, } /* make sure we only buffer up latency-time samples */ - if (pbuf->m_writable > bufsize) { + if (pbuf->m_writable > buf->spec.segsize) { /* limit buffering to latency-time value */ - pbuf->m_writable = bufsize; + pbuf->m_writable = buf->spec.segsize; GST_LOG_OBJECT (psink, "Limiting buffering to %" G_GSIZE_FORMAT, pbuf->m_writable); @@ -1425,9 +1425,9 @@ gst_pulseringbuffer_commit (GstRingBuffer * buf, guint64 * sample, pbuf->m_writable); /* Just to make sure that we didn't get more than requested */ - if (pbuf->m_writable > bufsize) { + if (pbuf->m_writable > buf->spec.segsize) { /* limit buffering to latency-time value */ - pbuf->m_writable = bufsize; + pbuf->m_writable = buf->spec.segsize; } }