From patchwork Thu Oct 13 12:26:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 119465 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8ED22B6F76 for ; Thu, 13 Oct 2011 23:27:07 +1100 (EST) Received: from localhost ([::1]:36444 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1REKNM-0003Nv-6O for incoming@patchwork.ozlabs.org; Thu, 13 Oct 2011 08:27:04 -0400 Received: from eggs.gnu.org ([140.186.70.92]:55616) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1REKN4-0003NE-IY for qemu-devel@nongnu.org; Thu, 13 Oct 2011 08:26:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1REKMy-0006fs-QZ for qemu-devel@nongnu.org; Thu, 13 Oct 2011 08:26:46 -0400 Received: from mail-ww0-f53.google.com ([74.125.82.53]:58236) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1REKMy-0006fn-Kt for qemu-devel@nongnu.org; Thu, 13 Oct 2011 08:26:40 -0400 Received: by wwg14 with SMTP id 14so1438678wwg.10 for ; Thu, 13 Oct 2011 05:26:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=7RFnDRb/hU00z3zbWFVeefW2KXAYmj2G86NnOZmqY+I=; b=Efabi8QhbxNiUGAKRPfmLa0G4Ussepxp/cF92hf4BihwHwXOyUDp/8GuCKMsZtM1no +6Qyr1zDCZbzcPj07Ns32aNAYA/WgCGFmOMqSN5feWjy2RAddMvZxWY4VBcW+CUe681o QKMigDAYJPV+UZS/2R9buZNim+aVD5Hm04dpU= Received: by 10.216.143.153 with SMTP id l25mr3834300wej.24.1318508799663; Thu, 13 Oct 2011 05:26:39 -0700 (PDT) Received: from localhost (75.Red-83-60-208.dynamicIP.rima-tde.net. [83.60.208.75]) by mx.google.com with ESMTPS id fy13sm5655152wbb.18.2011.10.13.05.26.37 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 13 Oct 2011 05:26:38 -0700 (PDT) From: "=?UTF-8?q?Marc-Andr=C3=A9=20Lureau?=" To: qemu-devel@nongnu.org Date: Thu, 13 Oct 2011 14:26:15 +0200 Message-Id: <1318508784-8172-2-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 1.7.6.2 In-Reply-To: <1318508784-8172-1-git-send-email-marcandre.lureau@redhat.com> References: <1316621468-32171-1-git-send-email-marcandre.lureau@redhat.com> <1318508784-8172-1-git-send-email-marcandre.lureau@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.53 Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , kraxel@redhat.com Subject: [Qemu-devel] [PATCH 02/11] audio: don't apply volume effect if backend has VOICE_VOLUME_CAP X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org --- audio/audio.c | 9 +++++++-- audio/audio_int.h | 5 +++++ audio/audio_template.h | 2 ++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/audio/audio.c b/audio/audio.c index c759c1f..f830bb2 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -954,7 +954,9 @@ int audio_pcm_sw_read (SWVoiceIn *sw, void *buf, int size) total += isamp; } - mixeng_volume (sw->buf, ret, &sw->vol); + if (!(hw->ctl_caps & VOICE_VOLUME_CAP)) { + mixeng_volume (sw->buf, ret, &sw->vol); + } sw->clip (buf, sw->buf, ret); sw->total_hw_samples_acquired += total; @@ -1038,7 +1040,10 @@ int audio_pcm_sw_write (SWVoiceOut *sw, void *buf, int size) swlim = audio_MIN (swlim, samples); if (swlim) { sw->conv (sw->buf, buf, swlim); - mixeng_volume (sw->buf, swlim, &sw->vol); + + if (!(sw->hw->ctl_caps & VOICE_VOLUME_CAP)) { + mixeng_volume (sw->buf, swlim, &sw->vol); + } } while (swlim) { diff --git a/audio/audio_int.h b/audio/audio_int.h index 117f95e..b9b0676 100644 --- a/audio/audio_int.h +++ b/audio/audio_int.h @@ -82,6 +82,7 @@ typedef struct HWVoiceOut { int samples; QLIST_HEAD (sw_out_listhead, SWVoiceOut) sw_head; QLIST_HEAD (sw_cap_listhead, SWVoiceCap) cap_head; + int ctl_caps; struct audio_pcm_ops *pcm_ops; QLIST_ENTRY (HWVoiceOut) entries; } HWVoiceOut; @@ -101,6 +102,7 @@ typedef struct HWVoiceIn { int samples; QLIST_HEAD (sw_in_listhead, SWVoiceIn) sw_head; + int ctl_caps; struct audio_pcm_ops *pcm_ops; QLIST_ENTRY (HWVoiceIn) entries; } HWVoiceIn; @@ -150,6 +152,7 @@ struct audio_driver { int max_voices_in; int voice_size_out; int voice_size_in; + int ctl_caps; }; struct audio_pcm_ops { @@ -233,6 +236,8 @@ void audio_run (const char *msg); #define VOICE_DISABLE 2 #define VOICE_VOLUME 3 +#define VOICE_VOLUME_CAP (1 << VOICE_VOLUME) + static inline int audio_ring_dist (int dst, int src, int len) { return (dst >= src) ? (dst - src) : (len - src + dst); diff --git a/audio/audio_template.h b/audio/audio_template.h index e62a713..519432a 100644 --- a/audio/audio_template.h +++ b/audio/audio_template.h @@ -263,6 +263,8 @@ static HW *glue (audio_pcm_hw_add_new_, TYPE) (struct audsettings *as) } hw->pcm_ops = drv->pcm_ops; + hw->ctl_caps = drv->ctl_caps; + QLIST_INIT (&hw->sw_head); #ifdef DAC QLIST_INIT (&hw->cap_head);