am 0e42a880: am e5095be1: am a49c94ea: Merge "Revert "Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp"" into lmp-dev

* commit '0e42a8807edec5541ecac4a050459fbb72c477dc':
  Revert "Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp"

1 files changed, 0 insertions, 13 deletions

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index 0f8ebc1..0160fab 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -2127,7 +2127,6 @@ ssize_t AudioFlinger::PlaybackThread::threadLoop_write()
             size_t totalFramesWritten = mNormalSink->framesWritten();
             if (totalFramesWritten >= mLatchD.mTimestamp.mPosition) {
                 mLatchD.mUnpresentedFrames = totalFramesWritten - mLatchD.mTimestamp.mPosition;
-                // mLatchD.mFramesReleased is set in threadloop_mix()
                 mLatchDValid = true;
             }
         }
@@ -3095,18 +3094,6 @@ void AudioFlinger::MixerThread::threadLoop_mix()
     sleepTime = 0;
     standbyTime = systemTime() + standbyDelay;
     //TODO: delay standby when effects have a tail
-
-    mLatchD.mFramesReleased.clear();
-    {
-        Mutex::Autolock _l(mLock);
-        size_t size = mActiveTracks.size();
-        for (size_t i = 0; i < size; i++) {
-            sp<Track> t = mActiveTracks[i].promote();
-            if (t != 0) {
-                mLatchD.mFramesReleased.add(t.get(), t->mAudioTrackServerProxy->framesReleased());
-            }
-        }
-    }
 }
 
 void AudioFlinger::MixerThread::threadLoop_sleepTime()