diff options
| author | Eric Laurent <elaurent@google.com> | 2014-09-30 14:56:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-30 14:56:12 +0000 |
| commit | fad66ea7367193156187b84e57bbb5f5600410f1 (patch) | |
| tree | 1f855989c0daadc3d79c3599e42775ac25e85cfc /services | |
| parent | a5d419be9507c81af3b1f522cdc681708769f625 (diff) | |
| parent | 6c7ae72f0eccf456744474785afd25f9e205881c (diff) | |
| download | frameworks_av-fad66ea7367193156187b84e57bbb5f5600410f1.zip frameworks_av-fad66ea7367193156187b84e57bbb5f5600410f1.tar.gz frameworks_av-fad66ea7367193156187b84e57bbb5f5600410f1.tar.bz2 | |
am 6c7ae72f: Merge "audio policy: fix HW A/V sync output selection" into lmp-dev
* commit '6c7ae72f0eccf456744474785afd25f9e205881c':
audio policy: fix HW A/V sync output selection
Diffstat (limited to 'services')
| -rw-r--r-- | services/audiopolicy/AudioPolicyManager.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/audiopolicy/AudioPolicyManager.cpp b/services/audiopolicy/AudioPolicyManager.cpp index d0b990f..536987a 100644 --- a/services/audiopolicy/AudioPolicyManager.cpp +++ b/services/audiopolicy/AudioPolicyManager.cpp @@ -930,7 +930,9 @@ audio_io_handle_t AudioPolicyManager::getOutputForDevice( sp<IOProfile> profile; // skip direct output selection if the request can obviously be attached to a mixed output - if (audio_is_linear_pcm(format) && samplingRate <= MAX_MIXER_SAMPLING_RATE && + // and not explicitly requested + if (((flags & AUDIO_OUTPUT_FLAG_DIRECT) == 0) && + audio_is_linear_pcm(format) && samplingRate <= MAX_MIXER_SAMPLING_RATE && audio_channel_count_from_out_mask(channelMask) <= 2) { goto non_direct_output; } |