From 5c51c207d3ddaaf505d6d9d4c2423fcd38748cc9 Mon Sep 17 00:00:00 2001 From: Meng Wang Date: Wed, 25 Dec 2019 14:32:18 +0800 Subject: [PATCH] ASoC: compress: add support for Vorbis and amrwb_plus Add Vorbis and amrwb_plus to supported offload formats, update alac and ape snd_codec_options names to match with userspace and send media format block for both formats through compress driver. Change-Id: Ibec74c4d3f44a4676b49fa03133fd5d31dd5182d Signed-off-by: Meng Wang --- include/uapi/sound/compress_params.h | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/include/uapi/sound/compress_params.h b/include/uapi/sound/compress_params.h index 89ab4b739a08..2965d6a3d15b 100644 --- a/include/uapi/sound/compress_params.h +++ b/include/uapi/sound/compress_params.h @@ -398,6 +398,16 @@ struct snd_dec_aptx { __u32 nap; }; +#ifdef CONFIG_AUDIO_QGKI +struct snd_dec_vorbis { + __u32 bit_stream_fmt; +}; + +struct snd_dec_amrwb_plus { + __u32 bit_stream_fmt; +}; +#endif + union snd_codec_options { struct snd_enc_wma wma; struct snd_enc_vorbis vorbis; @@ -406,10 +416,14 @@ union snd_codec_options { struct snd_enc_generic generic; struct snd_dec_aac aac_dec; struct snd_dec_flac flac_dec; - struct snd_dec_alac alac_dec; - struct snd_dec_ape ape_dec; + struct snd_dec_alac alac; + struct snd_dec_ape ape; struct snd_dec_wma wma_dec; struct snd_dec_aptx aptx_dec; +#ifdef CONFIG_AUDIO_QGKI + struct snd_dec_vorbis vorbis_dec; + struct snd_dec_amrwb_plus amrwbplus; +#endif } __attribute__((packed, aligned(4))); /** struct snd_codec_desc - description of codec capabilities