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

am: c0e75a7d57 Change-Id: I1f95a6372752e2e47e7f022db0333517c387eadf
7 years ago · f89090e284
parent 19c197a3bc c0e75a7d57
commit f89090e284
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
@ -1281,7 +1281,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;
    }
 }