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 X-Spam-Level: X-Spam-Status: No, score=-8.4 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 36D28C4CECE for ; Fri, 13 Mar 2020 12:15:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0E9BA20746 for ; Fri, 13 Mar 2020 12:15:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="ivrnIzrt" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726636AbgCMMPi (ORCPT ); Fri, 13 Mar 2020 08:15:38 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:36394 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726633AbgCMMPh (ORCPT ); Fri, 13 Mar 2020 08:15:37 -0400 Received: by mail-wm1-f67.google.com with SMTP id g62so10057593wme.1 for ; Fri, 13 Mar 2020 05:15:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=bEk7S7Dnd0BzCyFDN1a5hqfpt0sia9NmxQj/OgqMtaY=; b=ivrnIzrtSb317R27s6UIuB8l1eRMFATY6xEueaZ9KFH+WmhD6bTED40vT+v2Iw+RIT +EVGP7Dblt0JJSWK97d1PnXU9wER9/oKLqyqwtD7B84efCSQtQCHA8jaJBpnSf66/qIY 3HS86wRhMXfS7F4BHpu5Njizex3YV3/kwUq5iDgd/6OJ/vAh5NP7Z3VvwEC5UMeEIiyf vtvv1LEKrW/DZIVP6V+anPSt97bHI6iGJRqYCzc5ErM6NJmnZwMy0S9J79jfjq6IXtFj UcAVJXqKp5P/6bMtMdWPXl86CIF3O4K/FxOCeXjs1v1/ZrRN08Toh4KimCwUjhdsF8Bp BfvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=bEk7S7Dnd0BzCyFDN1a5hqfpt0sia9NmxQj/OgqMtaY=; b=M0MaYH1CB+eoVvIFHJlLN+c8fjv68Mp1mt1yM4FdO6r0jHUMUnNoHNjst7ddk8KBJ2 j7JJdYO/Xar5y954c7XrfnS3Nf2L8OKLSaldDTVNf/xIKdvEiQ5LkZX2yrcOmpSfuO3B wO8dWn+pYUQwyDDErstHnIM4Kh7NInO5GpPe5Ek08rRhDlJkkIyy6a+n/3XoJJrq+ytp hTyhFPH7QTCc5J1T025o5Twe477aaYczLh8Si2mEMdDL2+PprKun3bhlvh2z5iY3TXbx wj/rGdJ5DmKKMMVmISI4V69JzSmXqvDNgVpGXHoSJkead7UpKgt4NWiM19rhDvBkolr+ 5EKg== X-Gm-Message-State: ANhLgQ3KdniGE6p++MyOq2I+AJ+Vsr08COE43e2iZxV8j6O1QGs+yW/e oUhUlF6LKsStRg4DLyBGlX7LXg== X-Google-Smtp-Source: ADFU+vsU8bP/cl627H526e80+fYdUA5wijE1PisL9EbmsVGYHyWfszDXSnlk7wtJ3xCHDtXQZgg1/Q== X-Received: by 2002:a05:600c:208:: with SMTP id 8mr10952728wmi.79.1584101735900; Fri, 13 Mar 2020 05:15:35 -0700 (PDT) Received: from [192.168.86.34] (cpc89974-aztw32-2-0-cust43.18-1.cable.virginm.net. [86.30.250.44]) by smtp.googlemail.com with ESMTPSA id x9sm40720370wrx.0.2020.03.13.05.15.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Mar 2020 05:15:35 -0700 (PDT) Subject: Re: [RESEND PATCH v2 5/9] ASoC: qcom: q6asm-dai: add support to wma decoder To: Vinod Koul , Mark Brown , Takashi Iwai Cc: linux-arm-msm@vger.kernel.org, Bjorn Andersson , Patrick Lai , Banajit Goswami , Liam Girdwood , Jaroslav Kysela , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org References: <20200313101627.1561365-1-vkoul@kernel.org> <20200313101627.1561365-6-vkoul@kernel.org> From: Srinivas Kandagatla Message-ID: Date: Fri, 13 Mar 2020 12:15:34 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <20200313101627.1561365-6-vkoul@kernel.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On 13/03/2020 10:16, Vinod Koul wrote: > Qualcomm DSPs also supports the wma decoder, so add support for wma > decoder and convert the snd_codec_params to qdsp format. > > Signed-off-by: Vinod Koul Reviewed-by: Srinivas Kandagatla > --- > sound/soc/qcom/qdsp6/q6asm-dai.c | 67 +++++++++++++++++++++++++++++++- > 1 file changed, 66 insertions(+), 1 deletion(-) > > diff --git a/sound/soc/qcom/qdsp6/q6asm-dai.c b/sound/soc/qcom/qdsp6/q6asm-dai.c > index 8f245d03b6f5..53c250778eea 100644 > --- a/sound/soc/qcom/qdsp6/q6asm-dai.c > +++ b/sound/soc/qcom/qdsp6/q6asm-dai.c > @@ -627,10 +627,13 @@ static int q6asm_dai_compr_set_params(struct snd_compr_stream *stream, > int dir = stream->direction; > struct q6asm_dai_data *pdata; > struct q6asm_flac_cfg flac_cfg; > + struct q6asm_wma_cfg wma_cfg; > + unsigned int wma_v9 = 0; > struct device *dev = c->dev; > int ret; > union snd_codec_options *codec_options; > struct snd_dec_flac *flac; > + struct snd_dec_wma *wma; > > codec_options = &(prtd->codec_param.codec.options); > > @@ -692,6 +695,67 @@ static int q6asm_dai_compr_set_params(struct snd_compr_stream *stream, > return -EIO; > } > break; > + > + case SND_AUDIOCODEC_WMA: > + wma = &codec_options->wma_d; > + > + memset(&wma_cfg, 0x0, sizeof(struct q6asm_wma_cfg)); > + > + wma_cfg.sample_rate = params->codec.sample_rate; > + wma_cfg.num_channels = params->codec.ch_in; > + wma_cfg.bytes_per_sec = params->codec.bit_rate / 8; > + wma_cfg.block_align = params->codec.align; > + wma_cfg.bits_per_sample = prtd->bits_per_sample; > + wma_cfg.enc_options = wma->encoder_option; > + wma_cfg.adv_enc_options = wma->adv_encoder_option; > + wma_cfg.adv_enc_options2 = wma->adv_encoder_option2; > + > + if (wma_cfg.num_channels == 1) > + wma_cfg.channel_mask = 4; /* Mono Center */ > + else if (wma_cfg.num_channels == 2) > + wma_cfg.channel_mask = 3; /* Stereo FL/FR */ > + else > + return -EINVAL; > + > + /* check the codec profile */ > + switch (params->codec.profile) { > + case SND_AUDIOPROFILE_WMA9: > + wma_cfg.fmtag = 0x161; > + wma_v9 = 1; > + break; > + > + case SND_AUDIOPROFILE_WMA10: > + wma_cfg.fmtag = 0x166; > + break; > + > + case SND_AUDIOPROFILE_WMA9_PRO: > + wma_cfg.fmtag = 0x162; > + break; > + > + case SND_AUDIOPROFILE_WMA9_LOSSLESS: > + wma_cfg.fmtag = 0x163; > + break; > + > + case SND_AUDIOPROFILE_WMA10_LOSSLESS: > + wma_cfg.fmtag = 0x167; > + break; > + > + default: > + dev_err(dev, "Unknown WMA profile:%x\n", > + params->codec.profile); > + return -EIO; > + } > + > + if (wma_v9) > + ret = q6asm_stream_media_format_block_wma_v9( > + prtd->audio_client, &wma_cfg); > + else > + ret = q6asm_stream_media_format_block_wma_v10( > + prtd->audio_client, &wma_cfg); > + if (ret < 0) { > + dev_err(dev, "WMA9 CMD failed:%d\n", ret); > + return -EIO; > + } > default: > break; > } > @@ -791,9 +855,10 @@ static int q6asm_dai_compr_get_caps(struct snd_compr_stream *stream, > caps->max_fragment_size = COMPR_PLAYBACK_MAX_FRAGMENT_SIZE; > caps->min_fragments = COMPR_PLAYBACK_MIN_NUM_FRAGMENTS; > caps->max_fragments = COMPR_PLAYBACK_MAX_NUM_FRAGMENTS; > - caps->num_codecs = 2; > + caps->num_codecs = 3; > caps->codecs[0] = SND_AUDIOCODEC_MP3; > caps->codecs[1] = SND_AUDIOCODEC_FLAC; > + caps->codecs[2] = SND_AUDIOCODEC_WMA; > > return 0; > } > 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 X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8EBDEC10DCE for ; Fri, 13 Mar 2020 12:18:55 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1F77E20724 for ; Fri, 13 Mar 2020 12:18:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="C5Zxo/aO"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="ivrnIzrt" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1F77E20724 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 6F1E517E8; Fri, 13 Mar 2020 13:18:02 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 6F1E517E8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1584101933; bh=DvONzNZQuBFJ2LNOY0m2EHP88qh7oufrh1hPXYJrNcA=; h=Subject:To:References:From:Date:In-Reply-To:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=C5Zxo/aOQxEphNkD791Tk2iA95coycESebZXG3TQV6w2qMVIsqXSdFjzAsHlUT1Bh fYQc8H7UF2LlItU31IAeSzyu4oJFkYsCSLtGJDLcB2rFZ+HpIAjfd8ZXENYX5a9Za1 pd4aIz0AcnXo30S3EtL30rR1l86zqD97sZVVvUw0= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id D5D13F8028B; Fri, 13 Mar 2020 13:16:12 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 2FE48F801F7; Fri, 13 Mar 2020 13:15:43 +0100 (CET) Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 1243AF80086 for ; Fri, 13 Mar 2020 13:15:36 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 1243AF80086 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="ivrnIzrt" Received: by mail-wm1-x344.google.com with SMTP id f7so10037147wml.4 for ; Fri, 13 Mar 2020 05:15:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=bEk7S7Dnd0BzCyFDN1a5hqfpt0sia9NmxQj/OgqMtaY=; b=ivrnIzrtSb317R27s6UIuB8l1eRMFATY6xEueaZ9KFH+WmhD6bTED40vT+v2Iw+RIT +EVGP7Dblt0JJSWK97d1PnXU9wER9/oKLqyqwtD7B84efCSQtQCHA8jaJBpnSf66/qIY 3HS86wRhMXfS7F4BHpu5Njizex3YV3/kwUq5iDgd/6OJ/vAh5NP7Z3VvwEC5UMeEIiyf vtvv1LEKrW/DZIVP6V+anPSt97bHI6iGJRqYCzc5ErM6NJmnZwMy0S9J79jfjq6IXtFj UcAVJXqKp5P/6bMtMdWPXl86CIF3O4K/FxOCeXjs1v1/ZrRN08Toh4KimCwUjhdsF8Bp BfvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=bEk7S7Dnd0BzCyFDN1a5hqfpt0sia9NmxQj/OgqMtaY=; b=KWCG4FFGMaItuczg36vq0umPF8Dzxlh4qn5hMuXig5gWsBZ3J8Y+h4d+ZXHz4hy+L+ JljAg1xvX9k0pciAT8Nv31T7KxhD4sLApK1sX+lbiARVnVFVJESCaoLqdzGrjihb/4Ts BQUUUhxa1OJOG+dlIYns3eT3yotoZl6DkDQ6Czy0bA8v+F8swSstPjIqbSFuqXrTGeD4 pdcjfZpRoB3t1ti0Ik5ba1FoUSLv8zfYqILeSg/Uw3jck+KswgMCvn0PywX7xu0q8yBu VEVBtiJk212a/ugtMj+jR7nZvTeeYHNvpW5CG+ScUfzkmGLj19kqJ7/2SlVQt+2Hu9pX ZrlQ== X-Gm-Message-State: ANhLgQ1bd3KNj7UPbtNaTVawsbPbt5Y6jhmdC80zb6eIlHE2gd+caiwc 0HYzLSr2US3MXn/I0QPz6bbqug== X-Google-Smtp-Source: ADFU+vsU8bP/cl627H526e80+fYdUA5wijE1PisL9EbmsVGYHyWfszDXSnlk7wtJ3xCHDtXQZgg1/Q== X-Received: by 2002:a05:600c:208:: with SMTP id 8mr10952728wmi.79.1584101735900; Fri, 13 Mar 2020 05:15:35 -0700 (PDT) Received: from [192.168.86.34] (cpc89974-aztw32-2-0-cust43.18-1.cable.virginm.net. [86.30.250.44]) by smtp.googlemail.com with ESMTPSA id x9sm40720370wrx.0.2020.03.13.05.15.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Mar 2020 05:15:35 -0700 (PDT) Subject: Re: [RESEND PATCH v2 5/9] ASoC: qcom: q6asm-dai: add support to wma decoder To: Vinod Koul , Mark Brown , Takashi Iwai References: <20200313101627.1561365-1-vkoul@kernel.org> <20200313101627.1561365-6-vkoul@kernel.org> From: Srinivas Kandagatla Message-ID: Date: Fri, 13 Mar 2020 12:15:34 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <20200313101627.1561365-6-vkoul@kernel.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Cc: alsa-devel@alsa-project.org, Banajit Goswami , linux-arm-msm@vger.kernel.org, Patrick Lai , Liam Girdwood , Bjorn Andersson , linux-kernel@vger.kernel.org X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" On 13/03/2020 10:16, Vinod Koul wrote: > Qualcomm DSPs also supports the wma decoder, so add support for wma > decoder and convert the snd_codec_params to qdsp format. > > Signed-off-by: Vinod Koul Reviewed-by: Srinivas Kandagatla > --- > sound/soc/qcom/qdsp6/q6asm-dai.c | 67 +++++++++++++++++++++++++++++++- > 1 file changed, 66 insertions(+), 1 deletion(-) > > diff --git a/sound/soc/qcom/qdsp6/q6asm-dai.c b/sound/soc/qcom/qdsp6/q6asm-dai.c > index 8f245d03b6f5..53c250778eea 100644 > --- a/sound/soc/qcom/qdsp6/q6asm-dai.c > +++ b/sound/soc/qcom/qdsp6/q6asm-dai.c > @@ -627,10 +627,13 @@ static int q6asm_dai_compr_set_params(struct snd_compr_stream *stream, > int dir = stream->direction; > struct q6asm_dai_data *pdata; > struct q6asm_flac_cfg flac_cfg; > + struct q6asm_wma_cfg wma_cfg; > + unsigned int wma_v9 = 0; > struct device *dev = c->dev; > int ret; > union snd_codec_options *codec_options; > struct snd_dec_flac *flac; > + struct snd_dec_wma *wma; > > codec_options = &(prtd->codec_param.codec.options); > > @@ -692,6 +695,67 @@ static int q6asm_dai_compr_set_params(struct snd_compr_stream *stream, > return -EIO; > } > break; > + > + case SND_AUDIOCODEC_WMA: > + wma = &codec_options->wma_d; > + > + memset(&wma_cfg, 0x0, sizeof(struct q6asm_wma_cfg)); > + > + wma_cfg.sample_rate = params->codec.sample_rate; > + wma_cfg.num_channels = params->codec.ch_in; > + wma_cfg.bytes_per_sec = params->codec.bit_rate / 8; > + wma_cfg.block_align = params->codec.align; > + wma_cfg.bits_per_sample = prtd->bits_per_sample; > + wma_cfg.enc_options = wma->encoder_option; > + wma_cfg.adv_enc_options = wma->adv_encoder_option; > + wma_cfg.adv_enc_options2 = wma->adv_encoder_option2; > + > + if (wma_cfg.num_channels == 1) > + wma_cfg.channel_mask = 4; /* Mono Center */ > + else if (wma_cfg.num_channels == 2) > + wma_cfg.channel_mask = 3; /* Stereo FL/FR */ > + else > + return -EINVAL; > + > + /* check the codec profile */ > + switch (params->codec.profile) { > + case SND_AUDIOPROFILE_WMA9: > + wma_cfg.fmtag = 0x161; > + wma_v9 = 1; > + break; > + > + case SND_AUDIOPROFILE_WMA10: > + wma_cfg.fmtag = 0x166; > + break; > + > + case SND_AUDIOPROFILE_WMA9_PRO: > + wma_cfg.fmtag = 0x162; > + break; > + > + case SND_AUDIOPROFILE_WMA9_LOSSLESS: > + wma_cfg.fmtag = 0x163; > + break; > + > + case SND_AUDIOPROFILE_WMA10_LOSSLESS: > + wma_cfg.fmtag = 0x167; > + break; > + > + default: > + dev_err(dev, "Unknown WMA profile:%x\n", > + params->codec.profile); > + return -EIO; > + } > + > + if (wma_v9) > + ret = q6asm_stream_media_format_block_wma_v9( > + prtd->audio_client, &wma_cfg); > + else > + ret = q6asm_stream_media_format_block_wma_v10( > + prtd->audio_client, &wma_cfg); > + if (ret < 0) { > + dev_err(dev, "WMA9 CMD failed:%d\n", ret); > + return -EIO; > + } > default: > break; > } > @@ -791,9 +855,10 @@ static int q6asm_dai_compr_get_caps(struct snd_compr_stream *stream, > caps->max_fragment_size = COMPR_PLAYBACK_MAX_FRAGMENT_SIZE; > caps->min_fragments = COMPR_PLAYBACK_MIN_NUM_FRAGMENTS; > caps->max_fragments = COMPR_PLAYBACK_MAX_NUM_FRAGMENTS; > - caps->num_codecs = 2; > + caps->num_codecs = 3; > caps->codecs[0] = SND_AUDIOCODEC_MP3; > caps->codecs[1] = SND_AUDIOCODEC_FLAC; > + caps->codecs[2] = SND_AUDIOCODEC_WMA; > > return 0; > } >