summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2012-09-07 09:18:43 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-07 09:18:44 -0700
commit261fd2119c70fda3af64453881a6346dd48eb956 (patch)
treebebeb91c3c8538d93c0bdf520948e7e304a8a3ab /media
parentd06ab147394b0b49679c924a51d77c91dea04d82 (diff)
parent6f744d75d3439f7984245e3c489cc7cf91cea41c (diff)
downloadframeworks_av-261fd2119c70fda3af64453881a6346dd48eb956.zip
frameworks_av-261fd2119c70fda3af64453881a6346dd48eb956.tar.gz
frameworks_av-261fd2119c70fda3af64453881a6346dd48eb956.tar.bz2
Merge "AudioRecord: Fix minimum frame count calculation." into jb-mr1-dev
Diffstat (limited to 'media')
-rw-r--r--media/libmedia/AudioRecord.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmedia/AudioRecord.cpp b/media/libmedia/AudioRecord.cpp
index 5060525..8ea6306 100644
--- a/media/libmedia/AudioRecord.cpp
+++ b/media/libmedia/AudioRecord.cpp
@@ -177,7 +177,7 @@ status_t AudioRecord::set(
// validate framecount
int minFrameCount = 0;
- status_t status = getMinFrameCount(&minFrameCount, sampleRate, format, channelCount);
+ status_t status = getMinFrameCount(&minFrameCount, sampleRate, format, channelMask);
if (status != NO_ERROR) {
return status;
}