From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=42375 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PB8UT-0005M9-IN for qemu-devel@nongnu.org; Wed, 27 Oct 2010 12:04:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PB8UR-0007HD-Sc for qemu-devel@nongnu.org; Wed, 27 Oct 2010 12:04:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37525) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PB8UR-0007Gs-Ls for qemu-devel@nongnu.org; Wed, 27 Oct 2010 12:04:39 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o9RG4cVx032467 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 27 Oct 2010 12:04:38 -0400 From: Gerd Hoffmann Date: Wed, 27 Oct 2010 18:04:31 +0200 Message-Id: <1288195475-3807-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1288195475-3807-1-git-send-email-kraxel@redhat.com> References: <1288195475-3807-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 2/6] pa: process 1/4 buffer max at once List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Limit the size of data pieces processed by the pulseaudio worker threads. Never ever process more than 1/4 of the buffer at once. Data processing is less bulky then. Signed-off-by: Gerd Hoffmann --- audio/paaudio.c | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/audio/paaudio.c b/audio/paaudio.c index f768ca9..f99ca73 100644 --- a/audio/paaudio.c +++ b/audio/paaudio.c @@ -57,9 +57,6 @@ static void *qpa_thread_out (void *arg) { PAVoiceOut *pa = arg; HWVoiceOut *hw = &pa->hw; - int threshold; - - threshold = conf.divisor ? hw->samples / conf.divisor : 0; if (audio_pt_lock (&pa->pt, AUDIO_FUNC)) { return NULL; @@ -73,7 +70,7 @@ static void *qpa_thread_out (void *arg) goto exit; } - if (pa->live > threshold) { + if (pa->live > 0) { break; } @@ -82,7 +79,7 @@ static void *qpa_thread_out (void *arg) } } - decr = to_mix = pa->live; + decr = to_mix = audio_MIN (pa->live, conf.samples >> 2); rpos = pa->rpos; if (audio_pt_unlock (&pa->pt, AUDIO_FUNC)) { @@ -152,9 +149,6 @@ static void *qpa_thread_in (void *arg) { PAVoiceIn *pa = arg; HWVoiceIn *hw = &pa->hw; - int threshold; - - threshold = conf.divisor ? hw->samples / conf.divisor : 0; if (audio_pt_lock (&pa->pt, AUDIO_FUNC)) { return NULL; @@ -168,7 +162,7 @@ static void *qpa_thread_in (void *arg) goto exit; } - if (pa->dead > threshold) { + if (pa->dead > 0) { break; } @@ -177,7 +171,7 @@ static void *qpa_thread_in (void *arg) } } - incr = to_grab = pa->dead; + incr = to_grab = audio_MIN (pa->dead, conf.samples >> 2); wpos = pa->wpos; if (audio_pt_unlock (&pa->pt, AUDIO_FUNC)) { -- 1.7.1