Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 186f8478 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents d47af53b 9dce5048

dsp/q6afe.c

+3 −1
Original line number Diff line number Diff line
@@ -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;

include/dsp/apr_audio-v2.h

+4 −0
Original line number Diff line number Diff line
@@ -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