ASoC: qcom: qdsp6/audioreach: add support for offloading raw opus playback

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 <annemari@quicinc.com>
Cc: Vinod Koul <vkoul@kernel.org>
Co-developed-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
Signed-off-by: Alexey Klimov <alexey.klimov@linaro.org>
Acked-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

authored by

Alexey Klimov and committed by

Takashi Iwai 7 months ago fc87f70b b07d2514

+49 -1

4 changed files

expand all

sound

soc

qcom

qdsp6

audioreach.c

audioreach.h

q6apm-dai.c

q6apm.c

+27

sound/soc/qcom/qdsp6/audioreach.c

··· 859 859 struct payload_media_fmt_aac_t *aac_cfg; 860 860 struct payload_media_fmt_pcm *mp3_cfg; 861 861 struct payload_media_fmt_flac_t *flac_cfg; 862 + struct payload_media_fmt_opus_t *opus_cfg; 862 863 863 864 switch (mcfg->fmt) { 864 865 case SND_AUDIOCODEC_MP3: ··· 901 900 flac_cfg->sample_rate = mcfg->sample_rate; 902 901 flac_cfg->min_frame_size = mcfg->codec.options.flac_d.min_frame_size; 903 902 flac_cfg->max_frame_size = mcfg->codec.options.flac_d.max_frame_size; 903 + break; 904 + case SND_AUDIOCODEC_OPUS_RAW: 905 + media_fmt_hdr->data_format = DATA_FORMAT_RAW_COMPRESSED; 906 + media_fmt_hdr->fmt_id = MEDIA_FMT_ID_OPUS; 907 + media_fmt_hdr->payload_size = sizeof(*opus_cfg); 908 + p = p + sizeof(*media_fmt_hdr); 909 + opus_cfg = p; 910 + /* raw opus packets prepended with 4 bytes of length */ 911 + opus_cfg->bitstream_format = 1; 912 + /* 913 + * payload_type: 914 + * 0 -- read metadata from opus stream; 915 + * 1 -- metadata is provided by filling in the struct here. 916 + */ 917 + opus_cfg->payload_type = 1; 918 + opus_cfg->version = mcfg->codec.options.opus_d.version; 919 + opus_cfg->num_channels = mcfg->codec.options.opus_d.num_channels; 920 + opus_cfg->pre_skip = mcfg->codec.options.opus_d.pre_skip; 921 + opus_cfg->sample_rate = mcfg->codec.options.opus_d.sample_rate; 922 + opus_cfg->output_gain = mcfg->codec.options.opus_d.output_gain; 923 + opus_cfg->mapping_family = mcfg->codec.options.opus_d.mapping_family; 924 + opus_cfg->stream_count = mcfg->codec.options.opus_d.chan_map.stream_count; 925 + opus_cfg->coupled_count = mcfg->codec.options.opus_d.chan_map.coupled_count; 926 + memcpy(opus_cfg->channel_mapping, mcfg->codec.options.opus_d.chan_map.channel_map, 927 + sizeof(opus_cfg->channel_mapping)); 928 + opus_cfg->reserved[0] = opus_cfg->reserved[1] = opus_cfg->reserved[2] = 0; 904 929 break; 905 930 default: 906 931 return -EINVAL;

+17

sound/soc/qcom/qdsp6/audioreach.h

··· 29 29 #define MODULE_ID_MP3_DECODE 0x0700103B 30 30 #define MODULE_ID_GAPLESS 0x0700104D 31 31 #define MODULE_ID_DISPLAY_PORT_SINK 0x07001069 32 + #define MODULE_ID_OPUS_DEC 0x07001174 32 33 33 34 #define APM_CMD_GET_SPF_STATE 0x01001021 34 35 #define APM_CMD_RSP_GET_SPF_STATE 0x02001007 ··· 254 253 uint16_t num_channels; 255 254 uint16_t total_size_of_PCE_bits; 256 255 uint32_t sample_rate; 256 + } __packed; 257 + 258 + #define MEDIA_FMT_ID_OPUS 0x09001039 259 + struct payload_media_fmt_opus_t { 260 + uint16_t bitstream_format; 261 + uint16_t payload_type; 262 + uint8_t version; 263 + uint8_t num_channels; 264 + uint16_t pre_skip; 265 + uint32_t sample_rate; 266 + uint16_t output_gain; 267 + uint8_t mapping_family; 268 + uint8_t stream_count; 269 + uint8_t coupled_count; 270 + uint8_t channel_mapping[8]; 271 + uint8_t reserved[3]; 257 272 } __packed; 258 273 259 274 #define DATA_CMD_WR_SH_MEM_EP_EOS 0x04001002

+2 -1

sound/soc/qcom/qdsp6/q6apm-dai.c

··· 551 551 caps->max_fragment_size = COMPR_PLAYBACK_MAX_FRAGMENT_SIZE; 552 552 caps->min_fragments = COMPR_PLAYBACK_MIN_NUM_FRAGMENTS; 553 553 caps->max_fragments = COMPR_PLAYBACK_MAX_NUM_FRAGMENTS; 554 - caps->num_codecs = 3; 554 + caps->num_codecs = 4; 555 555 caps->codecs[0] = SND_AUDIOCODEC_MP3; 556 556 caps->codecs[1] = SND_AUDIOCODEC_AAC; 557 557 caps->codecs[2] = SND_AUDIOCODEC_FLAC; 558 + caps->codecs[3] = SND_AUDIOCODEC_OPUS_RAW; 558 559 559 560 return 0; 560 561 }

sound/soc/qcom/qdsp6/q6apm.c

··· 354 354 case SND_AUDIOCODEC_FLAC: 355 355 module_id = MODULE_ID_FLAC_DEC; 356 356 break; 357 + case SND_AUDIOCODEC_OPUS_RAW: 358 + module_id = MODULE_ID_OPUS_DEC; 359 + break; 357 360 default: 358 361 return -EINVAL; 359 362 }

Configure Feed

Configure Feed