commit 873b2bc8ec91ce1aa526004052347f253536ab6a
author Mikhail Naganov <mnaganov@google.com> Mon May 22 17:56:17 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 22 17:56:21 2017 +0000
tree d900c3456541a77790a597fcd290cda7d41fa231
parent 6aa929c9296180abac526f594137f18c38620c62
parent d873a5506149ed47164cf9c11add82eaceba24c3

Merge "AAudio: Fix counting of written / read frames for legacy input" into oc-dev

media/libaaudio/src/legacy/AudioStreamRecord.cpp

diff --git a/media/libaaudio/src/legacy/AudioStreamRecord.cpp b/media/libaaudio/src/legacy/AudioStreamRecord.cpp
index a74a030..b3d01d6 100644
--- a/media/libaaudio/src/legacy/AudioStreamRecord.cpp
+++ b/media/libaaudio/src/legacy/AudioStreamRecord.cpp
@@ -207,7 +207,9 @@
         return AAUDIO_ERROR_INVALID_STATE;
     }
     setState(AAUDIO_STREAM_STATE_STOPPING);
+    incrementFramesWritten(getFramesRead() - getFramesWritten()); // TODO review
     mAudioRecord->stop();
+    mFramesRead.reset32();
     return AAUDIO_OK;
 }
 
@@ -257,6 +259,7 @@
         return AAudioConvert_androidToAAudioResult(bytesRead);
     }
     int32_t framesRead = (int32_t)(bytesRead / bytesPerFrame);
+    incrementFramesRead(framesRead);
     return (aaudio_result_t) framesRead;
 }