浏览代码

dsp: Do not send ABR parameters if bitrate is fixed

ABR encoder config parameters should be sent to DSP
only when ABR is enabled. Do not send these parameters
for fixed bitrate.

Change-Id: Icf7e4feef65d01c8ae3f6c6123d490cadef46c97
Signed-off-by: Aniket Kumar Lata <[email protected]>
Aniket Kumar Lata 6 年之前
父节点
当前提交
9dce504834
共有 2 个文件被更改,包括 7 次插入1 次删除
  1. 3 1
      dsp/q6afe.c
  2. 4 0
      include/dsp/apr_audio-v2.h

+ 3 - 1
dsp/q6afe.c

@@ -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;

+ 4 - 0
include/dsp/apr_audio-v2.h

@@ -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