From patchwork Mon Mar 2 19:10:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Volker_R=C3=BCmelin?= X-Patchwork-Id: 1247857 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=t-online.de Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48WVBt43h5z9sPK for ; Tue, 3 Mar 2020 06:12:22 +1100 (AEDT) Received: from localhost ([::1]:37522 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8qUF-0006XJ-Ru for incoming@patchwork.ozlabs.org; Mon, 02 Mar 2020 14:12:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53360) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8qSI-0003vB-EP for qemu-devel@nongnu.org; Mon, 02 Mar 2020 14:10:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j8qSH-0005Gj-FC for qemu-devel@nongnu.org; Mon, 02 Mar 2020 14:10:18 -0500 Received: from mailout04.t-online.de ([194.25.134.18]:45714) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j8qSH-0005Ex-8t for qemu-devel@nongnu.org; Mon, 02 Mar 2020 14:10:17 -0500 Received: from fwd24.aul.t-online.de (fwd24.aul.t-online.de [172.20.26.129]) by mailout04.t-online.de (Postfix) with SMTP id D70FE41FE4B1; Mon, 2 Mar 2020 20:10:15 +0100 (CET) Received: from linpower.localnet (JO0NbqZUghBncFwrVZOZcq8S8rgE5SI7sQyfrCrv5rMj+y2ddSFvFUlCGUDY4TvZKF@[79.208.28.226]) by fwd24.t-online.de with (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384 encrypted) esmtp id 1j8qSA-0GSSUi0; Mon, 2 Mar 2020 20:10:10 +0100 Received: by linpower.localnet (Postfix, from userid 1000) id 906E221B1C0; Mon, 2 Mar 2020 20:10:04 +0100 (CET) From: =?utf-8?q?Volker_R=C3=BCmelin?= To: Gerd Hoffmann , Eric Blake , Markus Armbruster Subject: [PATCH 3/5] audio: consistency changes Date: Mon, 2 Mar 2020 20:10:02 +0100 Message-Id: <20200302191004.5991-3-vr_qemu@t-online.de> X-Mailer: git-send-email 2.16.4 In-Reply-To: <417bfe2f-e3c1-d83d-b437-47859daf524d@t-online.de> References: <417bfe2f-e3c1-d83d-b437-47859daf524d@t-online.de> MIME-Version: 1.0 X-ID: JO0NbqZUghBncFwrVZOZcq8S8rgE5SI7sQyfrCrv5rMj+y2ddSFvFUlCGUDY4TvZKF X-TOI-MSGID: df0916cc-babe-4635-b357-2682298f46c3 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 194.25.134.18 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: John Arbuckle , Howard Spoelstra , Mark Cave-Ayland , QEMU , =?utf-8?b?Wm9sdMOhbiBLxZF2w6Fnw7M=?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Change the clip_natural_float_from_mono() function in audio/mixeng.c to be consistent with the clip_*_from_mono() functions in audio/mixeng_template.h. Signed-off-by: Volker Rümelin --- audio/mixeng.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/audio/mixeng.c b/audio/mixeng.c index b57fad83bf..725b529be7 100644 --- a/audio/mixeng.c +++ b/audio/mixeng.c @@ -316,7 +316,7 @@ static void clip_natural_float_from_mono(void *dst, const struct st_sample *src, float *out = (float *)dst; while (samples--) { - *out++ = CLIP_NATURAL_FLOAT(src->l) + CLIP_NATURAL_FLOAT(src->r); + *out++ = CLIP_NATURAL_FLOAT(src->l + src->r); src++; } }