summaryrefslogtreecommitdiffstats
path: root/media/libmedia/AudioRecord.cpp
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2015-03-20 10:58:21 -0700
committerGlenn Kasten <gkasten@google.com>2015-03-23 14:53:01 -0700
commit3622cdff65f34a99d2f55936a895387ad41510ce (patch)
treec6af21a8fb7d4252d0ac78e542bb1baa5ae29f17 /media/libmedia/AudioRecord.cpp
parent4c36d6f48f4eecacc148317f775f65961a4f03d2 (diff)
downloadframeworks_av-3622cdff65f34a99d2f55936a895387ad41510ce.zip
frameworks_av-3622cdff65f34a99d2f55936a895387ad41510ce.tar.gz
frameworks_av-3622cdff65f34a99d2f55936a895387ad41510ce.tar.bz2
AudioRecord::read() can be non-blocking to match AudioTrack
Change-Id: I23b9466b81ab6037d0bccd5e6f5974b7bd4aeacb
Diffstat (limited to 'media/libmedia/AudioRecord.cpp')
-rw-r--r--media/libmedia/AudioRecord.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/media/libmedia/AudioRecord.cpp b/media/libmedia/AudioRecord.cpp
index 1a65ee8..2ed9221 100644
--- a/media/libmedia/AudioRecord.cpp
+++ b/media/libmedia/AudioRecord.cpp
@@ -722,7 +722,7 @@ audio_io_handle_t AudioRecord::getInputPrivate() const
// -------------------------------------------------------------------------
-ssize_t AudioRecord::read(void* buffer, size_t userSize)
+ssize_t AudioRecord::read(void* buffer, size_t userSize, bool blocking)
{
if (mTransfer != TRANSFER_SYNC) {
return INVALID_OPERATION;
@@ -741,7 +741,8 @@ ssize_t AudioRecord::read(void* buffer, size_t userSize)
while (userSize >= mFrameSize) {
audioBuffer.frameCount = userSize / mFrameSize;
- status_t err = obtainBuffer(&audioBuffer, &ClientProxy::kForever);
+ status_t err = obtainBuffer(&audioBuffer,
+ blocking ? &ClientProxy::kForever : &ClientProxy::kNonBlocking);
if (err < 0) {
if (read > 0) {
break;