audio hal: temporary fix for speaker device ref counting issue am: 3c1e4b7721
am: 821c20cce0
Change-Id: Ibfd17b4c5a02a2f4048801da06597c497bb6bf61
diff --git a/hal/Android.mk b/hal/Android.mk
index 923879c..58a79fb 100644
--- a/hal/Android.mk
+++ b/hal/Android.mk
@@ -10,7 +10,7 @@
ifneq ($(filter msm8960,$(TARGET_BOARD_PLATFORM)),)
LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="2"
endif
-ifneq ($(filter msm8974 msm8226 msm8084 msm8992 msm8994 msm8996 msm8998,$(TARGET_BOARD_PLATFORM)),)
+ifneq ($(filter msm8974 msm8226 msm8084 msm8992 msm8994 msm8996 msm8998 sdm845,$(TARGET_BOARD_PLATFORM)),)
# B-family platform uses msm8974 code base
AUDIO_PLATFORM = msm8974
ifneq ($(filter msm8974,$(TARGET_BOARD_PLATFORM)),)
@@ -47,6 +47,12 @@
LOCAL_CFLAGS += -DKPI_OPTIMIZE_ENABLED
MULTIPLE_HW_VARIANTS_ENABLED := true
endif
+ifneq ($(filter sdm845,$(TARGET_BOARD_PLATFORM)),)
+ LOCAL_CFLAGS := -DPLATFORM_SDM845
+ LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="4"
+ LOCAL_CFLAGS += -DKPI_OPTIMIZE_ENABLED
+ MULTIPLE_HW_VARIANTS_ENABLED := true
+endif
endif
ifneq ($(filter msm8916 msm8909 msm8952,$(TARGET_BOARD_PLATFORM)),)
@@ -149,7 +155,7 @@
LOCAL_SRC_FILES += audio_extn/dsm_feedback.c
endif
-ifneq ($(filter msm8992 msm8994 msm8996 msm8998,$(TARGET_BOARD_PLATFORM)),)
+ifneq ($(filter msm8992 msm8994 msm8996 msm8998 sdm845,$(TARGET_BOARD_PLATFORM)),)
# push codec/mad calibration to HW dep node
# applicable to msm8992/8994 or newer platforms
LOCAL_CFLAGS += -DHWDEP_CAL_ENABLED
diff --git a/hal/audio_extn/audio_extn.h b/hal/audio_extn/audio_extn.h
index c7d6768..2ca76fa 100644
--- a/hal/audio_extn/audio_extn.h
+++ b/hal/audio_extn/audio_extn.h
@@ -81,7 +81,7 @@
#define audio_extn_usb_is_capture_supported() (false)
#define audio_extn_usb_get_max_channels(dir) (0)
#define audio_extn_usb_get_max_bit_width(dir) (0)
-#define audio_extn_usb_sup_sample_rates(t, s, l) (0)
+#define audio_extn_usb_sup_sample_rates(t, s, l) ((t), (s), (l), 0) /* fix unused warn */
#define audio_extn_usb_alive(adev) (false)
#else
void audio_extn_usb_init(void *adev);
diff --git a/hal/audio_extn/spkr_protection.c b/hal/audio_extn/spkr_protection.c
index 8afb0dc..57b0f53 100644
--- a/hal/audio_extn/spkr_protection.c
+++ b/hal/audio_extn/spkr_protection.c
@@ -304,6 +304,7 @@
int32_t pcm_dev_rx_id = -1, pcm_dev_tx_id = -1;
struct timespec ts;
int retry_duration;
+ int app_type = 0;
if (!adev) {
ALOGE("%s: Invalid params", __func__);
@@ -472,7 +473,20 @@
handle.pcm_tx = NULL;
/* Clear TX calibration to handset mic */
- platform_send_audio_calibration(adev->platform, SND_DEVICE_IN_HANDSET_MIC);
+ if (platform_supports_app_type_cfg()) {
+ ALOGD("%s: Platform supports APP type configuration, using V2\n", __func__);
+ if (uc_info_tx != NULL) {
+ ALOGD("%s: UC Info TX is not NULL, updating and sending calibration\n", __func__);
+ uc_info_tx->in_snd_device = SND_DEVICE_IN_HANDSET_MIC;
+ uc_info_tx->out_snd_device = SND_DEVICE_NONE;
+ platform_get_default_app_type_v2(adev->platform, PCM_CAPTURE, &app_type);
+ platform_send_audio_calibration_v2(adev->platform, uc_info_tx,
+ app_type, 8000);
+ }
+ } else {
+ ALOGW("%s: Platform does NOT support APP type configuration, using V1\n", __func__);
+ platform_send_audio_calibration(adev->platform, SND_DEVICE_IN_HANDSET_MIC);
+ }
if (!status.status) {
protCfg.mode = MSM_SPKR_PROT_CALIBRATED;
protCfg.r0[SP_V2_SPKR_1] = status.r0[SP_V2_SPKR_1];
@@ -804,6 +818,7 @@
struct audio_usecase *uc_info_tx;
struct audio_device *adev = handle.adev_handle;
int32_t pcm_dev_tx_id = -1, ret = 0;
+ int app_type = 0;
ALOGV("%s: Entry", __func__);
if (!adev) {
@@ -855,7 +870,20 @@
exit:
/* Clear VI feedback cal and replace with handset MIC */
- platform_send_audio_calibration(adev->platform, SND_DEVICE_IN_HANDSET_MIC);
+ if (platform_supports_app_type_cfg()) {
+ ALOGD("%s: Platform supports APP type configuration, using V2\n", __func__);
+ if (uc_info_tx != NULL) {
+ ALOGD("%s: UC Info TX is not NULL, updating and sending calibration\n", __func__);
+ uc_info_tx->in_snd_device = SND_DEVICE_IN_HANDSET_MIC;
+ uc_info_tx->out_snd_device = SND_DEVICE_NONE;
+ platform_get_default_app_type_v2(adev->platform, PCM_CAPTURE, &app_type);
+ platform_send_audio_calibration_v2(adev->platform, uc_info_tx,
+ app_type, 8000);
+ }
+ } else {
+ ALOGW("%s: Platform does not support APP type configuration, using V1\n", __func__);
+ platform_send_audio_calibration(adev->platform, SND_DEVICE_IN_HANDSET_MIC);
+ }
if (ret) {
if (handle.pcm_tx)
pcm_close(handle.pcm_tx);
diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 7267931..651df95 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -999,9 +999,9 @@
return ret;
}
-static ssize_t read_usb_sup_sample_rates(bool is_playback __unused,
- uint32_t *supported_sample_rates __unused,
- uint32_t max_rates __unused)
+static ssize_t read_usb_sup_sample_rates(bool is_playback,
+ uint32_t *supported_sample_rates,
+ uint32_t max_rates)
{
ssize_t count = audio_extn_usb_sup_sample_rates(is_playback,
supported_sample_rates,
@@ -3999,6 +3999,7 @@
out->error_log = NULL;
pthread_cond_destroy(&out->cond);
+ pthread_mutex_destroy(&out->pre_lock);
pthread_mutex_destroy(&out->lock);
free(stream);
ALOGV("%s: exit", __func__);
@@ -4544,6 +4545,9 @@
error_log_destroy(in->error_log);
in->error_log = NULL;
+ pthread_mutex_destroy(&in->pre_lock);
+ pthread_mutex_destroy(&in->lock);
+
free(stream);
return;
@@ -4711,6 +4715,7 @@
}
if (adev->adm_deinit)
adev->adm_deinit(adev->adm_data);
+ pthread_mutex_destroy(&adev->lock);
free(device);
}
diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c
index c113eca..adcb26f 100644
--- a/hal/msm8916/platform.c
+++ b/hal/msm8916/platform.c
@@ -485,6 +485,7 @@
{TO_NAME_INDEX(USECASE_VOICEMMODE1_CALL)},
{TO_NAME_INDEX(USECASE_VOICEMMODE2_CALL)},
{TO_NAME_INDEX(USECASE_AUDIO_HFP_SCO)},
+ {TO_NAME_INDEX(USECASE_AUDIO_HFP_SCO_WB)},
{TO_NAME_INDEX(USECASE_AUDIO_SPKR_CALIB_TX)},
};
diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 3b1d4d5..01de9b3 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -30,7 +30,7 @@
#include "platform.h"
#include "audio_extn.h"
#include <linux/msm_audio.h>
-#if defined (PLATFORM_MSM8996) || (PLATFORM_MSM8998)
+#if defined (PLATFORM_MSM8996) || (PLATFORM_MSM8998) || (PLATFORM_SDM845)
#include <sound/devdep_params.h>
#endif
@@ -120,7 +120,7 @@
bool speaker_lr_swap;
void *acdb_handle;
-#if defined (PLATFORM_MSM8994) || (PLATFORM_MSM8996) || (PLATFORM_MSM8998)
+#if defined (PLATFORM_MSM8994) || (PLATFORM_MSM8996) || (PLATFORM_MSM8998) || (PLATFORM_SDM845)
acdb_init_v2_cvd_t acdb_init;
#elif defined (PLATFORM_MSM8084)
acdb_init_v2_t acdb_init;
@@ -720,7 +720,7 @@
inline bool platform_supports_app_type_cfg()
{
-#ifdef PLATFORM_MSM8998
+#if defined (PLATFORM_MSM8998) || (PLATFORM_SDM845)
return true;
#else
return false;
@@ -1141,7 +1141,7 @@
return 0;
}
-#if defined (PLATFORM_MSM8994) || (PLATFORM_MSM8996) || (PLATFORM_MSM8998)
+#if defined (PLATFORM_MSM8994) || (PLATFORM_MSM8996) || (PLATFORM_MSM8998) || (PLATFORM_SDM845)
char *cvd_version = calloc(1, MAX_CVD_VERSION_STRING_SIZE);
if (!cvd_version)
ALOGE("failed to allocate cvd_version");
@@ -1467,7 +1467,7 @@
ALOGV("%s: Could not find the symbol acdb_loader_send_gain_dep_cal from %s",
__func__, LIB_ACDB_LOADER);
-#if defined (PLATFORM_MSM8994) || (PLATFORM_MSM8996) || (PLATFORM_MSM8998)
+#if defined (PLATFORM_MSM8994) || (PLATFORM_MSM8996) || (PLATFORM_MSM8998) || (PLATFORM_SDM845)
acdb_init_v2_cvd_t acdb_init_local;
acdb_init_local = (acdb_init_v2_cvd_t)dlsym(my_data->acdb_handle,
"acdb_loader_init_v2");
@@ -4107,7 +4107,7 @@
int platform_get_mmap_data_fd(void *platform __unused, int fe_dev __unused, int dir __unused,
int *fd __unused, uint32_t *size __unused)
{
-#if defined (PLATFORM_MSM8996) || (PLATFORM_MSM8998)
+#if defined (PLATFORM_MSM8996) || (PLATFORM_MSM8998) || (PLATFORM_SDM845)
struct platform_data *my_data = (struct platform_data *)platform;
struct audio_device *adev = my_data->adev;
int hw_fd = -1;