diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-07-03 14:59:05 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2012-07-10 10:05:31 -0700 |
| commit | 254af180475346b6186b49c297f340c9c4817511 (patch) | |
| tree | bee0e313aaa97645167e86f4678e513ab38d1c99 /media/libmedia/AudioSystem.cpp | |
| parent | 4d2132c866228eaef563e8141ebf06aa25ee9ff7 (diff) | |
| download | frameworks_av-254af180475346b6186b49c297f340c9c4817511.zip frameworks_av-254af180475346b6186b49c297f340c9c4817511.tar.gz frameworks_av-254af180475346b6186b49c297f340c9c4817511.tar.bz2 | |
Use audio_channel_mask_t more places
Use it in AudioSystem::getOutput(), AudioSystem::getInput(),
IAudioPolicyService::getOutput(), IAudioPolicyService::getInput(),
and various other places in AudioFlinger.
Not done: AudioTrack and OutputDescriptor.
Change-Id: I70e83455820bd8f05dafd30c63d636c6a47cd172
Diffstat (limited to 'media/libmedia/AudioSystem.cpp')
| -rw-r--r-- | media/libmedia/AudioSystem.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp index 9c270c8..d880989 100644 --- a/media/libmedia/AudioSystem.cpp +++ b/media/libmedia/AudioSystem.cpp @@ -449,7 +449,7 @@ void AudioSystem::AudioFlingerClient::ioConfigChanged(int event, audio_io_handle OutputDescriptor *outputDesc = new OutputDescriptor(*desc); gOutputs.add(ioHandle, outputDesc); - ALOGV("ioConfigChanged() new output samplingRate %d, format %d channels %d frameCount %d latency %d", + ALOGV("ioConfigChanged() new output samplingRate %d, format %d channels %#x frameCount %d latency %d", outputDesc->samplingRate, outputDesc->format, outputDesc->channels, outputDesc->frameCount, outputDesc->latency); } break; case OUTPUT_CLOSED: { @@ -471,7 +471,7 @@ void AudioSystem::AudioFlingerClient::ioConfigChanged(int event, audio_io_handle if (param2 == NULL) break; desc = (const OutputDescriptor *)param2; - ALOGV("ioConfigChanged() new config for output %d samplingRate %d, format %d channels %d frameCount %d latency %d", + ALOGV("ioConfigChanged() new config for output %d samplingRate %d, format %d channels %#x frameCount %d latency %d", ioHandle, desc->samplingRate, desc->format, desc->channels, desc->frameCount, desc->latency); OutputDescriptor *outputDesc = gOutputs.valueAt(index); @@ -588,12 +588,12 @@ audio_policy_forced_cfg_t AudioSystem::getForceUse(audio_policy_force_use_t usag audio_io_handle_t AudioSystem::getOutput(audio_stream_type_t stream, uint32_t samplingRate, audio_format_t format, - uint32_t channels, + audio_channel_mask_t channelMask, audio_output_flags_t flags) { const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service(); if (aps == 0) return 0; - return aps->getOutput(stream, samplingRate, format, channels, flags); + return aps->getOutput(stream, samplingRate, format, channelMask, flags); } status_t AudioSystem::startOutput(audio_io_handle_t output, @@ -624,12 +624,12 @@ void AudioSystem::releaseOutput(audio_io_handle_t output) audio_io_handle_t AudioSystem::getInput(audio_source_t inputSource, uint32_t samplingRate, audio_format_t format, - uint32_t channels, + audio_channel_mask_t channelMask, int sessionId) { const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service(); if (aps == 0) return 0; - return aps->getInput(inputSource, samplingRate, format, channels, sessionId); + return aps->getInput(inputSource, samplingRate, format, channelMask, sessionId); } status_t AudioSystem::startInput(audio_io_handle_t input) |