diff options
| author | Eric Laurent <elaurent@google.com> | 2013-10-30 01:02:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-30 01:02:56 +0000 |
| commit | a16217ce0f296f69110ebd2cd773a2751c883c7d (patch) | |
| tree | e486a8804d4eff859923b4b8dd7a5e58a3ad5a57 /hal | |
| parent | 866d5ff1463591e276b7f138c42466d9832c47d4 (diff) | |
| parent | 7f24504d395380420bb4143bdec3e701aef428aa (diff) | |
| download | android_hardware_qcom_audio-a16217ce0f296f69110ebd2cd773a2751c883c7d.tar.gz android_hardware_qcom_audio-a16217ce0f296f69110ebd2cd773a2751c883c7d.tar.bz2 android_hardware_qcom_audio-a16217ce0f296f69110ebd2cd773a2751c883c7d.zip | |
Merge "audio: fix output flag test in open_output_stream" into klp-dev
Diffstat (limited to 'hal')
| -rw-r--r-- | hal/audio_hw.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hal/audio_hw.c b/hal/audio_hw.c index d8e8ca87..0b603d7d 100644 --- a/hal/audio_hw.c +++ b/hal/audio_hw.c @@ -1863,6 +1863,7 @@ static int adev_open_output_stream(struct audio_hw_device *dev, /* Init use case and pcm_config */ if (out->flags & AUDIO_OUTPUT_FLAG_DIRECT && + !(out->flags & AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD) && out->devices & AUDIO_DEVICE_OUT_AUX_DIGITAL) { pthread_mutex_lock(&adev->lock); ret = read_hdmi_channel_masks(out); |