From patchwork Thu Nov 30 18:07:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 172047 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp616650vqy; Thu, 30 Nov 2023 11:07:19 -0800 (PST) X-Google-Smtp-Source: AGHT+IFZWtyzP/cVv9f0/uH4z1Ccr8COwHotJEisga+eFOBScRoyAMszsFQsXbpXLMNacunVnCNj X-Received: by 2002:a05:6a20:d396:b0:163:5bfd:ae5b with SMTP id iq22-20020a056a20d39600b001635bfdae5bmr26573873pzb.15.1701371239541; Thu, 30 Nov 2023 11:07:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701371239; cv=none; d=google.com; s=arc-20160816; b=G1jPlDjqxdVMPF2wQEONKDM2h0qm9BmjXS8x0rTU2Z86KFjZnsXsMaYZiTH5YSVlPY ZBtx3c0v1zHNSv8dn3AOE+ZHueh9l0UuvdUMYPnwKFqPGzRSDg8ig6SWCgFwp8rKHjmZ cdnRkUXs1lMlkPoiDCtflZ0TMrtiifu/n6Rd3xK+2/lwxJtvi4A3td2Fbf/hwreaNPYG Q/GQphArxuteXuNx1Uko1yzMY05XueZp/AdX2y7I6H1/kEyCtVCcG1JAx+tbFQdcHUAa 0Z6Z8k1aH2IU5OJ9vjYIa6R8TnfGZxcZ0Qf/b5PIEYeFehEWQRwYHEF3/5TA3VAISFWy je3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=7hWM7V+ZExvAnFj1W1dKLDuXcl2XOV1nsx6wXsgycfE=; fh=0HKUKyvbKDnDV00Pl9ks4ZRxOdrxlGdR0/GQO3201mo=; b=lXudH2HG2xmMsF2AZYeU29keOXpIbD/Sz/H3EjwBzHUIwxZC2oX+sJZQvn3ggpQ7wn PuX9FwCLNrYvFlKNvsdNrqpmk3mjp6inXOHbdgT7p1c8yjTIDkHzubv/8iNJrBNpCtkK zEz3tne5RKLr2mzIUGxAQB3INFwxFG7eANguadud3vAee1ysrapBmYZecQmjnNIsG2hN H7ctcFSpsE7iywhHrhAXECGrdp9J8Oc+3WbbGe9t9LwZL/WxtJ1cFqfFAkGhlQQNFbpC 0xEvAG4t1IyiY7dHH1YtzMVjL/rIYC20aIYd3BvMoUNlE2uP0TB7l0P9J3YWpqKF78zS 2aQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rqNWdBgd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id bj10-20020a056a02018a00b005c602ff4069si1961073pgb.552.2023.11.30.11.07.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 11:07:19 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rqNWdBgd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 9ED6580D15A0; Thu, 30 Nov 2023 11:07:03 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346784AbjK3TGv (ORCPT + 99 others); Thu, 30 Nov 2023 14:06:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40858 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230045AbjK3TGu (ORCPT ); Thu, 30 Nov 2023 14:06:50 -0500 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EE6C5194 for ; Thu, 30 Nov 2023 11:06:55 -0800 (PST) Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-3332e351670so273035f8f.0 for ; Thu, 30 Nov 2023 11:06:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701371214; x=1701976014; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=7hWM7V+ZExvAnFj1W1dKLDuXcl2XOV1nsx6wXsgycfE=; b=rqNWdBgdbzf5iJ4AJT928zTbxfEETGW4IyF2uhAZ/Y0OA00FRHNhGRAieqfwZ37+HQ 03he86pEpNvSTD+XOFXiCZHXgRcCZaCC4aJcXifJuMxEyN1XwBiiF0SqITP9WHYKllpi 45LrLoMKiq07iUd2NKk+CmqL48ufK1bEuQaFtjg0Itd1yjE5Un+PHVIaW1cSoJPnUrks BV6jKrfZJoxM1jzC7Jg2ZV4RmNPix4ko5NdwIej/j5WS3XRX+mii78LdIhWXyv0OchBz u1ldibH+j9CErjc8TINM4wD70BM8O03XOrObahz5JqwmYtLmC8ma76g08GMCIws4+qJY na0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701371214; x=1701976014; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=7hWM7V+ZExvAnFj1W1dKLDuXcl2XOV1nsx6wXsgycfE=; b=U5CO6H9EnRx75xgfGaVEkX4mahMFDJXlrOrQ4nY63BdFWIf7VH/iYxSFvclaLxE07I t3oD1Ye5dQNfs3TekpxqZUTubz0/dmO7MRFRNOCpAzDTTvvuk80kYIFJ3O5Chon7jwov m3AbqOnMMdlKml9IUScTxVGTEu67BmGBij0GgTRWkEBvLTfYZh90A0AAKXIaQoQ77DLm 0P9/4fne15DsbmpNwPqg9fhMpbyP/QZ3AnATNrs0hG9GZeiGQn52Si45e2GXzY+IBGpi Xlz7Tbq/1vw0Q8JvC5xySENWXkBVaiYF3iwwqfl2oH1PCPTUlLBMUGpHR+EIr6JdQ+Tj m2VA== X-Gm-Message-State: AOJu0Yz3JDfPR5rC6cCiuNMSI3t7xKiTAJvFxyIc00BMitQYwjcwJbfP 1+sLV6cQ3MZ7PpbAiiRq6RRr95ov2+L4UnKLfencXg== X-Received: by 2002:a17:906:b88f:b0:a19:a1ba:bab7 with SMTP id hb15-20020a170906b88f00b00a19a1babab7mr5512ejb.93.1701367681837; Thu, 30 Nov 2023 10:08:01 -0800 (PST) Received: from krzk-bin.. ([178.197.223.109]) by smtp.gmail.com with ESMTPSA id y16-20020a170906559000b009a1dbf55665sm926713ejp.161.2023.11.30.10.08.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 10:08:01 -0800 (PST) From: Krzysztof Kozlowski To: Srinivas Kandagatla , Banajit Goswami , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , alsa-devel@alsa-project.org, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH v2 1/3] ASoC: qcom: audioreach: Commonize setting channel mappings Date: Thu, 30 Nov 2023 19:07:56 +0100 Message-Id: <20231130180758.212172-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Thu, 30 Nov 2023 11:07:03 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784017049147171850 X-GMAIL-MSGID: 1784017049147171850 Move code assigning channel mapping values to a common helper function. This simplifies three out of four cases, with the last case using incompatible type (uint16_t array instead of uint8_t array). Signed-off-by: Krzysztof Kozlowski --- Changes in v2: 1. New patch --- sound/soc/qcom/qdsp6/audioreach.c | 35 ++++++++++++++----------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/sound/soc/qcom/qdsp6/audioreach.c b/sound/soc/qcom/qdsp6/audioreach.c index 5974c7929dd3..3db5ff367a29 100644 --- a/sound/soc/qcom/qdsp6/audioreach.c +++ b/sound/soc/qcom/qdsp6/audioreach.c @@ -267,6 +267,16 @@ void *audioreach_alloc_apm_cmd_pkt(int pkt_size, uint32_t opcode, uint32_t token } EXPORT_SYMBOL_GPL(audioreach_alloc_apm_cmd_pkt); +static void audioreach_set_channel_mapping(u8 *ch_map, int num_channels) +{ + if (num_channels == 1) { + ch_map[0] = PCM_CHANNEL_L; + } else if (num_channels == 2) { + ch_map[0] = PCM_CHANNEL_L; + ch_map[1] = PCM_CHANNEL_R; + } +} + static void apm_populate_container_config(struct apm_container_obj *cfg, struct audioreach_container *cont) { @@ -864,12 +874,8 @@ static int audioreach_set_compr_media_format(struct media_format *media_fmt_hdr, mp3_cfg->endianness = PCM_LITTLE_ENDIAN; mp3_cfg->num_channels = mcfg->num_channels; - if (mcfg->num_channels == 1) { - mp3_cfg->channel_mapping[0] = PCM_CHANNEL_L; - } else if (mcfg->num_channels == 2) { - mp3_cfg->channel_mapping[0] = PCM_CHANNEL_L; - mp3_cfg->channel_mapping[1] = PCM_CHANNEL_R; - } + audioreach_set_channel_mapping(mp3_cfg->channel_mapping, + mcfg->num_channels); break; case SND_AUDIOCODEC_AAC: media_fmt_hdr->data_format = DATA_FORMAT_RAW_COMPRESSED; @@ -1089,13 +1095,8 @@ static int audioreach_pcm_set_media_format(struct q6apm_graph *graph, media_cfg->q_factor = mcfg->bit_width - 1; media_cfg->bits_per_sample = mcfg->bit_width; - if (num_channels == 1) { - media_cfg->channel_mapping[0] = PCM_CHANNEL_L; - } else if (num_channels == 2) { - media_cfg->channel_mapping[0] = PCM_CHANNEL_L; - media_cfg->channel_mapping[1] = PCM_CHANNEL_R; - - } + audioreach_set_channel_mapping(media_cfg->channel_mapping, + num_channels); rc = q6apm_send_cmd_sync(graph->apm, pkt, 0); @@ -1153,12 +1154,8 @@ static int audioreach_shmem_set_media_format(struct q6apm_graph *graph, cfg->endianness = PCM_LITTLE_ENDIAN; cfg->num_channels = mcfg->num_channels; - if (mcfg->num_channels == 1) - cfg->channel_mapping[0] = PCM_CHANNEL_L; - else if (num_channels == 2) { - cfg->channel_mapping[0] = PCM_CHANNEL_L; - cfg->channel_mapping[1] = PCM_CHANNEL_R; - } + audioreach_set_channel_mapping(cfg->channel_mapping, + num_channels); } else { rc = audioreach_set_compr_media_format(header, p, mcfg); if (rc) {