From nobody Thu Oct 2 13:01:35 2025 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4B4AF302769 for ; Wed, 17 Sep 2025 07:32:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758094382; cv=none; b=ag6KMc2TPRvmJJ8d8UMW3OKuF2CWdWfu84fJB4xL/Ac+GPKiW6pULFiNEocf720xyC4IJ6ImhN9t+8oRWgVxmc4t2pnWPWe1PeX2GYslroSNMql6CMOpDcpKIxasJa9wkMGh0CMutN42vfvWQmwxKVG6G9ttFmjU+mNeR/Rbtlg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758094382; c=relaxed/simple; bh=7dBbJ2XDaICT5fY10gi7xHs1MZJM2ZIuPzivB427+9A=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=NwzXB4w33QODhDBmDV63IyXUPgsbA8xnHvjq4P59MeBKy4GfUTV3TUnA+6UQDsK6wbjHcfWJxL6Apv6Emovqq+5S/LaH0FKBxSLhAomIafZAcq/kqHLXgZRkdbfYsKIg5CMdvMR4TOyFIucZJiVdBYEyztwknonjDR8vx5wHxwQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=RempHgvs; arc=none smtp.client-ip=209.85.128.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="RempHgvs" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-45f2c5ef00fso28950515e9.1 for ; Wed, 17 Sep 2025 00:32:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1758094376; x=1758699176; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=V+S8Bi8p7Aa3TTJtUqEJlrmt11baBIIjX3yVkC4MHgM=; b=RempHgvsHJSCr06KxMaJOx74OnqcdET4GXTzGspDPkUUUJf95oX6idkHDtzSPAoZLg 9GHV9DnL9CoKJ5ggWnojvVbVfaCaKmkaXvnS/7A7/saiNfmLC7kX8j6gCD0fYq/HtpGS 82WmjJ567RHNS6DIfkzZiMlFe/c+5uAGEhavOJGFO6G6o8jAB1F76oAskpEMBqnb/S7f pzM4IGSa1he/dItjbcsX4n2GheEBYyvkd/DaCn8lEZb8RIv7owHg/fuD0IOAFlByuOv3 GcRmNeTeiqW4VjggwINGjX1sVBZCalXXGzbn3ACJ2e4pU+fEcPMAkIkiOt/4zTZEqFBk +Ffw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758094376; x=1758699176; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=V+S8Bi8p7Aa3TTJtUqEJlrmt11baBIIjX3yVkC4MHgM=; b=WRUt0UWZ2C44mqvX665tYnwEbAmS7VMvb5Ne4o4n6b8nvaGPOmCIlqQSJpeG8voMko 7VYqHqXGFbKtEqlyBYPxLvKOE0wh6qEMbtmF2OID1IUNu/hKzi6kRhmLpGizaglzYvg2 jKjd6r/KakhL28zhMOyztQQxCuVg4Nh+mKx+vRFMMZvl9G7kQofmYSbJbr3xQ/811kqw NZIGo2WJt2maPDcxsUqrTfpzJbTvtOs/ZuqHvhqw3Dw9uXXBqqlsaBlB+ETjA2NVFqPJ R+NTX2eKB4WIRKpCNT3K1KI6JqTM0Wiusp/7G6bzaOF11IxOFwn+1cZ7+S37pNwOzF2H aY+w== X-Forwarded-Encrypted: i=1; AJvYcCVdSXhk9FVmTxnuaTHpQnNNxF0M6LCUYKQU+PlSSL7YqfsjxFdGCv8/W819Jet907b0RP9x9JXVZ1MV+YE=@vger.kernel.org X-Gm-Message-State: AOJu0YzLBoshaSUqzrKHWRKKUggU0hg0X30wkcNqzffzqyNou8pXrMDh 8RhpvnMLtcPiPga5HeD/yLTWpVzGTxIFP7mRcllYtf5Jt4/MPDr9fhq41O2zZk6TyjY= X-Gm-Gg: ASbGncv2au92OiORrnkMUspyBuXPHjTYgjGKLgLdDbiii7JoILvbWdjI3vAVnYvQBvt DuWsqKrRIzhJfGHb2CVemiFVaBfjBsDPE3623i9GgldaRsQaJfZv2JGZvOjcSo3dd6G8BEWKCHn ewY3n19o8FAceEVZGgFKe8qKhMVWFZRn9rMnqpoNyCfYAYB41jYJcWgTrlmbvJ8CAFjbM0PHMw4 snebNFDzKc1rbcmS6rSzc3E2Z2Gr6SNNxDXnowbnF8Vjo6P4IEIW+EwT6d6mzh952ZtKn7lr6qZ wB2jilajQQhasRAVfAyk3uLbteiXaAJJUQmnhm/v/GCZ0MhnAyxo2HDiuAf6KNojFojngkxA08B lab8aBYhL9TTpXrMQq1NeImcdn0+a X-Google-Smtp-Source: AGHT+IG39wg4+SfI6QbDsnNVP9k5NdIqdTUynjs+9INnoKNB2fdUr4/IiXpXxER5ArqUSoMK0pfKtQ== X-Received: by 2002:a05:600c:548e:b0:45b:8ac2:975e with SMTP id 5b1f17b1804b1-4620665613amr8870305e9.26.1758094375874; Wed, 17 Sep 2025 00:32:55 -0700 (PDT) Received: from orion.home ([2a02:c7c:7259:a00:75ac:2ea2:dfdc:89c7]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4613eb27f25sm25442035e9.23.2025.09.17.00.32.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Sep 2025 00:32:55 -0700 (PDT) From: Alexey Klimov Date: Wed, 17 Sep 2025 08:32:52 +0100 Subject: [PATCH v3 3/3] ASoC: qcom: qdsp6/audioreach: add support for offloading raw opus playback Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250917-opus_codec_rfc_v1-v3-3-7737ad40132e@linaro.org> References: <20250917-opus_codec_rfc_v1-v3-0-7737ad40132e@linaro.org> In-Reply-To: <20250917-opus_codec_rfc_v1-v3-0-7737ad40132e@linaro.org> To: Vinod Koul , Jaroslav Kysela , Takashi Iwai , Srinivas Kandagatla , Liam Girdwood , Mark Brown Cc: Patrick Lai , Annemarie Porter , srinivas.kandagatla@oss.qualcomm.com, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Krzysztof Kozlowski , kernel@oss.qualcomm.com, Ekansh Gupta , Alexey Klimov , Pierre-Louis Bossart X-Mailer: b4 0.14.2 Add support for OPUS module, OPUS format ID, media format payload struct and make it all recognizable by audioreach compress playback path. At this moment this only supports raw or plain OPUS packets not encapsulated in container (for instance OGG container). For this usecase each OPUS packet needs to be prepended with 4-bytes long length field which is expected to be done by userspace applications. This is Qualcomm DSP specific requirement. Cc: Annemarie Porter Cc: Vinod Koul Co-developed-by: Srinivas Kandagatla Signed-off-by: Srinivas Kandagatla Signed-off-by: Alexey Klimov Acked-by: Mark Brown --- sound/soc/qcom/qdsp6/audioreach.c | 27 +++++++++++++++++++++++++++ sound/soc/qcom/qdsp6/audioreach.h | 17 +++++++++++++++++ sound/soc/qcom/qdsp6/q6apm-dai.c | 3 ++- sound/soc/qcom/qdsp6/q6apm.c | 3 +++ 4 files changed, 49 insertions(+), 1 deletion(-) diff --git a/sound/soc/qcom/qdsp6/audioreach.c b/sound/soc/qcom/qdsp6/audio= reach.c index bbfd51db879766445fa0fea564659fabd06b59ad..7e9c48ad0b88213fd39eab222c1= 04a8e41c583da 100644 --- a/sound/soc/qcom/qdsp6/audioreach.c +++ b/sound/soc/qcom/qdsp6/audioreach.c @@ -883,6 +883,7 @@ static int audioreach_set_compr_media_format(struct med= ia_format *media_fmt_hdr, struct payload_media_fmt_aac_t *aac_cfg; struct payload_media_fmt_pcm *mp3_cfg; struct payload_media_fmt_flac_t *flac_cfg; + struct payload_media_fmt_opus_t *opus_cfg; =20 switch (mcfg->fmt) { case SND_AUDIOCODEC_MP3: @@ -925,6 +926,32 @@ static int audioreach_set_compr_media_format(struct me= dia_format *media_fmt_hdr, flac_cfg->min_frame_size =3D mcfg->codec.options.flac_d.min_frame_size; flac_cfg->max_frame_size =3D mcfg->codec.options.flac_d.max_frame_size; break; + case SND_AUDIOCODEC_OPUS_RAW: + media_fmt_hdr->data_format =3D DATA_FORMAT_RAW_COMPRESSED; + media_fmt_hdr->fmt_id =3D MEDIA_FMT_ID_OPUS; + media_fmt_hdr->payload_size =3D sizeof(*opus_cfg); + p =3D p + sizeof(*media_fmt_hdr); + opus_cfg =3D p; + /* raw opus packets prepended with 4 bytes of length */ + opus_cfg->bitstream_format =3D 1; + /* + * payload_type: + * 0 -- read metadata from opus stream; + * 1 -- metadata is provided by filling in the struct here. + */ + opus_cfg->payload_type =3D 1; + opus_cfg->version =3D mcfg->codec.options.opus_d.version; + opus_cfg->num_channels =3D mcfg->codec.options.opus_d.num_channels; + opus_cfg->pre_skip =3D mcfg->codec.options.opus_d.pre_skip; + opus_cfg->sample_rate =3D mcfg->codec.options.opus_d.sample_rate; + opus_cfg->output_gain =3D mcfg->codec.options.opus_d.output_gain; + opus_cfg->mapping_family =3D mcfg->codec.options.opus_d.mapping_family; + opus_cfg->stream_count =3D mcfg->codec.options.opus_d.chan_map.stream_co= unt; + opus_cfg->coupled_count =3D mcfg->codec.options.opus_d.chan_map.coupled_= count; + memcpy(opus_cfg->channel_mapping, mcfg->codec.options.opus_d.chan_map.ch= annel_map, + sizeof(opus_cfg->channel_mapping)); + opus_cfg->reserved[0] =3D opus_cfg->reserved[1] =3D opus_cfg->reserved[2= ] =3D 0; + break; default: return -EINVAL; } diff --git a/sound/soc/qcom/qdsp6/audioreach.h b/sound/soc/qcom/qdsp6/audio= reach.h index 790fba96e34db0fc9d5c90504747174f56b65b32..d1b60b36468a86301601b61a7f8= e7f6051561c3e 100644 --- a/sound/soc/qcom/qdsp6/audioreach.h +++ b/sound/soc/qcom/qdsp6/audioreach.h @@ -31,6 +31,7 @@ struct q6apm_graph; #define MODULE_ID_MP3_DECODE 0x0700103B #define MODULE_ID_GAPLESS 0x0700104D #define MODULE_ID_DISPLAY_PORT_SINK 0x07001069 +#define MODULE_ID_OPUS_DEC 0x07001174 =20 #define APM_CMD_GET_SPF_STATE 0x01001021 #define APM_CMD_RSP_GET_SPF_STATE 0x02001007 @@ -257,6 +258,22 @@ struct payload_media_fmt_aac_t { uint32_t sample_rate; } __packed; =20 +#define MEDIA_FMT_ID_OPUS 0x09001039 +struct payload_media_fmt_opus_t { + uint16_t bitstream_format; + uint16_t payload_type; + uint8_t version; + uint8_t num_channels; + uint16_t pre_skip; + uint32_t sample_rate; + uint16_t output_gain; + uint8_t mapping_family; + uint8_t stream_count; + uint8_t coupled_count; + uint8_t channel_mapping[8]; + uint8_t reserved[3]; +} __packed; + #define DATA_CMD_WR_SH_MEM_EP_EOS 0x04001002 #define WR_SH_MEM_EP_EOS_POLICY_LAST 1 #define WR_SH_MEM_EP_EOS_POLICY_EACH 2 diff --git a/sound/soc/qcom/qdsp6/q6apm-dai.c b/sound/soc/qcom/qdsp6/q6apm-= dai.c index 09da26f712a6ada97196090d760b91bc2dc2a732..4ecaff45c51860cddc631725953= ba7dfa84eeb50 100644 --- a/sound/soc/qcom/qdsp6/q6apm-dai.c +++ b/sound/soc/qcom/qdsp6/q6apm-dai.c @@ -551,10 +551,11 @@ static int q6apm_dai_compr_get_caps(struct snd_soc_co= mponent *component, caps->max_fragment_size =3D COMPR_PLAYBACK_MAX_FRAGMENT_SIZE; caps->min_fragments =3D COMPR_PLAYBACK_MIN_NUM_FRAGMENTS; caps->max_fragments =3D COMPR_PLAYBACK_MAX_NUM_FRAGMENTS; - caps->num_codecs =3D 3; + caps->num_codecs =3D 4; caps->codecs[0] =3D SND_AUDIOCODEC_MP3; caps->codecs[1] =3D SND_AUDIOCODEC_AAC; caps->codecs[2] =3D SND_AUDIOCODEC_FLAC; + caps->codecs[3] =3D SND_AUDIOCODEC_OPUS_RAW; =20 return 0; } diff --git a/sound/soc/qcom/qdsp6/q6apm.c b/sound/soc/qcom/qdsp6/q6apm.c index b4ffa0f0b188e2c32fdfb863b9130d1d11e578dd..0e667a7eb5467bdd65326099132= e8ba9dfefa21e 100644 --- a/sound/soc/qcom/qdsp6/q6apm.c +++ b/sound/soc/qcom/qdsp6/q6apm.c @@ -354,6 +354,9 @@ int q6apm_set_real_module_id(struct device *dev, struct= q6apm_graph *graph, case SND_AUDIOCODEC_FLAC: module_id =3D MODULE_ID_FLAC_DEC; break; + case SND_AUDIOCODEC_OPUS_RAW: + module_id =3D MODULE_ID_OPUS_DEC; + break; default: return -EINVAL; } --=20 2.47.3