commit f53219daeff09c5447a9449d1ae4cefb2f15f4f1
author Linux Build Service Account <lnxbuild@localhost> Tue Apr 28 00:53:22 2020 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Apr 28 00:53:22 2020 -0700
tree 35a6a419b97d12d8e306ec30a44483da8b0c0dc0
parent cb7fba765978fe1a29156eae0047d79fd2525d3d
parent 7bf9fc35c59bd2fab0b298f65c46b0f97b4a3f02

Merge "st-hal: read preroll and history buffer config independently"

st_hw_common.c

diff --git a/st_hw_common.c b/st_hw_common.c
index 3c31a2c..e0dab3d 100644
--- a/st_hw_common.c
+++ b/st_hw_common.c
@@ -3,7 +3,7 @@
  * This file contains common functionality between
  * sound trigger hw and sound trigger extension interface.
  *
- * Copyright (c) 2016, 2018-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016, 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
@@ -414,27 +414,24 @@
     hist_buf = (struct st_hist_buffer_info *) payload_buf;
     hist_buf->version = DEFAULT_CUSTOM_CONFIG_MINOR_VERSION;
 
+    hist_buf->pre_roll_duration_msec = p_ses->sthw_cfg.client_req_preroll;
+
+    if (p_ses->is_generic_event &&
+            p_ses->sthw_cfg.client_req_preroll < PREROLL_LEN_WARNING)
+        ALOGW("%s: Client requested small preroll length %dms",
+              __func__, p_ses->sthw_cfg.client_req_preroll);
+
     if (p_ses->sthw_cfg.client_req_hist_buf > 0) {
         hist_buf->hist_buffer_duration_msec =
             p_ses->sthw_cfg.client_req_hist_buf;
-        hist_buf->pre_roll_duration_msec = p_ses->sthw_cfg.client_req_preroll;
 
-        if (p_ses->is_generic_event) {
-            if (p_ses->sthw_cfg.client_req_hist_buf <=
-                (p_ses->sthw_cfg.client_req_preroll + KW_LEN_WARNING))
-                ALOGW("%s: Client hist buf and preroll lens leave only"
-                      "%dms for keyword", __func__,
-                      (p_ses->sthw_cfg.client_req_hist_buf -
-                       p_ses->sthw_cfg.client_req_preroll));
-
-            if (p_ses->sthw_cfg.client_req_preroll < PREROLL_LEN_WARNING)
-                ALOGW("%s: Client requested small preroll length %dms",
-                    __func__, p_ses->sthw_cfg.client_req_preroll);
-        }
+        if (p_ses->is_generic_event &&
+                p_ses->sthw_cfg.client_req_hist_buf <= KW_LEN_WARNING)
+                ALOGW("%s: Client requested small hist buf length %dms",
+                      __func__, p_ses->sthw_cfg.client_req_hist_buf);
     } else {
         hist_buf->hist_buffer_duration_msec =
             p_ses->vendor_uuid_info->kw_duration;
-        hist_buf->pre_roll_duration_msec = 0;
     }
     ALOGD("%s: history buf duration %d, preroll %d", __func__,
           hist_buf->hist_buffer_duration_msec,