commit 2e6f6244a8723b6fdb65fd8c1b89c4cd5aeec4c2
author Nikhil Latukar <nlatur@codeaurora.org> Tue Aug 15 13:37:07 2017 +0530
committer Garmond Leung <garmondl@codeaurora.org> Wed Sep 13 16:15:12 2017 -0700
tree 2ff9e167a8c6b605a5ba8780f75339ea5dd2ad88
parent 6ceda20bace7be189833560b97baa5d7fb4f456a

audio: hal: Fix incorrect boundary check for intereactive audio

Fix incorrect boundary check for pan/scale/downmix controls.
Fix be_id being overridden because of incorrect indexing.

Change-Id: I96a2919a0a3df18a0cbaed48f27c1be43cdc68c8
CRs-fixed: 2091555

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 23f4d7d..0eab3e6 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -5026,7 +5026,7 @@
     }
 
     /* Init use case and pcm_config */
-#ifndef COMPRESS_VOIP_ENABLED
+#ifndef COMPRES_ENABLED
     if (out->flags == (AUDIO_OUTPUT_FLAG_DIRECT | AUDIO_OUTPUT_FLAG_VOIP_RX) &&
         (out->sample_rate == 8000 || out->sample_rate == 16000 ||
          out->sample_rate == 32000 || out->sample_rate == 48000)) {
@@ -5039,7 +5039,7 @@
         out->config.rate = out->sample_rate;
 
 #else
-    if ((out->dev->mode == AUDIO_MODE_IN_COMMUNICATION || voice_extn_compress_voip_is_active(out->dev)) &&
+    } else if ((out->dev->mode == AUDIO_MODE_IN_COMMUNICATION || voice_extn_compress_voip_is_active(out->dev)) &&
                (out->flags == (AUDIO_OUTPUT_FLAG_DIRECT | AUDIO_OUTPUT_FLAG_VOIP_RX)) &&
                (voice_extn_compress_voip_is_config_supported(config))) {
         ret = voice_extn_compress_voip_open_output_stream(out);