commit f89090e284b8ef61eb8cae68c657c8a60877b9fb
author Andy Hung <hunga@google.com> Thu Sep 14 01:43:23 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Sep 14 01:43:23 2017 +0000
tree 37656620e850132bfd6cc0ffed14e5fd9fcc4c20
parent 19c197a3bc4c73a06a38513884da392d3fd0a49e
parent c0e75a7d57df751ec1cb49da91cf64ab0c4c4938

Merge "AudioTrack, AudioRecord: Fix latency computation" into oc-mr1-dev am: 5deda0e784
am: c0e75a7d57

Change-Id: I1f95a6372752e2e47e7f022db0333517c387eadf

media/libaudioclient/AudioRecord.cpp

diff --git a/media/libaudioclient/AudioRecord.cpp b/media/libaudioclient/AudioRecord.cpp
index 6402bbb..fe27123 100644
--- a/media/libaudioclient/AudioRecord.cpp
+++ b/media/libaudioclient/AudioRecord.cpp
@@ -274,7 +274,7 @@
     mStatus = NO_ERROR;
     mUserData = user;
     // TODO: add audio hardware input latency here
-    mLatency = (1000 * mFrameCount) / mSampleRate;
+    mLatency = (1000LL * mFrameCount) / mSampleRate;
     mMarkerPosition = 0;
     mMarkerReached = false;
     mNewPosition = 0;

media/libaudioclient/AudioTrack.cpp

diff --git a/media/libaudioclient/AudioTrack.cpp b/media/libaudioclient/AudioTrack.cpp
index 698384a..815eccc 100644
--- a/media/libaudioclient/AudioTrack.cpp
+++ b/media/libaudioclient/AudioTrack.cpp
@@ -1281,7 +1281,7 @@
         ALOGW("getLatency(%d) failed status %d", mOutput, status);
     } else {
         // FIXME don't believe this lie
-        mLatency = mAfLatency + (1000 * mFrameCount) / mSampleRate;
+        mLatency = mAfLatency + (1000LL * mFrameCount) / mSampleRate;
     }
 }