commit 04387d052b25af9af276e33e2c1b34c334413406
author Eric Laurent <elaurent@google.com> Thu Apr 18 19:15:42 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 18 19:15:42 2019 +0000
tree 3d4345fa843286ce6e64f8b146e76345ec17dfee
parent 1a32f5e7f2deef611cb8566f9069589a62396fba
parent f69b0d0f1b2f3ea236961ca2c15ef8bec8087f26

Merge "voice processing: support several sessions per input stream" into qt-dev

hal/audio_extn/audiozoom.c

diff --git a/hal/audio_extn/audiozoom.c b/hal/audio_extn/audiozoom.c
index 86d53b4..73e4862 100644
--- a/hal/audio_extn/audiozoom.c
+++ b/hal/audio_extn/audiozoom.c
@@ -31,7 +31,6 @@
 #include <resolv.h>
 
 #define AUDIOZOOM_PRESET_FILE "/vendor/etc/audiozoom.xml"
-#define MIN_BUFSIZE 8
 
 typedef struct qdsp_audiozoom_cfg {
     uint32_t             topo_id;
@@ -190,8 +189,9 @@
 {
     struct audio_device *adev = in->dev;
     struct str_parms *parms = str_parms_create();
-    uint8_t value[MIN_BUFSIZE] = {0};
-    char data[MIN_BUFSIZE * 2] = {0};
+    /* The encoding process in b64_ntop represents 24-bit groups of input bits
+       as output strings of 4 encoded characters. */
+    char data[((sizeof(zoom) + 2) / 3) * 4 + 1] = {0};
     int32_t ret;
 
     if (zoom > 1.0 || zoom < 0)
@@ -208,10 +208,7 @@
     str_parms_add_int(parms, "cal_instanceid", qdsp_audiozoom.instance_id);
     str_parms_add_int(parms, "cal_paramid", qdsp_audiozoom.zoom_param_id);
 
-    zoom *= 255;
-    value[0] = (uint8_t) zoom; /* Valid value is 0 to 255 */
-
-    ret = b64_ntop(value, sizeof(value), data, sizeof(data));
+    ret = b64_ntop((uint8_t*)&zoom, sizeof(zoom), data, sizeof(data));
     if (ret > 0) {
         str_parms_add_str(parms, "cal_data", data);