diff options
| author | rioskao <rioskao@google.com> | 2019-06-13 12:42:12 +0800 |
|---|---|---|
| committer | Roger Fang <rogerfang@google.com> | 2019-06-13 05:14:41 +0000 |
| commit | 629ba3e02279bf95099f2e1ec49f85e65753ee8e (patch) | |
| tree | fd9ac1590094523b738b68c7b04f3e3924c9a9de | |
| parent | 0d7433fb2df1e8609c4c093f9b8a819b54bbdec4 (diff) | |
| download | android_hardware_knowles_athletico_sound_trigger_hal-629ba3e02279bf95099f2e1ec49f85e65753ee8e.tar.gz android_hardware_knowles_athletico_sound_trigger_hal-629ba3e02279bf95099f2e1ec49f85e65753ee8e.tar.bz2 android_hardware_knowles_athletico_sound_trigger_hal-629ba3e02279bf95099f2e1ec49f85e65753ee8e.zip | |
sthal: adjust buffer package to meet oslo flow
Note: The buffer package needs to meet oslo start/
stop flow to avoid from race condition.
Test: Stress Oslo on/off
Bug: 135152343
Change-Id: If9317617e00c28852839f432fdfb4e9a0ab2cf6e
| -rw-r--r-- | sound_trigger_hw_iaxxx.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sound_trigger_hw_iaxxx.c b/sound_trigger_hw_iaxxx.c index fd1d6d4..e8ad4c0 100644 --- a/sound_trigger_hw_iaxxx.c +++ b/sound_trigger_hw_iaxxx.c @@ -1620,6 +1620,13 @@ static int start_sensor_model(struct knowles_sound_trigger_device * stdev) } } + // setup the sensor route + err = check_and_setup_buffer_package(stdev); + if (err != 0) { + ALOGE("%s: ERROR: Failed to load the buffer package", __func__); + goto exit; + } + if(stdev->is_sensor_route_enabled == false) { err = setup_sensor_package(stdev->odsp_hdl); if (err) { @@ -2116,13 +2123,6 @@ static int stdev_load_sound_model(const struct sound_trigger_hw_device *dev, stdev->models[i].kw_id = ENTITY_KW_ID; } else if (check_uuid_equality(stdev->models[i].uuid, stdev->sensor_model_uuid)) { - // setup the sensor route - ret = check_and_setup_buffer_package(stdev); - if (ret != 0) { - ALOGE("%s: ERROR: Failed to load the buffer package", __func__); - goto exit; - } - ret = start_sensor_model(stdev); if (ret) { ALOGE("%s: ERROR: Failed to start sensor model", __func__); |