Unverified Commit 2c4fdd05 authored by Cássio Gabriel's avatar Cássio Gabriel Committed by Mark Brown
Browse files

ASoC: SOF: compress: return the configured codec from get_params



The SOF compressed offload path accepts codec parameters in
sof_compr_set_params() and forwards them to firmware as
extended data in the SOF IPC stream params message.

However, sof_compr_get_params() still returns success without
filling the snd_codec structure. Since the compress core allocates
that structure zeroed and copies it back to userspace on success,
SNDRV_COMPRESS_GET_PARAMS returns an all-zero codec description
even after the stream has been configured successfully.

The stale TODO in this callback conflates get_params() with capability
discovery. Supported codec enumeration belongs in get_caps() and
get_codec_caps(). get_params() should report the current codec settings.

Cache the codec accepted by sof_compr_set_params() in the per-stream SOF
compress state and return it from sof_compr_get_params().

Fixes: 6324cf90 ("ASoC: SOF: compr: Add compress ops implementation")
Signed-off-by: default avatarCássio Gabriel <cassiogabrielcontato@gmail.com>
Link: https://patch.msgid.link/20260325-sof-compr-get-params-v1-1-0758815f13c7@gmail.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent b481eabe
Loading
Loading
Loading
Loading
+5 −3
Original line number Diff line number Diff line
@@ -255,6 +255,7 @@ static int sof_compr_set_params(struct snd_soc_component *component,
	sstream->sampling_rate = params->codec.sample_rate;
	sstream->channels = params->codec.ch_out;
	sstream->sample_container_bytes = pcm->params.sample_container_bytes;
	sstream->codec_params = params->codec;

	spcm->prepared[cstream->direction] = true;

@@ -267,9 +268,10 @@ static int sof_compr_set_params(struct snd_soc_component *component,
static int sof_compr_get_params(struct snd_soc_component *component,
				struct snd_compr_stream *cstream, struct snd_codec *params)
{
	/* TODO: we don't query the supported codecs for now, if the
	 * application asks for an unsupported codec the set_params() will fail.
	 */
	struct sof_compr_stream *sstream = cstream->runtime->private_data;

	*params = sstream->codec_params;

	return 0;
}

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@
#include <sound/sof/info.h>
#include <sound/sof/pm.h>
#include <sound/sof/trace.h>
#include <sound/compress_params.h>
#include <uapi/sound/sof/fw.h>
#include <sound/sof/ext_manifest.h>

@@ -111,6 +112,7 @@ struct sof_compr_stream {
	u32 sampling_rate;
	u16 channels;
	u16 sample_container_bytes;
	struct snd_codec codec_params;
	size_t posn_offset;
};