From patchwork Tue Apr 17 12:32:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 153174 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 35672B705D for ; Tue, 17 Apr 2012 23:29:53 +1000 (EST) Received: from localhost ([::1]:38099 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SK7bO-0002lb-QI for incoming@patchwork.ozlabs.org; Tue, 17 Apr 2012 08:33:46 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58388) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SK7ar-0001TO-58 for qemu-devel@nongnu.org; Tue, 17 Apr 2012 08:33:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SK7ak-0008CT-P4 for qemu-devel@nongnu.org; Tue, 17 Apr 2012 08:33:12 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:47043) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SK7ak-0008AG-H6 for qemu-devel@nongnu.org; Tue, 17 Apr 2012 08:33:06 -0400 Received: by mail-pb0-f45.google.com with SMTP id uo5so8847635pbc.4 for ; Tue, 17 Apr 2012 05:33:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=TI+1zjO7lVTRurpBUh0vGPpFTEz1w2SzuI5VFWgDQDI=; b=qQNhAxG04cq0W23racAlt8ABGbsOTQ5qMTma0hgnjzh4JKFATBxYbNfRu9rW6ICgUa hEijaN64bl06q59QCuBCLcj4tyk7jbSpDuxudS/bzw+x5GUAsnvE+efwms63yzHJi420 saZll3wE+NWPXfZbAO4p2D4ZB5Rqm8vLLJROvHTWlJyQXtY1UaS4/UEmh2H+T7sj71Jc nBpWbCAy/Y092BAeCose7NUazZCmfG6qFlBel5sUBrT0ijpzVUFGdFGqP5AwsekAjJpM e99dwAXB6Mk7xWEqrX6rl/lRs8OOvBUCb3MR//eJ6RidK9PrjyhoeN5p2+qqhTK12kzs AAWg== Received: by 10.68.200.225 with SMTP id jv1mr35950068pbc.120.1334665985640; Tue, 17 Apr 2012 05:33:05 -0700 (PDT) Received: from localhost (140.pool85-58-59.dynamic.orange.es. [85.58.59.140]) by mx.google.com with ESMTPS id l6sm20620918pbp.33.2012.04.17.05.33.02 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 17 Apr 2012 05:33:05 -0700 (PDT) From: "=?UTF-8?q?Marc-Andr=C3=A9=20Lureau?=" To: qemu-devel@nongnu.org Date: Tue, 17 Apr 2012 14:32:36 +0200 Message-Id: <1334665964-3075-3-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1334665964-3075-1-git-send-email-marcandre.lureau@redhat.com> References: <1334665964-3075-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , dlaor@redhat.com, kraxel@redhat.com, areis@redhat.com Subject: [Qemu-devel] [PATCH 02/10] 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 If the audio backend is capable of volume control, don't apply software volume (mixeng_volume ()), but instead, rely on backend volume control. This will allow guest to have full range volume control. Signed-off-by: Marc-André Lureau --- 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 d76c342..bd9237e 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -957,7 +957,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; @@ -1041,7 +1043,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);