commit d97aa3706a3a00f513307fca7465e269079d97ad
author Steve Kondik <shade@chemlab.org> Wed Sep 25 17:19:52 2013 -0700
committer Steve Kondik <shade@chemlab.org> Wed Sep 25 17:19:52 2013 -0700
tree 46cf225ed545fa129de0082825c83f810868fa8c
parent 824f5b37c3e61b7bd52b4103b88e515569d001f9

alsa_source: Undo the proxy/latency changes

 * This change causes problems on 4.3, revert it all.

Change-Id: I1d703e379fa9949fb4d8d51c59515acf68a97793

alsa_sound/ALSADevice.cpp

diff --git a/alsa_sound/ALSADevice.cpp b/alsa_sound/ALSADevice.cpp
index b87fd4b..240a492 100644
--- a/alsa_sound/ALSADevice.cpp
+++ b/alsa_sound/ALSADevice.cpp
@@ -2673,7 +2673,6 @@
         }
 
         mProxyParams.mAvail = pcm_avail(capture_handle);
-        mAvailInMs = (mProxyParams.mAvail*1000)/(AFE_PROXY_SAMPLE_RATE);
         ALOGV("avail is = %d frames = %ld, avai_min = %d\n",\
                       mProxyParams.mAvail,  mProxyParams.mFrames,(int)capture_handle->sw_p->avail_min);
         if (mProxyParams.mAvail < capture_handle->sw_p->avail_min) {

alsa_sound/AudioHardwareALSA.h

diff --git a/alsa_sound/AudioHardwareALSA.h b/alsa_sound/AudioHardwareALSA.h
index 0a96166..15294e5 100644
--- a/alsa_sound/AudioHardwareALSA.h
+++ b/alsa_sound/AudioHardwareALSA.h
@@ -352,7 +352,6 @@
     int mADSPState;
     bool mSSRComplete;
     int mCurDevice;
-    long mAvailInMs;
 protected:
     friend class AudioHardwareALSA;
 private:

alsa_sound/AudioSessionOut.cpp

diff --git a/alsa_sound/AudioSessionOut.cpp b/alsa_sound/AudioSessionOut.cpp
index 6e5d31c..01c9d88 100644
--- a/alsa_sound/AudioSessionOut.cpp
+++ b/alsa_sound/AudioSessionOut.cpp
@@ -754,23 +754,7 @@
 uint32_t AudioSessionOutALSA::latency() const
 {
     // Android wants latency in milliseconds.
-    uint32_t latency = mAlsaHandle->latency;
-    if ( ((mParent->mCurRxDevice & AudioSystem::DEVICE_OUT_ALL_A2DP) &&
-         (mParent->mExtOutStream == mParent->mA2dpStream))
-         && (mParent->mA2dpStream != NULL) ) {
-        uint32_t bt_latency = mParent->mA2dpStream->get_latency(mParent->mA2dpStream);
-        uint32_t proxy_latency = mParent->mALSADevice->mAvailInMs;
-        latency += bt_latency*1000 + proxy_latency*1000;
-        ALOGV("latency = %d, bt_latency = %d, proxy_latency = %d", latency, bt_latency, proxy_latency);
-    }
-    else if ( ((mParent->mCurRxDevice & AudioSystem::DEVICE_OUT_ALL_USB) &&
-         (mParent->mExtOutStream == mParent->mUsbStream))
-         && (mParent->mUsbStream != NULL) ) {
-        uint32_t usb_latency = mParent->mUsbStream->get_latency(mParent->mUsbStream);
-        latency += usb_latency*1000;
-    }
-
-    return USEC_TO_MSEC (latency);
+    return USEC_TO_MSEC (mAlsaHandle->latency);
 }
 
 status_t AudioSessionOutALSA::setObserver(void *observer)

alsa_sound/AudioStreamOutALSA.cpp

diff --git a/alsa_sound/AudioStreamOutALSA.cpp b/alsa_sound/AudioStreamOutALSA.cpp
index 22dbbe6..df4b1d5 100644
--- a/alsa_sound/AudioStreamOutALSA.cpp
+++ b/alsa_sound/AudioStreamOutALSA.cpp
@@ -412,23 +412,7 @@
 uint32_t AudioStreamOutALSA::latency() const
 {
     // Android wants latency in milliseconds.
-    uint32_t latency = mHandle->latency;
-    if ( ((mParent->mCurRxDevice & AudioSystem::DEVICE_OUT_ALL_A2DP) &&
-         (mParent->mExtOutStream == mParent->mA2dpStream))
-         && (mParent->mA2dpStream != NULL) ) {
-        uint32_t bt_latency = mParent->mA2dpStream->get_latency(mParent->mA2dpStream);
-        uint32_t proxy_latency = mParent->mALSADevice->mAvailInMs;
-        latency += bt_latency*1000 + proxy_latency*1000;
-        ALOGV("latency = %d, bt_latency = %d, proxy_latency = %d", latency, bt_latency, proxy_latency);
-    }
-    else if ( ((mParent->mCurRxDevice & AudioSystem::DEVICE_OUT_ALL_USB) &&
-         (mParent->mExtOutStream == mParent->mUsbStream))
-         && (mParent->mUsbStream != NULL) ) {
-        uint32_t usb_latency = mParent->mUsbStream->get_latency(mParent->mUsbStream);
-        latency += usb_latency*1000;
-    }
-
-    return USEC_TO_MSEC (latency);
+    return USEC_TO_MSEC (mHandle->latency);
 }
 
 // return the number of audio frames written by the audio dsp to DAC since