Merge "st-hal: reset ec ref mixer path before setting"
diff --git a/sound_trigger_hw.c b/sound_trigger_hw.c
index 6f9b6f1..f677147 100644
--- a/sound_trigger_hw.c
+++ b/sound_trigger_hw.c
@@ -824,8 +824,10 @@
} else {
ALOGV("%s: Ignore capture events as sva has dedicated path", __func__);
}
- pthread_mutex_unlock(&stdev->lock);
- return;
+ if (!conc_allowed) {
+ pthread_mutex_unlock(&stdev->lock);
+ return;
+ }
}
} else {
/*
@@ -842,8 +844,6 @@
p_ses = node_to_item(p_ses_node, st_session_t, list_node);
st_session_pause(p_ses);
}
- pthread_mutex_unlock(&stdev->lock);
- return;
} else {
if (event_type == AUDIO_EVENT_CAPTURE_DEVICE_INACTIVE) {
list_for_each(p_ses_node, &stdev->sound_model_list) {
@@ -863,6 +863,10 @@
}
}
stdev->session_allowed = conc_allowed;
+ if (!conc_allowed) {
+ pthread_mutex_unlock(&stdev->lock);
+ return;
+ }
}
/*
@@ -905,8 +909,6 @@
}
}
- platform_stdev_reset_backend_cfg(stdev->platform);
-
list_for_each(p_ses_node, &stdev->sound_model_list) {
p_ses = node_to_item(p_ses_node, st_session_t, list_node);
if (p_ses && p_ses->exec_mode == ST_EXEC_MODE_ADSP) {
@@ -1113,6 +1115,7 @@
* state so device switch will set up the next session with the
* new device to be started later
*/
+ stdev->reset_backend = true;
switch_device();
pthread_mutex_unlock(&stdev->lock);
@@ -1139,7 +1142,7 @@
st_hw_check_and_update_lpi(stdev, p_ses);
if (stdev->lpi_enable != platform_get_lpi_mode(stdev->platform) &&
- !is_any_session_buffering()) {
+ !is_any_session_buffering() && stdev->session_allowed) {
list_for_each(p_ses_node, &stdev->sound_model_list) {
p_ses = node_to_item(p_ses_node, st_session_t, list_node);
if (p_ses && p_ses->exec_mode == ST_EXEC_MODE_ADSP) {
@@ -1149,8 +1152,6 @@
}
}
- platform_stdev_reset_backend_cfg(stdev->platform);
-
list_for_each(p_ses_node, &stdev->sound_model_list) {
p_ses = node_to_item(p_ses_node, st_session_t, list_node);
if (p_ses && p_ses->exec_mode == ST_EXEC_MODE_ADSP) {
@@ -1192,7 +1193,7 @@
stdev->vad_enable = st_hw_check_vad_support(stdev, p_ses,
stdev->lpi_enable);
if (stdev->lpi_enable != platform_get_lpi_mode(stdev->platform) &&
- !is_any_session_buffering() &&
+ !is_any_session_buffering() && stdev->session_allowed &&
stdev->transit_to_non_lpi_on_battery_charging) {
list_for_each(p_ses_node, &stdev->sound_model_list) {
p_ses = node_to_item(p_ses_node, st_session_t, list_node);
@@ -1203,8 +1204,6 @@
}
}
- platform_stdev_reset_backend_cfg(stdev->platform);
-
list_for_each(p_ses_node, &stdev->sound_model_list) {
p_ses = node_to_item(p_ses_node, st_session_t, list_node);
if (p_ses && p_ses->exec_mode == ST_EXEC_MODE_ADSP) {
diff --git a/sound_trigger_platform.c b/sound_trigger_platform.c
index 4ed912b..4fb305a 100644
--- a/sound_trigger_platform.c
+++ b/sound_trigger_platform.c
@@ -187,6 +187,7 @@
#define ST_PARAM_KEY_SS_SM_TYPE "sm_detection_type"
#define ST_PARAM_KEY_SS_SM_ID "sm_id"
#define ST_PARAM_KEY_SS_LIB "module_lib"
+#define ST_PARAM_KEY_SS_DATA_BEFORE_KW_START "data_before_kw_start"
#define ST_PARAM_KEY_SS_DATA_AFTER_KW_END "data_after_kw_end"
#define ST_BACKEND_PORT_NAME_MAX_SIZE 25
@@ -1680,6 +1681,14 @@
common_params->channel_count = value;
}
+ err = str_parms_get_int(parms, ST_PARAM_KEY_SS_DATA_BEFORE_KW_START, &value);
+ if (err >= 0) {
+ str_parms_del(parms, ST_PARAM_KEY_SS_DATA_BEFORE_KW_START);
+ common_params->data_before_kw_start = value;
+ } else {
+ common_params->data_before_kw_start = VOP_DATA_BEFORE_TRUE_KW_START_MS;
+ }
+
err = str_parms_get_int(parms, ST_PARAM_KEY_SS_DATA_AFTER_KW_END, &value);
if (err >= 0) {
str_parms_del(parms, ST_PARAM_KEY_SS_DATA_AFTER_KW_END);
diff --git a/st_common_defs.h b/st_common_defs.h
index 2beef66..f9a88ca 100644
--- a/st_common_defs.h
+++ b/st_common_defs.h
@@ -1,6 +1,6 @@
/* st_common_defs.h
*
- * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -102,6 +102,7 @@
#define GENERIC_DET_EVENT_HEADER_SIZE (8)
#define FIRST_STAGE_KW_START_TOLERANCE_MS (300)
#define FIRST_STAGE_KW_END_TOLERANCE_MS (240)
+#define VOP_DATA_BEFORE_TRUE_KW_START_MS (360)
#define CNN_DATA_AFTER_TRUE_KW_END_MS (200)
#define GENERIC_DET_EVENT_USER_LEVEL_OFFSET (17)
#define GCS_NON_GENERIC_USER_LEVEL_OFFSET (3)
diff --git a/st_hw_session_lsm.c b/st_hw_session_lsm.c
index 1ff1abc..6ef9673 100644
--- a/st_hw_session_lsm.c
+++ b/st_hw_session_lsm.c
@@ -2,7 +2,7 @@
*
* This file implements the hw session functionality specific to LSM HW
*
- * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -580,7 +580,7 @@
{
st_profile_type_t profile_type;
- profile_type = (p_ses->vendor_uuid_info && !p_ses->stdev->lpi_enable) ?
+ profile_type = (p_ses->vendor_uuid_info && !p_ses->lpi_enable) ?
p_ses->vendor_uuid_info->profile_type : ST_PROFILE_TYPE_NONE;
return profile_type;
}
@@ -1395,7 +1395,8 @@
int status = 0;
struct listnode *node = NULL, *tmp_node = NULL;
st_arm_second_stage_t *st_sec_stage = NULL;
- unsigned int prepend_bytes = 0, cnn_append_bytes = 0, vop_append_bytes = 0;
+ unsigned int cnn_prepend_bytes = 0, vop_prepend_bytes = 0;
+ unsigned int cnn_append_bytes = 0, vop_append_bytes = 0;
unsigned int kw_duration_bytes = 0;
bool real_time_check = true;
uint64_t frame_receive_time = 0, frame_send_time = 0;
@@ -1415,10 +1416,6 @@
st_buffer_reset(p_lsm_ses->common.buffer);
if (p_lsm_ses->common.enable_second_stage) {
- prepend_bytes =
- convert_ms_to_bytes(
- p_lsm_ses->common.vendor_uuid_info->kw_start_tolerance,
- &p_lsm_ses->common.config);
if (p_lsm_ses->common.sthw_cfg.client_req_hist_buf) {
kw_duration_bytes =
convert_ms_to_bytes(
@@ -1446,15 +1443,20 @@
* detections. Similarly, error tolerance is added to the end of the
* buffer for generic and non generic detection event usecases.
*/
- if (p_lsm_ses->common.kw_start_idx > prepend_bytes) {
- st_sec_stage->ss_session->buf_start =
- p_lsm_ses->common.kw_start_idx - prepend_bytes;
- } else {
- st_sec_stage->ss_session->buf_start = 0;
- }
-
if (st_sec_stage->ss_info->sm_detection_type ==
ST_SM_TYPE_KEYWORD_DETECTION) {
+ cnn_prepend_bytes =
+ convert_ms_to_bytes(
+ p_lsm_ses->common.vendor_uuid_info->kw_start_tolerance,
+ &p_lsm_ses->common.config);
+
+ if (p_lsm_ses->common.kw_start_idx > cnn_prepend_bytes) {
+ st_sec_stage->ss_session->buf_start =
+ p_lsm_ses->common.kw_start_idx - cnn_prepend_bytes;
+ } else {
+ st_sec_stage->ss_session->buf_start = 0;
+ }
+
cnn_append_bytes =
convert_ms_to_bytes(
(p_lsm_ses->common.vendor_uuid_info->kw_end_tolerance +
@@ -1479,6 +1481,18 @@
st_sec_stage->ss_session->det_status = KEYWORD_DETECTION_PENDING;
} else if (st_sec_stage->ss_info->sm_detection_type ==
ST_SM_TYPE_USER_VERIFICATION) {
+ vop_prepend_bytes =
+ convert_ms_to_bytes(
+ st_sec_stage->ss_info->data_before_kw_start,
+ &p_lsm_ses->common.config);
+
+ if (p_lsm_ses->common.kw_start_idx > vop_prepend_bytes) {
+ st_sec_stage->ss_session->buf_start =
+ p_lsm_ses->common.kw_start_idx - vop_prepend_bytes;
+ } else {
+ st_sec_stage->ss_session->buf_start = 0;
+ }
+
vop_append_bytes =
convert_ms_to_bytes(
p_lsm_ses->common.vendor_uuid_info->kw_end_tolerance,
@@ -2504,7 +2518,8 @@
goto error_exit;
}
- if (!p_ses->stdev->lpi_enable && !p_ses->stdev->barge_in_mode) {
+ if (!p_ses->stdev->lpi_enable && !p_ses->stdev->barge_in_mode &&
+ p_ses->stdev->support_barge_in_mode) {
status = platform_stdev_update_ec_effect(p_ses->stdev->platform,
false);
if (status) {
@@ -3936,7 +3951,8 @@
goto exit_1;
}
- if (!p_ses->stdev->lpi_enable && !p_ses->stdev->barge_in_mode) {
+ if (!p_ses->stdev->lpi_enable && !p_ses->stdev->barge_in_mode &&
+ p_ses->stdev->support_barge_in_mode) {
status = platform_stdev_update_ec_effect(p_ses->stdev->platform,
false);
if (status) {
diff --git a/st_second_stage.h b/st_second_stage.h
index fee487d..6a15e81 100644
--- a/st_second_stage.h
+++ b/st_second_stage.h
@@ -4,7 +4,7 @@
* abstraction represents a single st second stage session from the st session
* perspective.
*
- * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -70,6 +70,7 @@
unsigned int sample_rate;
unsigned int bit_width;
unsigned int channel_count;
+ unsigned int data_before_kw_start;
unsigned int data_after_kw_end;
}st_second_stage_info_t;
diff --git a/st_session.c b/st_session.c
index 732125f..9bb1c09 100644
--- a/st_session.c
+++ b/st_session.c
@@ -4,7 +4,7 @@
* user session. This state machine implements logic for handling all user
* interactions, detectinos, SSR and Audio Concurencies.
*
- * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -2512,6 +2512,7 @@
hw_ses->lpi_enable = hw_ses->stdev->lpi_enable;
hw_ses->barge_in_mode = hw_ses->stdev->barge_in_mode;
do_unload = true;
+ platform_stdev_reset_backend_cfg(hw_ses->stdev->platform);
}
/*
@@ -3298,13 +3299,6 @@
}
}
} else {
- local_event = calloc(1, sizeof(*local_event) + payload_size);
- if (!local_event) {
- ALOGE("%s: event allocation failed, size %zd", __func__,
- payload_size);
- status = -ENOMEM;
- goto exit;
- }
memcpy(local_event->phrase_extras,
stc_ses->rc_config->phrases, stc_ses->rc_config->num_phrases *
sizeof(struct sound_trigger_phrase_recognition_extra));