commit ea5a0b4c7f7e99d77f24acd3ec0d19d3a41b7e10
author Zhou Song <zhous@codeaurora.org> Mon Jan 06 18:16:29 2020 +0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Mar 16 01:33:27 2020 -0700
tree a07d8e367ef7cbbdf7a850d319a49d234568c67d
parent 02bc7cf035ed24420e0b161f711f6d29b59d3ec1

st-hal: reset ec ref mixer path before setting

In case of concurrency, reset ec ref mixer path before
setting if already enabled previously. This will ensure
that the controls are set to driver.

Change-Id: I28a400e22c317c29b167312fb345538bc1e43e1c

sound_trigger_hw.h

diff --git a/sound_trigger_hw.h b/sound_trigger_hw.h
index 7e139c8..d1d725e 100644
--- a/sound_trigger_hw.h
+++ b/sound_trigger_hw.h
@@ -265,6 +265,7 @@
     bool support_dynamic_ec_update;
     bool screen_off;
     bool barge_in_mode;
+    int ec_reset_pending_cnt;
 };
 
 typedef struct sound_trigger_device sound_trigger_device_t;

sound_trigger_platform.c

diff --git a/sound_trigger_platform.c b/sound_trigger_platform.c
index 78dd82c..4ed912b 100644
--- a/sound_trigger_platform.c
+++ b/sound_trigger_platform.c
@@ -742,6 +742,7 @@
     stdev->platform_lpi_enable = ST_PLATFORM_LPI_NONE;
     stdev->screen_off = true;
     stdev->support_dynamic_ec_update = true;
+    stdev->ec_reset_pending_cnt = 0;
 
     platform->cpe_fe_to_be_fixed = true;
     platform->bad_mic_channel_index = 0;
@@ -5681,6 +5682,12 @@
 
     if (is_ec_profile(profile_type)) {
         event_info.st_ec_ref_enabled = enable;
+        // reset the pending active EC mixer ctls first
+        if (!stdev->audio_ec_enabled && stdev->ec_reset_pending_cnt > 0) {
+            while (stdev->ec_reset_pending_cnt--)
+                audio_route_reset_and_update_path(stdev->audio_route,
+                        my_data->ec_ref_mixer_path);
+        }
         if (enable) {
             stdev->audio_hal_cb(ST_EVENT_UPDATE_ECHO_REF, &event_info);
             strlcpy(my_data->ec_ref_mixer_path, "echo-reference",
@@ -5701,6 +5708,7 @@
                 audio_route_reset_and_update_path(stdev->audio_route,
                         my_data->ec_ref_mixer_path);
             } else {
+                stdev->ec_reset_pending_cnt++;
                 ALOGD("%s: audio hal has already enabled EC", __func__);
             }
         }