Merge "AudioTrack, AudioRecord: Fix latency computation" into oc-mr1-dev

7 years ago · 5deda0e784
parent ee5201b4d9 13969262f7
commit 5deda0e784
2 changed files with 2 additions and 2 deletions
--- a/media/libaudioclient/AudioRecord.cpp
+++ b/media/libaudioclient/AudioRecord.cpp
@ -274,7 +274,7 @@ status_t AudioRecord::set(
    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;
--- a/media/libaudioclient/AudioTrack.cpp
+++ b/media/libaudioclient/AudioTrack.cpp
@ -1279,7 +1279,7 @@ void AudioTrack::updateLatency_l()
        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;
    }
 }