On 13/03/2020 10:16, Vinod Koul wrote:
Qualcomm DSPs also supports the ALAC and APE decoders, so add support for these and convert the snd_codec_params to qdsp format.
Signed-off-by: Vinod Koul vkoul@kernel.org
One minor nit, other that,
Reviewed-by: Srinivas Kandagatla srinivas.kandagatla@linaro.org
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 53c250778eea..948710759824 100644 --- a/sound/soc/qcom/qdsp6/q6asm-dai.c +++ b/sound/soc/qcom/qdsp6/q6asm-dai.c @@ -628,12 +628,16 @@ static int q6asm_dai_compr_set_params(struct snd_compr_stream *stream, struct q6asm_dai_data *pdata; struct q6asm_flac_cfg flac_cfg; struct q6asm_wma_cfg wma_cfg;
struct q6asm_alac_cfg alac_cfg;
struct q6asm_ape_cfg ape_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;
struct snd_dec_alac *alac;
struct snd_dec_ape *ape;
codec_options = &(prtd->codec_param.codec.options);
@@ -756,6 +760,65 @@ static int q6asm_dai_compr_set_params(struct snd_compr_stream *stream, dev_err(dev, "WMA9 CMD failed:%d\n", ret); return -EIO; }
break;- case SND_AUDIOCODEC_ALAC:
memset(&alac_cfg, 0x0, sizeof(alac_cfg));alac = &codec_options->alac_d;alac_cfg.sample_rate = params->codec.sample_rate;alac_cfg.avg_bit_rate = params->codec.bit_rate;alac_cfg.bit_depth = prtd->bits_per_sample;alac_cfg.num_channels = params->codec.ch_in;alac_cfg.frame_length = alac->frame_length;alac_cfg.pb = alac->pb;alac_cfg.mb = alac->mb;alac_cfg.kb = alac->kb;alac_cfg.max_run = alac->max_run;alac_cfg.compatible_version = alac->compatible_version;alac_cfg.max_frame_bytes = alac->max_frame_bytes;switch (params->codec.ch_in) {case 1:alac_cfg.channel_layout_tag = (100 << 16) | 1;
We should probably define this layout tag in asm.h something like:
#define ALAC_CHANNEL_LAYOUT_TAG_Mono (100<<16) | 1 #define ALAC_CHANNEL_LAYOUT_TAG_STEREO (100<<16) | 2
--srini
break;case 2:alac_cfg.channel_layout_tag = (101 << 16) | 2;break;}