From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5913DC4167B for ; Thu, 30 Nov 2023 12:17:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235185AbjK3MR3 (ORCPT ); Thu, 30 Nov 2023 07:17:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35730 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231837AbjK3MRY (ORCPT ); Thu, 30 Nov 2023 07:17:24 -0500 Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C3AC210F8 for ; Thu, 30 Nov 2023 04:17:21 -0800 (PST) Received: by mail-ej1-x630.google.com with SMTP id a640c23a62f3a-a1882023bbfso84446566b.3 for ; Thu, 30 Nov 2023 04:17:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701346640; x=1701951440; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:autocrypt:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=Hw5uQbIO10axpdOltgfD3OxasAymktrQYH5AQmGKhHQ=; b=BPCQQ2TzG6g/dSdlygICkKeBT5F+Djo8Rvs6w5Zs7/YUrFFdsNtrDHb0EFqmt4w0Sf bpPqBewng6ufc04+Ap1WwjEJ6IKPPZUbsUlwjKDhctbq8AeetSE4vO7uyNXWQvlM/94s eRYESqcBEjKntCDc01YyTgAUj4h7cT7Y3AJ+RMFkb/KdqeYzpfOUmCd9kONN9W3WAuem XSZO92kwNWUcU1PkkdwruK5auTtCYDFxnSp+y+kzuUgXc9r20de3tNr8/HdcRGdBbift 0P2RsFVT08BR5QKcY4T2r7pcAwx6UWOrhbFoaIcY40PAR2qHBzGEOqF7ZuRK0ocIIPx/ by0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701346640; x=1701951440; h=content-transfer-encoding:in-reply-to:autocrypt:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Hw5uQbIO10axpdOltgfD3OxasAymktrQYH5AQmGKhHQ=; b=PDtfP8swUfzcJX1z78Ja0k0TY3eQgGn1V86VrcBoOWEX7YoDQXIO5Djg6h2L556Kii Gkg9EJnGh5KcSxHY/y4Cd68sB3+W/RdKAFIoxqb+jxroEbE1qXEyt8Fu/F6WTYOX4fgl FE6vV9tXccfQyvQkUfcy5RSvR6FVt4C4NM7PMRI4Iu8yLV+78I9GF8IeZMPMQ/aJ2GAB QLMtjsZ+B+3NQ534kX8Bm3BBXHIc17XH7tKidPFgIPPTU07OhV90rviE2aD6YTcLVe6w hC2m4kjm3pJzk3dtPuJVMO9MT+CMGAm0YhvE0Ygu8OSVXAtLoG/hJNh3oBP+t3IPdUCg m9Dg== X-Gm-Message-State: AOJu0YwuP67y/4iBkQEaEPwhgmQFChLNnzb1SDEf1iWIcHLDIo00qif1 oku/TWxmMi3e2lB0e9CF1EytLQ== X-Google-Smtp-Source: AGHT+IEHebN19PeSjrmB1Hyrs9O4oOMIaAIyx6sLXk2bHRtMdNCRxnBvqmlcENwH+OvKA4/vgwwrZw== X-Received: by 2002:a17:906:5191:b0:a18:6693:97e6 with SMTP id y17-20020a170906519100b00a18669397e6mr1240626ejk.24.1701346640210; Thu, 30 Nov 2023 04:17:20 -0800 (PST) Received: from [192.168.1.20] ([178.197.223.109]) by smtp.gmail.com with ESMTPSA id d15-20020a170906344f00b009eff65e6942sm606452ejb.197.2023.11.30.04.17.18 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 30 Nov 2023 04:17:19 -0800 (PST) Message-ID: <81b23ae7-bb01-4c23-80df-df171fbc2d08@linaro.org> Date: Thu, 30 Nov 2023 13:17:18 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] ASoC: qcom: audioreach: Add 4 channel support Content-Language: en-US To: Srinivas Kandagatla , Banajit Goswami , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org References: <20231020084919.18628-1-krzysztof.kozlowski@linaro.org> From: Krzysztof Kozlowski Autocrypt: addr=krzysztof.kozlowski@linaro.org; keydata= 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 D2GYIS41Kv4Isx2dEFh+/Q== In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 23/10/2023 10:42, Srinivas Kandagatla wrote: > Thanks for the patch, > > On 20/10/2023 09:49, Krzysztof Kozlowski wrote: >> Add support four channel streams. Map channel 3 and 4 to left/right >> surround ("quad(side)" from ffmpeg standard channel list) to match what >> is in qdsp6/q6dsp-common.c driver. >> >> Signed-off-by: Krzysztof Kozlowski >> > >> --- >> >> quad(side): >> https://trac.ffmpeg.org/wiki/AudioChannelManipulation#Listchannelnamesandstandardchannellayouts >> --- >> sound/soc/qcom/qdsp6/audioreach.c | 25 ++++++++++++++++++++++--- >> 1 file changed, 22 insertions(+), 3 deletions(-) >> >> diff --git a/sound/soc/qcom/qdsp6/audioreach.c b/sound/soc/qcom/qdsp6/audioreach.c >> index 5974c7929dd3..4dd2a2e261c9 100644 >> --- a/sound/soc/qcom/qdsp6/audioreach.c >> +++ b/sound/soc/qcom/qdsp6/audioreach.c >> @@ -833,6 +833,11 @@ static int audioreach_mfc_set_media_format(struct q6apm_graph *graph, >> } else if (num_channels == 2) { >> media_format->channel_mapping[0] = PCM_CHANNEL_L; >> media_format->channel_mapping[1] = PCM_CHANNEL_R; >> + } else if (num_channels == 4) { >> + media_format->channel_mapping[0] = PCM_CHANNEL_FL; >> + media_format->channel_mapping[1] = PCM_CHANNEL_FR; >> + media_format->channel_mapping[2] = PCM_CHANNEL_LS; >> + media_format->channel_mapping[3] = PCM_CHANNEL_RS; > > > These are fine, but duplicated from q6dsp_map_channels(), Please > consider using q6dsp_map_channels(). > > Also when you do that pl get rid of PCM_CHANNEL_L and PCM_CHANNEL_R > defines in audioreach.h The code is not exactly equivalent, e.g. for one channel L (=1) -> FC (=3). I assume that's okay for you. Best regards, Krzysztof