Enable LDAC in the build

Permit LDAC to be enabled independenly of LHDC
Fix a bug/oversight in bt_sbc_player which caused system frequencies above 52M to be ignored
This commit is contained in:
nicka101 2024-05-10 02:10:31 +02:00 committed by Nick Anstee
parent 61f736b66b
commit 839d513367
2 changed files with 9 additions and 3 deletions

View File

@ -228,7 +228,7 @@ A2DP_LHDC_LARC ?= 1
export FLASH_UNIQUE_ID ?= 1 export FLASH_UNIQUE_ID ?= 1
endif endif
A2DP_LDAC_ON ?= 0 A2DP_LDAC_ON ?= 1
export TX_RX_PCM_MASK ?= 0 export TX_RX_PCM_MASK ?= 0
@ -343,6 +343,8 @@ export BT_EXT_PA ?=0
ifeq ($(A2DP_LHDC_ON),1) ifeq ($(A2DP_LHDC_ON),1)
AUDIO_BUFFER_SIZE := 140*1024 AUDIO_BUFFER_SIZE := 140*1024
else ifeq ($(A2DP_LDAC_ON),1)
AUDIO_BUFFER_SIZE := 140*1024
else else
AUDIO_BUFFER_SIZE := 100*1024 AUDIO_BUFFER_SIZE := 100*1024
endif endif

View File

@ -3866,7 +3866,9 @@ int bt_sbc_player(enum PLAYER_OPER_T on, enum APP_SYSFREQ_FREQ_T freq) {
} }
#endif #endif
#endif #endif
freq = APP_SYSFREQ_52M; if (freq < APP_SYSFREQ_52M) {
freq = APP_SYSFREQ_52M;
}
app_sysfreq_req(APP_SYSFREQ_USER_BT_A2DP, freq); app_sysfreq_req(APP_SYSFREQ_USER_BT_A2DP, freq);
TRACE_AUD_STREAM_I("[A2DP_PLAYER] sysfreq %d", freq); TRACE_AUD_STREAM_I("[A2DP_PLAYER] sysfreq %d", freq);
TRACE_AUD_STREAM_I("[A2DP_PLAYER] sysfreq calc : %d\n", TRACE_AUD_STREAM_I("[A2DP_PLAYER] sysfreq calc : %d\n",
@ -3886,8 +3888,10 @@ int bt_sbc_player(enum PLAYER_OPER_T on, enum APP_SYSFREQ_FREQ_T freq) {
else if (codec_type == BTIF_AVDTP_CODEC_TYPE_NON_A2DP) { else if (codec_type == BTIF_AVDTP_CODEC_TYPE_NON_A2DP) {
TRACE(1, "current_a2dp_non_type %d", current_a2dp_non_type); TRACE(1, "current_a2dp_non_type %d", current_a2dp_non_type);
if (0) {
}
#if defined(A2DP_LHDC_ON) #if defined(A2DP_LHDC_ON)
if (current_a2dp_non_type == A2DP_NON_CODEC_TYPE_LHDC) { else if (current_a2dp_non_type == A2DP_NON_CODEC_TYPE_LHDC) {
app_overlay_select(APP_OVERLAY_A2DP_LHDC); app_overlay_select(APP_OVERLAY_A2DP_LHDC);
} }
#endif #endif