commit 7c987f09668cfed24ab36e509473c6765981ac5e
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Sep 30 17:06:04 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 30 17:06:04 2019 +0000
tree 6f3d93c5529b9405a56b60c12b37f2a5a9ad1e54
parent 15c19562110938cf1fab5af02aa6653a4ae84fc7
parent a10bd516e59e0960121486a491ccfedac67cc4b3

Merge "aaudio: fix detection of input overflows"

media/libaaudio/src/client/AudioStreamInternalCapture.cpp

diff --git a/media/libaaudio/src/client/AudioStreamInternalCapture.cpp b/media/libaaudio/src/client/AudioStreamInternalCapture.cpp
index 366cc87..9684ee4 100644
--- a/media/libaaudio/src/client/AudioStreamInternalCapture.cpp
+++ b/media/libaaudio/src/client/AudioStreamInternalCapture.cpp
@@ -106,9 +106,10 @@
         mNeedCatchUp.acknowledge();
     }
 
-    // If the write index passed the read index then consider it an overrun.
+    // If the capture buffer is full beyond capacity then consider it an overrun.
     // For shared streams, the xRunCount is passed up from the service.
-    if (mAudioEndpoint.isFreeRunning() && mAudioEndpoint.getEmptyFramesAvailable() < 0) {
+    if (mAudioEndpoint.isFreeRunning()
+        && mAudioEndpoint.getFullFramesAvailable() > mAudioEndpoint.getBufferCapacityInFrames()) {
         mXRunCount++;
         if (ATRACE_ENABLED()) {
             ATRACE_INT("aaOverRuns", mXRunCount);