Merge 55b8ced6737234c726c1bbf8d4dadc485eb60e96 on remote branch
Change-Id: I8d45b8105dbf11746213068173a3dc3e8a12607a
diff --git a/sound_trigger_hw.c b/sound_trigger_hw.c
index 1bb9848..e8c37a9 100644
--- a/sound_trigger_hw.c
+++ b/sound_trigger_hw.c
@@ -749,12 +749,14 @@
unsigned int num_sessions = 0;
struct audio_device_info *item = NULL;
- if (config != NULL) {
- ALOGV("%s: Event type = %d", __func__, event_type);
- list_for_each (node, &config->device_info.devices) {
- item = node_to_item(node, struct audio_device_info, list);
- ALOGV("%s: Audio device = 0x%x", __func__, item->type);
- }
+ if (config == NULL) {
+ ALOGE("%s: Config is NULL, exiting", __func__);
+ return;
+ }
+
+ list_for_each (node, &config->device_info.devices) {
+ item = node_to_item(node, struct audio_device_info, list);
+ ALOGV("%s: Audio device = 0x%x", __func__, item->type);
}
/*
diff --git a/sound_trigger_platform.c b/sound_trigger_platform.c
index cded425..ee7a72c 100644
--- a/sound_trigger_platform.c
+++ b/sound_trigger_platform.c
@@ -2191,22 +2191,24 @@
/* Get the last added vendor_info node */
sm_info_node = list_tail(&my_data->stdev->vendor_uuid_list);
- if (sm_info_node) {
+ if (sm_info_node)
sm_info = node_to_item(sm_info_node, struct st_vendor_info, list_node);
- } else {
+
+ if (!sm_info) {
ALOGE("%s: found NULL sm_info", __func__);
- ret = -EINVAL;
- goto err_exit;
+ free(kv_pairs);
+ return -EINVAL;
}
/* Get the last added lsm_params node */
lsm_params_node = list_tail(&sm_info->lsm_usecase_list);
- if (lsm_params_node) {
+ if (lsm_params_node)
lsm_params = node_to_item(lsm_params_node, struct st_lsm_params, list_node);
- } else {
+
+ if (!lsm_params) {
ALOGE("%s: found NULL lsm_params", __func__);
- ret = -EINVAL;
- goto err_exit;
+ free(kv_pairs);
+ return -EINVAL;
}
err = str_parms_get_str(parms, ST_PARAM_KEY_EXECUTION_MODE,
@@ -2453,8 +2455,7 @@
list_remove(module_node);
free(module_params);
}
- if (lsm_params)
- free(lsm_params);
+ free(lsm_params);
free(kv_pairs);
return ret;
}
diff --git a/st_session.c b/st_session.c
index c5f1b31..9533721 100644
--- a/st_session.c
+++ b/st_session.c
@@ -232,7 +232,8 @@
do {
lock_status = pthread_mutex_trylock(&st_ses->lock);
} while (lock_status && !st_ses->det_stc_ses->pending_stop &&
- (st_ses->current_state == buffering_state_fn));
+ (st_ses->current_state == buffering_state_fn) &&
+ !st_ses->stdev->ssr_offline_received);
if (st_ses->det_stc_ses->pending_stop)
ALOGV("%s:[%d] pending stop already queued, ignore event",
@@ -243,6 +244,9 @@
else if (st_ses->current_state != buffering_state_fn)
ALOGV("%s:[%d] session already stopped buffering, ignore event",
__func__, st_ses->sm_handle);
+ else if (st_ses->stdev->ssr_offline_received)
+ ALOGV("%s:[%d] SSR handling in progress, ignore event",
+ __func__, st_ses->sm_handle);
else if (!lock_status)
DISPATCH_EVENT(st_ses, ev, status);
@@ -1659,8 +1663,9 @@
if (c_ses->sm_info.model_id ==
result_info->detected_model_id) {
if (c_ses->state == ST_STATE_ACTIVE) {
- ALOGV("%s: detected c%d", __func__,
- c_ses->sm_handle);
+ ALOGD("%s: detected c%d, 1st stage conf level = %d",
+ __func__, c_ses->sm_handle,
+ result_info->best_confidence_level);
return c_ses;
} else {
ALOGE("%s: detected c%d is not active", __func__,
@@ -4454,6 +4459,13 @@
struct st_hw_ses_config *sthw_cfg = NULL;
int status;
+ sthw_cfg = get_sthw_cfg_for_model_id(hw_ses, model_id);
+ if (sthw_cfg) {
+ ALOGD("%s: Already initialized sthw_cfg with m_id[%d]",
+ __func__, model_id);
+ return 0;
+ }
+
sthw_cfg = calloc(1, sizeof(struct st_hw_ses_config));
if (!sthw_cfg) {
ALOGE("%s: Failed to allocate struct st_hw_ses_config, exiting",
@@ -4778,8 +4790,12 @@
* state.
*/
for (int i = 0; i < REG_SM_RETRY_CNT; i++) {
- status = ret = hw_ses->fptrs->reg_sm(hw_ses, p_info->sm_info.sm_data,
- p_info->sm_info.sm_size, p_info->sm_info.model_id);
+ if (stc_ses->pending_load)
+ status = ret = reg_all_sm(st_ses, hw_ses);
+ else
+ status = ret = hw_ses->fptrs->reg_sm(hw_ses, p_info->sm_info.sm_data,
+ p_info->sm_info.sm_size, p_info->sm_info.model_id);
+
if (ret) {
if (st_ses->stdev->ssr_offline_received) {
STATE_TRANSITION(st_ses, ssr_state_fn);
@@ -6019,8 +6035,6 @@
if (is_any_client_not_pending_load(st_ses))
break;
- reset_clients_pending_load(st_ses);
-
STATE_TRANSITION(st_ses, idle_state_fn);
if ((stc_ses->ssr_transit_exec_mode == ST_EXEC_MODE_CPE) ||
@@ -6028,22 +6042,27 @@
exec_mode_ev.stc_ses = stc_ses;
exec_mode_ev.payload.exec_mode = stc_ses->ssr_transit_exec_mode;
DISPATCH_EVENT(st_ses, exec_mode_ev, status);
- if (status)
+ if (status) {
+ reset_clients_pending_load(st_ses);
break;
+ }
stc_ses->ssr_transit_exec_mode = ST_EXEC_MODE_NONE;
}
active = is_any_client_in_state(st_ses, ST_STATE_ACTIVE);
if (active || is_any_client_in_state(st_ses, ST_STATE_LOADED)) {
load_ev.stc_ses = stc_ses;
DISPATCH_EVENT(st_ses, load_ev, status);
- if (status)
+ if (status) {
+ reset_clients_pending_load(st_ses);
break;
+ }
}
if (active) {
start_ev.stc_ses = stc_ses;
DISPATCH_EVENT(st_ses, start_ev, status);
}
+ reset_clients_pending_load(st_ses);
break;
case ST_SES_EV_LOAD_SM: