Merge "asoc: Add support for Aptx Adaptive decoder"

This commit is contained in:
Linux Build Service Account
2019-02-27 01:15:33 -08:00
committed by Gerrit - the friendly Code Review server
3 changed files with 141 additions and 18 deletions

View File

@@ -2480,6 +2480,7 @@ struct afe_port_data_cmd_rt_proxy_port_read_v2 {
#define AFE_MODULE_AUDIO_DEV_INTERFACE 0x0001020C
#define AFE_PORT_SAMPLE_RATE_8K 8000
#define AFE_PORT_SAMPLE_RATE_16K 16000
#define AFE_PORT_SAMPLE_RATE_44_1K 44100
#define AFE_PORT_SAMPLE_RATE_48K 48000
#define AFE_PORT_SAMPLE_RATE_96K 96000
#define AFE_PORT_SAMPLE_RATE_176P4K 176400
@@ -3798,6 +3799,7 @@ struct afe_imc_dec_enc_info {
struct afe_abr_dec_cfg_t {
struct afe_imc_dec_enc_info imc_info;
bool is_abr_enabled;
} __packed;
struct afe_abr_enc_cfg_t {
@@ -4440,6 +4442,19 @@ struct asm_aac_dec_cfg_v2_t {
*/
} __packed;
/*
* Payload of the APTX AD decoder configuration parameters in the
* #ASM_MEDIA_FMT_APTX_ADAPTIVE media format.
*/
struct asm_aptx_ad_dec_cfg_t {
uint32_t sample_rate;
/*
* Number of samples per second.
*
* @values 0x0(48000Hz), 0x1(44100Hz)
*/
} __packed;
union afe_enc_config_data {
struct asm_sbc_enc_cfg_t sbc_config;
struct asm_aac_enc_cfg_t aac_config;
@@ -4461,6 +4476,7 @@ union afe_dec_config_data {
struct asm_sbc_dec_cfg_t sbc_config;
struct asm_aac_dec_cfg_v2_t aac_config;
struct asm_mp3_dec_cfg_t mp3_config;
struct asm_aptx_ad_dec_cfg_t aptx_ad_config;
};
struct afe_dec_config {