summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-03-09 15:23:45 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-03-09 15:23:45 -0800
commitdf0d3ab4d03d8738a606b35bf9673950844aef4a (patch)
tree49413648363c32a9e40d0e46bcfa6fb4a4132404 /media/libstagefright
parentc2a4a106d3a0131d5c93f8f512fc02f2a6e8b184 (diff)
parentf60a5d7162e22b565e5977b5f4032b9334618269 (diff)
downloadframeworks_base-df0d3ab4d03d8738a606b35bf9673950844aef4a.zip
frameworks_base-df0d3ab4d03d8738a606b35bf9673950844aef4a.tar.gz
frameworks_base-df0d3ab4d03d8738a606b35bf9673950844aef4a.tar.bz2
Merge "Use AudioRecord::record_flags consistently"
Diffstat (limited to 'media/libstagefright')
-rw-r--r--media/libstagefright/AudioSource.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/media/libstagefright/AudioSource.cpp b/media/libstagefright/AudioSource.cpp
index 5b2ea1f..cbe709b 100644
--- a/media/libstagefright/AudioSource.cpp
+++ b/media/libstagefright/AudioSource.cpp
@@ -56,9 +56,10 @@ AudioSource::AudioSource(
ALOGV("sampleRate: %d, channels: %d", sampleRate, channels);
CHECK(channels == 1 || channels == 2);
- uint32_t flags = AudioRecord::RECORD_AGC_ENABLE |
+ AudioRecord::record_flags flags = (AudioRecord::record_flags)
+ (AudioRecord::RECORD_AGC_ENABLE |
AudioRecord::RECORD_NS_ENABLE |
- AudioRecord::RECORD_IIR_ENABLE;
+ AudioRecord::RECORD_IIR_ENABLE);
mRecord = new AudioRecord(
inputSource, sampleRate, AUDIO_FORMAT_PCM_16_BIT,
channels > 1? AUDIO_CHANNEL_IN_STEREO: AUDIO_CHANNEL_IN_MONO,