summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2013-07-30 16:35:09 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-07-30 16:35:09 +0000
commit97252bb0e40a5a9b41f020163393cf6c5da10b7e (patch)
tree2730f01323e31639eb85736a20ad0e0cf867876e /media
parentf20e1d8df84c5fbeeace0052d100982ae39bb7a4 (diff)
parent291bb6d8947c5b0c062f0895d623c529259bfa39 (diff)
downloadframeworks_av-97252bb0e40a5a9b41f020163393cf6c5da10b7e.zip
frameworks_av-97252bb0e40a5a9b41f020163393cf6c5da10b7e.tar.gz
frameworks_av-97252bb0e40a5a9b41f020163393cf6c5da10b7e.tar.bz2
Merge "AudioRecord and HAL input stream must be 16-bit PCM only"
Diffstat (limited to 'media')
-rw-r--r--media/libmedia/AudioRecord.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/media/libmedia/AudioRecord.cpp b/media/libmedia/AudioRecord.cpp
index 8ae0908..603c16e 100644
--- a/media/libmedia/AudioRecord.cpp
+++ b/media/libmedia/AudioRecord.cpp
@@ -190,6 +190,11 @@ status_t AudioRecord::set(
ALOGE("Invalid format %d", format);
return BAD_VALUE;
}
+ // Temporary restriction: AudioFlinger currently supports 16-bit PCM only
+ if (format != AUDIO_FORMAT_PCM_16_BIT) {
+ ALOGE("Format %d is not supported", format);
+ return BAD_VALUE;
+ }
mFormat = format;
if (!audio_is_input_channel(channelMask)) {