diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-03-09 15:23:45 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-09 15:23:45 -0800 |
| commit | df0d3ab4d03d8738a606b35bf9673950844aef4a (patch) | |
| tree | 49413648363c32a9e40d0e46bcfa6fb4a4132404 | |
| parent | c2a4a106d3a0131d5c93f8f512fc02f2a6e8b184 (diff) | |
| parent | f60a5d7162e22b565e5977b5f4032b9334618269 (diff) | |
| download | frameworks_base-df0d3ab4d03d8738a606b35bf9673950844aef4a.zip frameworks_base-df0d3ab4d03d8738a606b35bf9673950844aef4a.tar.gz frameworks_base-df0d3ab4d03d8738a606b35bf9673950844aef4a.tar.bz2 | |
Merge "Use AudioRecord::record_flags consistently"
| -rw-r--r-- | core/jni/android_media_AudioRecord.cpp | 2 | ||||
| -rw-r--r-- | include/media/AudioRecord.h | 8 | ||||
| -rw-r--r-- | media/libmedia/AudioRecord.cpp | 4 | ||||
| -rw-r--r-- | media/libstagefright/AudioSource.cpp | 5 |
4 files changed, 11 insertions, 8 deletions
diff --git a/core/jni/android_media_AudioRecord.cpp b/core/jni/android_media_AudioRecord.cpp index 68a8de8..b34dbce 100644 --- a/core/jni/android_media_AudioRecord.cpp +++ b/core/jni/android_media_AudioRecord.cpp @@ -203,7 +203,7 @@ android_media_AudioRecord_setup(JNIEnv *env, jobject thiz, jobject weak_this, format, // word length, PCM channels, frameCount, - 0, // flags + (AudioRecord::record_flags) 0, // flags recorderCallback,// callback_t lpCallbackData,// void* user 0, // notificationFrames, diff --git a/include/media/AudioRecord.h b/include/media/AudioRecord.h index 4fbeb38..7df6668 100644 --- a/include/media/AudioRecord.h +++ b/include/media/AudioRecord.h @@ -143,6 +143,8 @@ public: * user Context for use by the callback receiver. */ + // FIXME consider removing this alias and replacing it by audio_in_acoustics_t + // or removing the parameter entirely if it is unused enum record_flags { RECORD_AGC_ENABLE = AUDIO_IN_ACOUSTICS_AGC_ENABLE, RECORD_NS_ENABLE = AUDIO_IN_ACOUSTICS_NS_ENABLE, @@ -154,7 +156,7 @@ public: audio_format_t format = AUDIO_FORMAT_DEFAULT, uint32_t channelMask = AUDIO_CHANNEL_IN_MONO, int frameCount = 0, - uint32_t flags = 0, + record_flags flags = (record_flags) 0, callback_t cbf = NULL, void* user = NULL, int notificationFrames = 0, @@ -180,7 +182,7 @@ public: audio_format_t format = AUDIO_FORMAT_DEFAULT, uint32_t channelMask = AUDIO_CHANNEL_IN_MONO, int frameCount = 0, - uint32_t flags = 0, + record_flags flags = (record_flags) 0, callback_t cbf = NULL, void* user = NULL, int notificationFrames = 0, @@ -383,7 +385,7 @@ private: bool mMarkerReached; uint32_t mNewPosition; uint32_t mUpdatePeriod; - uint32_t mFlags; + record_flags mFlags; uint32_t mChannelMask; audio_io_handle_t mInput; int mSessionId; diff --git a/media/libmedia/AudioRecord.cpp b/media/libmedia/AudioRecord.cpp index 943f3af..22c3a18 100644 --- a/media/libmedia/AudioRecord.cpp +++ b/media/libmedia/AudioRecord.cpp @@ -89,7 +89,7 @@ AudioRecord::AudioRecord( audio_format_t format, uint32_t channelMask, int frameCount, - uint32_t flags, + record_flags flags, callback_t cbf, void* user, int notificationFrames, @@ -124,7 +124,7 @@ status_t AudioRecord::set( audio_format_t format, uint32_t channelMask, int frameCount, - uint32_t flags, + record_flags flags, callback_t cbf, void* user, int notificationFrames, 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, |