diff options
author | Eric Laurent <elaurent@google.com> | 2014-11-25 17:50:47 -0800 |
---|---|---|
committer | Eric Laurent <elaurent@google.com> | 2014-11-25 17:50:47 -0800 |
commit | caf7f48a0ef558689d39aafd187c1571ff4128b4 (patch) | |
tree | 7a2c90732783e2c90cabb6045c4ab0dcea842bf1 /media/libmedia/AudioSystem.cpp | |
parent | 087eb332cdd64026de27c914194127f8fda1a846 (diff) | |
download | frameworks_av-caf7f48a0ef558689d39aafd187c1571ff4128b4.zip frameworks_av-caf7f48a0ef558689d39aafd187c1571ff4128b4.tar.gz frameworks_av-caf7f48a0ef558689d39aafd187c1571ff4128b4.tar.bz2 |
AudioRecord: use audio attributes instead of audio source.
Added AudioRecord constructor with audio attributes.
Replaced AudioPolicymanager::getInput() by getInputForAttr().
No new functionality for now.
Also:
- Fixed warnings in AudioPolicyManager
- Allocate audio session ID before calling getOutputForAttr() in
AudioTrack.
Bug: 16006090.
Change-Id: I15df21e4411db688e3096dd801cf579d76d81711
Diffstat (limited to 'media/libmedia/AudioSystem.cpp')
-rw-r--r-- | media/libmedia/AudioSystem.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp index 5f42f25..96f1ade 100644 --- a/media/libmedia/AudioSystem.cpp +++ b/media/libmedia/AudioSystem.cpp @@ -693,16 +693,17 @@ void AudioSystem::releaseOutput(audio_io_handle_t output, aps->releaseOutput(output, stream, session); } -audio_io_handle_t AudioSystem::getInput(audio_source_t inputSource, - uint32_t samplingRate, - audio_format_t format, - audio_channel_mask_t channelMask, - audio_session_t sessionId, - audio_input_flags_t flags) +status_t AudioSystem::getInputForAttr(const audio_attributes_t *attr, + audio_io_handle_t *input, + audio_session_t session, + uint32_t samplingRate, + audio_format_t format, + audio_channel_mask_t channelMask, + audio_input_flags_t flags) { const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service(); - if (aps == 0) return 0; - return aps->getInput(inputSource, samplingRate, format, channelMask, sessionId, flags); + if (aps == 0) return NO_INIT; + return aps->getInputForAttr(attr, input, session, samplingRate, format, channelMask, flags); } status_t AudioSystem::startInput(audio_io_handle_t input, |