summaryrefslogtreecommitdiffstats
path: root/media/libmedia/AudioRecord.cpp
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2015-04-14 15:02:11 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-14 15:02:12 +0000
commitb23cabdb71b98dc5e852f5d06be271696fea92c7 (patch)
tree5fd928f892970e2d905fdfcc502a0204d62a149d /media/libmedia/AudioRecord.cpp
parent9e6955a19bf77ebf27b770e910efbe1ebf1ceac0 (diff)
parent551b5355d34aa42890811fc3606d3b63429296cd (diff)
downloadframeworks_av-b23cabdb71b98dc5e852f5d06be271696fea92c7.zip
frameworks_av-b23cabdb71b98dc5e852f5d06be271696fea92c7.tar.gz
frameworks_av-b23cabdb71b98dc5e852f5d06be271696fea92c7.tar.bz2
Merge "AudioRecord::obtainBuffer() can return nonContig like AudioTrack"
Diffstat (limited to 'media/libmedia/AudioRecord.cpp')
-rw-r--r--media/libmedia/AudioRecord.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/media/libmedia/AudioRecord.cpp b/media/libmedia/AudioRecord.cpp
index f4cdde2..5bbe786 100644
--- a/media/libmedia/AudioRecord.cpp
+++ b/media/libmedia/AudioRecord.cpp
@@ -596,15 +596,21 @@ release:
return status;
}
-status_t AudioRecord::obtainBuffer(Buffer* audioBuffer, int32_t waitCount)
+status_t AudioRecord::obtainBuffer(Buffer* audioBuffer, int32_t waitCount, size_t *nonContig)
{
if (audioBuffer == NULL) {
+ if (nonContig != NULL) {
+ *nonContig = 0;
+ }
return BAD_VALUE;
}
if (mTransfer != TRANSFER_OBTAIN) {
audioBuffer->frameCount = 0;
audioBuffer->size = 0;
audioBuffer->raw = NULL;
+ if (nonContig != NULL) {
+ *nonContig = 0;
+ }
return INVALID_OPERATION;
}
@@ -623,7 +629,7 @@ status_t AudioRecord::obtainBuffer(Buffer* audioBuffer, int32_t waitCount)
ALOGE("%s invalid waitCount %d", __func__, waitCount);
requested = NULL;
}
- return obtainBuffer(audioBuffer, requested);
+ return obtainBuffer(audioBuffer, requested, NULL /*elapsed*/, nonContig);
}
status_t AudioRecord::obtainBuffer(Buffer* audioBuffer, const struct timespec *requested,