Merge "dsp: Do not send ABR parameters if bitrate is fixed"

This commit is contained in:
Linux Build Service Account 2018-09-10 21:36:39 -07:00 • committed by Gerrit - the friendly Code Review server
commit 186f847814
2 changed files with 7 additions and 1 deletions

View file

@ -3735,7 +3735,9 @@ static int q6afe_send_enc_config(u16 port_id,
goto exit;
}
if (format == ASM_MEDIA_FMT_LDAC || format == ASM_MEDIA_FMT_APTX_ADAPTIVE) {
if ((format == ASM_MEDIA_FMT_LDAC &&
cfg->ldac_config.abr_config.is_abr_enabled) ||
format == ASM_MEDIA_FMT_APTX_ADAPTIVE) {
pr_debug("%s:sending AFE_ENCODER_PARAM_ID_BIT_RATE_LEVEL_MAP to DSP payload",
__func__);
param_hdr.param_id = AFE_ENCODER_PARAM_ID_BIT_RATE_LEVEL_MAP;

View file

@ -3522,6 +3522,10 @@ struct afe_abr_enc_cfg_t {
* Information to set up IMC between decoder and encoder.
*/
struct afe_imc_dec_enc_info imc_info;
/*
* Flag to indicate whether ABR is enabled.
*/
bool is_abr_enabled;
} __packed;
#define AFE_PARAM_ID_APTX_SYNC_MODE 0x00013205