diff options
| -rw-r--r-- | include/media/AudioRecord.h | 13 | ||||
| -rw-r--r-- | media/libmedia/AudioRecord.cpp | 9 | ||||
| -rw-r--r-- | media/libstagefright/AudioSource.cpp | 5 |
3 files changed, 3 insertions, 24 deletions
diff --git a/include/media/AudioRecord.h b/include/media/AudioRecord.h index ef77692..e05dff3 100644 --- a/include/media/AudioRecord.h +++ b/include/media/AudioRecord.h @@ -136,8 +136,6 @@ public: * channelMask: Channel mask: see audio_channels_t. * frameCount: Total size of track PCM buffer in frames. This defines the * latency of the track. - * flags: A bitmask of acoustic values from enum record_flags. It enables - * AGC, NS, and IIR. * cbf: Callback function. If not null, this function is called periodically * to provide new PCM data. * notificationFrames: The callback function is called each time notificationFrames PCM @@ -145,20 +143,11 @@ 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, - RECORD_IIR_ENABLE = AUDIO_IN_ACOUSTICS_TX_IIR_ENABLE, - }; - AudioRecord(audio_source_t inputSource, uint32_t sampleRate = 0, audio_format_t format = AUDIO_FORMAT_DEFAULT, uint32_t channelMask = AUDIO_CHANNEL_IN_MONO, int frameCount = 0, - record_flags flags = (record_flags) 0, callback_t cbf = NULL, void* user = NULL, int notificationFrames = 0, @@ -184,7 +173,6 @@ public: audio_format_t format = AUDIO_FORMAT_DEFAULT, uint32_t channelMask = AUDIO_CHANNEL_IN_MONO, int frameCount = 0, - record_flags flags = (record_flags) 0, callback_t cbf = NULL, void* user = NULL, int notificationFrames = 0, @@ -389,7 +377,6 @@ private: bool mMarkerReached; uint32_t mNewPosition; uint32_t mUpdatePeriod; - 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 0562f8e..c95707b 100644 --- a/media/libmedia/AudioRecord.cpp +++ b/media/libmedia/AudioRecord.cpp @@ -89,7 +89,6 @@ AudioRecord::AudioRecord( audio_format_t format, uint32_t channelMask, int frameCount, - record_flags flags, callback_t cbf, void* user, int notificationFrames, @@ -98,7 +97,7 @@ AudioRecord::AudioRecord( mPreviousPriority(ANDROID_PRIORITY_NORMAL), mPreviousSchedulingGroup(SP_DEFAULT) { mStatus = set(inputSource, sampleRate, format, channelMask, - frameCount, flags, cbf, user, notificationFrames, sessionId); + frameCount, cbf, user, notificationFrames, sessionId); } AudioRecord::~AudioRecord() @@ -124,7 +123,6 @@ status_t AudioRecord::set( audio_format_t format, uint32_t channelMask, int frameCount, - record_flags flags, callback_t cbf, void* user, int notificationFrames, @@ -174,7 +172,7 @@ status_t AudioRecord::set( sampleRate, format, channelMask, - (audio_in_acoustics_t)flags, + (audio_in_acoustics_t) 0, mSessionId); if (input == 0) { ALOGE("Could not get audio input for record source %d", inputSource); @@ -229,7 +227,6 @@ status_t AudioRecord::set( mNewPosition = 0; mUpdatePeriod = 0; mInputSource = inputSource; - mFlags = flags; mInput = input; AudioSystem::acquireAudioSessionId(mSessionId); @@ -613,7 +610,7 @@ audio_io_handle_t AudioRecord::getInput_l() mCblk->sampleRate, mFormat, mChannelMask, - (audio_in_acoustics_t)mFlags, + (audio_in_acoustics_t) 0, mSessionId); return mInput; } diff --git a/media/libstagefright/AudioSource.cpp b/media/libstagefright/AudioSource.cpp index 72d797e..83daceb 100644 --- a/media/libstagefright/AudioSource.cpp +++ b/media/libstagefright/AudioSource.cpp @@ -73,15 +73,10 @@ AudioSource::AudioSource( bufCount++; } - AudioRecord::record_flags flags = (AudioRecord::record_flags) - (AudioRecord::RECORD_AGC_ENABLE | - AudioRecord::RECORD_NS_ENABLE | - AudioRecord::RECORD_IIR_ENABLE); mRecord = new AudioRecord( inputSource, sampleRate, AUDIO_FORMAT_PCM_16_BIT, audio_channel_in_mask_from_count(channelCount), bufCount * frameCount, - flags, AudioRecordCallbackFunction, this, frameCount); |