diff options
| author | Glenn Kasten <gkasten@google.com> | 2013-08-06 16:14:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-06 16:14:01 +0000 |
| commit | 743649fa70392b668377fb507d251b346c7b2769 (patch) | |
| tree | 3d23d5355c7ea676aaeee2465447dc72f093c346 | |
| parent | 5279e3e1187e4da0fed4349d29ea548f52e95f95 (diff) | |
| parent | 73493688f4190f790ee15d9ca54831cd64f4e195 (diff) | |
| download | frameworks_av-743649fa70392b668377fb507d251b346c7b2769.zip frameworks_av-743649fa70392b668377fb507d251b346c7b2769.tar.gz frameworks_av-743649fa70392b668377fb507d251b346c7b2769.tar.bz2 | |
Merge "AudioRecord::openRecord_l now take flags"
| -rw-r--r-- | include/media/AudioRecord.h | 1 | ||||
| -rw-r--r-- | media/libmedia/AudioRecord.cpp | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/media/AudioRecord.h b/include/media/AudioRecord.h index 329910e..8973c5c 100644 --- a/include/media/AudioRecord.h +++ b/include/media/AudioRecord.h @@ -427,6 +427,7 @@ private: status_t openRecord_l(uint32_t sampleRate, audio_format_t format, size_t frameCount, + audio_input_flags_t flags, audio_io_handle_t input, size_t epoch); diff --git a/media/libmedia/AudioRecord.cpp b/media/libmedia/AudioRecord.cpp index 96930cc..bc5ce51 100644 --- a/media/libmedia/AudioRecord.cpp +++ b/media/libmedia/AudioRecord.cpp @@ -250,7 +250,7 @@ status_t AudioRecord::set( } // create the IAudioRecord - status = openRecord_l(sampleRate, format, frameCount, input, 0 /*epoch*/); + status = openRecord_l(sampleRate, format, frameCount, mFlags, input, 0 /*epoch*/); if (status != NO_ERROR) { return status; } @@ -435,6 +435,7 @@ status_t AudioRecord::openRecord_l( uint32_t sampleRate, audio_format_t format, size_t frameCount, + audio_input_flags_t flags, audio_io_handle_t input, size_t epoch) { @@ -908,7 +909,7 @@ status_t AudioRecord::restoreRecord_l(const char *from) // It will also delete the strong references on previous IAudioRecord and IMemory size_t position = mProxy->getPosition(); mNewPosition = position + mUpdatePeriod; - result = openRecord_l(mSampleRate, mFormat, mFrameCount, getInput_l(), position); + result = openRecord_l(mSampleRate, mFormat, mFrameCount, mFlags, getInput_l(), position); if (result == NO_ERROR) { if (mActive) { // callback thread or sync event hasn't changed |