diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-06-22 13:43:51 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2012-06-25 13:51:10 -0700 |
| commit | 20010053daabfa43fcfe781bbf004473b4c08538 (patch) | |
| tree | f34948205baac68d57000467e9877a0041249d33 /media | |
| parent | 624a7fcb377f2a40109c16de5109ae8ea1f67a69 (diff) | |
| download | frameworks_av-20010053daabfa43fcfe781bbf004473b4c08538.zip frameworks_av-20010053daabfa43fcfe781bbf004473b4c08538.tar.gz frameworks_av-20010053daabfa43fcfe781bbf004473b4c08538.tar.bz2 | |
Remove acoustics from AudioSystem::getInput()
Change-Id: I29fb3ee5664c1f0ee0409c1bb2be087ecca637db
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmedia/AudioRecord.cpp | 2 | ||||
| -rw-r--r-- | media/libmedia/AudioSystem.cpp | 3 | ||||
| -rw-r--r-- | media/libmedia/IAudioPolicyService.cpp | 5 |
3 files changed, 1 insertions, 9 deletions
diff --git a/media/libmedia/AudioRecord.cpp b/media/libmedia/AudioRecord.cpp index bb314ec..0f17bbd 100644 --- a/media/libmedia/AudioRecord.cpp +++ b/media/libmedia/AudioRecord.cpp @@ -162,7 +162,6 @@ status_t AudioRecord::set( sampleRate, format, channelMask, - (audio_in_acoustics_t) 0, mSessionId); if (input == 0) { ALOGE("Could not get audio input for record source %d", inputSource); @@ -600,7 +599,6 @@ audio_io_handle_t AudioRecord::getInput_l() mCblk->sampleRate, mFormat, mChannelMask, - (audio_in_acoustics_t) 0, mSessionId); return mInput; } diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp index 4c41ba5..7c29c87 100644 --- a/media/libmedia/AudioSystem.cpp +++ b/media/libmedia/AudioSystem.cpp @@ -625,12 +625,11 @@ audio_io_handle_t AudioSystem::getInput(audio_source_t inputSource, uint32_t samplingRate, audio_format_t format, uint32_t channels, - audio_in_acoustics_t acoustics, int sessionId) { const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service(); if (aps == 0) return 0; - return aps->getInput(inputSource, samplingRate, format, channels, acoustics, sessionId); + return aps->getInput(inputSource, samplingRate, format, channels, sessionId); } status_t AudioSystem::startInput(audio_io_handle_t input) diff --git a/media/libmedia/IAudioPolicyService.cpp b/media/libmedia/IAudioPolicyService.cpp index 7aab8d6..5a4512e 100644 --- a/media/libmedia/IAudioPolicyService.cpp +++ b/media/libmedia/IAudioPolicyService.cpp @@ -176,7 +176,6 @@ public: uint32_t samplingRate, audio_format_t format, uint32_t channels, - audio_in_acoustics_t acoustics, int audioSession) { Parcel data, reply; @@ -185,7 +184,6 @@ public: data.writeInt32(samplingRate); data.writeInt32(static_cast <uint32_t>(format)); data.writeInt32(channels); - data.writeInt32(static_cast <uint32_t>(acoustics)); data.writeInt32(audioSession); remote()->transact(GET_INPUT, data, &reply); return static_cast <audio_io_handle_t> (reply.readInt32()); @@ -465,14 +463,11 @@ status_t BnAudioPolicyService::onTransact( uint32_t samplingRate = data.readInt32(); audio_format_t format = (audio_format_t) data.readInt32(); uint32_t channels = data.readInt32(); - audio_in_acoustics_t acoustics = - static_cast <audio_in_acoustics_t>(data.readInt32()); int audioSession = data.readInt32(); audio_io_handle_t input = getInput(inputSource, samplingRate, format, channels, - acoustics, audioSession); reply->writeInt32(static_cast <int>(input)); return NO_ERROR; |