commit ed3c0fdecb72890240d52a8ba3b5ecd05331736a
author SathishKumar Mani <smani@codeaurora.org> Fri Sep 21 10:31:40 2012 -0700
committer Iliyan Malchev <malchev@google.com> Mon Sep 24 18:22:39 2012 -0700
tree 8c197f1a44067bb6016a21cb79841c5054e10840
parent 639ce754c700a46d191ef114afd1fdfc44fb80a5

alsa_sound: Correct the input buffer size computation

- getInputBufferSize() expects the input channelCount to
  compute the buffer size but not the channelMask.
- Removed the condition check to allow opening multple
  input streams.

Change-Id: I927f2ed0423353a164d907035adfd883c5dae556
Bug-id: 7184317

alsa_sound/AudioHardwareALSA.cpp

diff --git a/alsa_sound/AudioHardwareALSA.cpp b/alsa_sound/AudioHardwareALSA.cpp
index 71b944c..9aacc2f 100644
--- a/alsa_sound/AudioHardwareALSA.cpp
+++ b/alsa_sound/AudioHardwareALSA.cpp
@@ -1112,42 +1112,7 @@
         ALOGD("openInput: After Get alsahandle");
         if (status) *status = err;
         return in;
-      } else
-      {
-        for(ALSAHandleList::iterator itDev = mDeviceList.begin();
-              itDev != mDeviceList.end(); ++itDev)
-        {
-            if((0 == strncmp(itDev->useCase, SND_USE_CASE_VERB_HIFI_REC, MAX_UC_LEN))
-              ||(0 == strncmp(itDev->useCase, SND_USE_CASE_MOD_CAPTURE_MUSIC, MAX_UC_LEN))
-              ||(0 == strncmp(itDev->useCase, SND_USE_CASE_VERB_HIFI_LOWLATENCY_REC, MAX_UC_LEN))
-              ||(0 == strncmp(itDev->useCase, SND_USE_CASE_MOD_CAPTURE_LOWLATENCY_MUSIC, MAX_UC_LEN))
-              ||(0 == strncmp(itDev->useCase, SND_USE_CASE_MOD_CAPTURE_FM, MAX_UC_LEN))
-#ifdef QCOM_FM_ENABLED
-              ||(0 == strncmp(itDev->useCase, SND_USE_CASE_VERB_FM_REC, MAX_UC_LEN))
-#endif
-              )
-            {
-#ifdef QCOM_FM_ENABLED
-                if(!(devices == AudioSystem::DEVICE_IN_FM_RX_A2DP)){
-                    ALOGD("Input stream already exists, new stream not permitted: useCase:%s, devices:0x%x, module:%p",
-                        itDev->useCase, itDev->devices, itDev->module);
-                    return in;
-                }
-#endif
-            }
-#ifdef QCOM_FM_ENABLED
-        else if ((0 == strncmp(itDev->useCase, SND_USE_CASE_VERB_FM_A2DP_REC, MAX_UC_LEN))
-                ||(0 == strncmp(itDev->useCase, SND_USE_CASE_MOD_CAPTURE_A2DP_FM, MAX_UC_LEN)))
-             {
-                 if((devices == AudioSystem::DEVICE_IN_FM_RX_A2DP)){
-                     ALOGD("Input stream already exists, new stream not permitted: useCase:%s, devices:0x%x, module:%p",
-                         itDev->useCase, itDev->devices, itDev->module);
-                     return in;
-                 }
-             }
-#endif
-        }
-
+      } else {
         alsa_handle_t alsa_handle;
         unsigned long bufferSize = DEFAULT_IN_BUFFER_SIZE;