diff options
author | Glenn Kasten <gkasten@google.com> | 2013-08-05 21:56:17 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-05 21:56:17 +0000 |
commit | 77baebfe89c99415a0ee4c2ea87bfd8a0f9e51f1 (patch) | |
tree | 8a8f4aa15e520fddf80ed076f54b14ed6085dc50 | |
parent | 9b26847ed122a601ba857e0ef22ee2c818641120 (diff) | |
parent | 27f7b2a8fe899565487d8a326676a5f7d0a05a37 (diff) | |
download | frameworks_av-77baebfe89c99415a0ee4c2ea87bfd8a0f9e51f1.zip frameworks_av-77baebfe89c99415a0ee4c2ea87bfd8a0f9e51f1.tar.gz frameworks_av-77baebfe89c99415a0ee4c2ea87bfd8a0f9e51f1.tar.bz2 |
Merge "AudioRecord::set and constructor now take flags"
-rw-r--r-- | include/media/AudioRecord.h | 8 | ||||
-rw-r--r-- | media/libmedia/AudioRecord.cpp | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/include/media/AudioRecord.h b/include/media/AudioRecord.h index 8b7f20c..329910e 100644 --- a/include/media/AudioRecord.h +++ b/include/media/AudioRecord.h @@ -143,6 +143,7 @@ public: * frames are ready in record track output buffer. * sessionId: Not yet supported. * transferType: How data is transferred from AudioRecord. + * flags: See comments on audio_input_flags_t in <system/audio.h> * threadCanCallJava: Not present in parameter list, and so is fixed at false. */ @@ -155,7 +156,8 @@ public: void* user = NULL, int notificationFrames = 0, int sessionId = 0, - transfer_type transferType = TRANSFER_DEFAULT); + transfer_type transferType = TRANSFER_DEFAULT, + audio_input_flags_t flags = AUDIO_INPUT_FLAG_NONE); /* Terminates the AudioRecord and unregisters it from AudioFlinger. * Also destroys all resources associated with the AudioRecord. @@ -187,7 +189,8 @@ public: int notificationFrames = 0, bool threadCanCallJava = false, int sessionId = 0, - transfer_type transferType = TRANSFER_DEFAULT); + transfer_type transferType = TRANSFER_DEFAULT, + audio_input_flags_t flags = AUDIO_INPUT_FLAG_NONE); /* Result of constructing the AudioRecord. This must be checked * before using any AudioRecord API (except for set()), because using @@ -468,6 +471,7 @@ private: audio_source_t mInputSource; uint32_t mLatency; // in ms audio_channel_mask_t mChannelMask; + audio_input_flags_t mFlags; int mSessionId; transfer_type mTransfer; diff --git a/media/libmedia/AudioRecord.cpp b/media/libmedia/AudioRecord.cpp index d88c1ed..f039ec2 100644 --- a/media/libmedia/AudioRecord.cpp +++ b/media/libmedia/AudioRecord.cpp @@ -86,7 +86,8 @@ AudioRecord::AudioRecord( void* user, int notificationFrames, int sessionId, - transfer_type transferType) + transfer_type transferType, + audio_input_flags_t flags) : mStatus(NO_INIT), mSessionId(0), mPreviousPriority(ANDROID_PRIORITY_NORMAL), mPreviousSchedulingGroup(SP_DEFAULT), @@ -128,7 +129,8 @@ status_t AudioRecord::set( int notificationFrames, bool threadCanCallJava, int sessionId, - transfer_type transferType) + transfer_type transferType, + audio_input_flags_t flags) { switch (transferType) { case TRANSFER_DEFAULT: @@ -215,6 +217,8 @@ status_t AudioRecord::set( } ALOGV("set(): mSessionId %d", mSessionId); + mFlags = flags; + audio_io_handle_t input = AudioSystem::getInput(inputSource, sampleRate, format, |