A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-10 22:40:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "dsp: Bit rate mode support for aac codec"

Browse source
This commit is contained in:
qctecmdr 2020-03-19 22:19:05 -07:00 • committed by Gerrit - the friendly Code Review server
commit 67da967cff
2 changed files with 28 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

27
dsp/q6afe.c
View file

@ -3980,6 +3980,7 @@ static int q6afe_send_enc_config(u16 port_id,
struct asm_aptx_ad_speech_mode_cfg_t speech_codec_init_param;
struct param_hdr_v3 param_hdr;
int ret;
uint32_t frame_size_ctl_value_v2;
pr_debug("%s:update DSP for enc format = %d\n", __func__, format);
@ -4067,8 +4068,9 @@ static int q6afe_send_enc_config(u16 port_id,
frame_ctl_param.ctl_type = enc_blk_param.
enc_blk_config.aac_config.frame_ctl.ctl_type;
frame_ctl_param.ctl_value = frame_size_ctl_value;
pr_debug("%s: send AFE_PARAM_ID_AAC_FRM_SIZE_CONTROL\n",
__func__);
__func__);
ret = q6afe_pack_and_set_param_in_band(port_id,
q6audio_get_port_index(port_id),
param_hdr,
@ -4079,6 +4081,29 @@ static int q6afe_send_enc_config(u16 port_id,
goto exit;
}
}
frame_size_ctl_value_v2 = enc_blk_param.enc_blk_config.
aac_config.frame_ctl_v2.ctl_value;
if (frame_size_ctl_value_v2 > 0) {
param_hdr.param_id =
AFE_PARAM_ID_AAC_FRM_SIZE_CONTROL;
param_hdr.param_size = sizeof(frame_ctl_param);
frame_ctl_param.ctl_type = enc_blk_param.
enc_blk_config.aac_config.frame_ctl_v2.ctl_type;
frame_ctl_param.ctl_value = enc_blk_param.
enc_blk_config.aac_config.frame_ctl_v2.ctl_value;
pr_debug("%s: send AFE_PARAM_ID_AAC_FRM_SIZE_CONTROL V2\n",
__func__);
ret = q6afe_pack_and_set_param_in_band(port_id,
q6audio_get_port_index(port_id),
param_hdr,
(u8 *) &frame_ctl_param);
if (ret) {
pr_err("%s: AAC_FRM_SIZE_CONTROL with VBR support failed %d\n",
__func__, ret);
goto exit;
}
}
}
if (format == ASM_MEDIA_FMT_APTX) {

3
include/dsp/apr_audio-v2.h
View file

@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.
* Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.
*/
@ -4338,6 +4338,7 @@ struct asm_aac_frame_size_control_t {
struct asm_aac_enc_cfg_t {
struct asm_aac_enc_cfg_v2_t aac_cfg;
struct asm_aac_frame_size_control_t frame_ctl;
struct asm_aac_frame_size_control_t frame_ctl_v2;
} __packed;
/* FMT ID for apt-X Classic */