summaryrefslogtreecommitdiffstats
path: root/hal
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2013-09-30 19:22:50 -0700
committerEric Laurent <elaurent@google.com>2013-09-30 19:22:50 -0700
commit7f24504d395380420bb4143bdec3e701aef428aa (patch)
tree26a3c702eff872a008da7ebfa7234a8a500f3faa /hal
parenta6c11c11e2e7aee28b544674f1158b7b057c0c52 (diff)
downloadandroid_hardware_qcom_audio-7f24504d395380420bb4143bdec3e701aef428aa.tar.gz
android_hardware_qcom_audio-7f24504d395380420bb4143bdec3e701aef428aa.tar.bz2
android_hardware_qcom_audio-7f24504d395380420bb4143bdec3e701aef428aa.zip
audio: fix output flag test in open_output_stream
If flag AUDIO_OUTPUT_FLAG_DIRECT is set, we should only try to open a multi channel HDMI PCM output if flag AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD is not set. Bug: 8174410. Change-Id: I63fe6cabca590e70c077dea13c86c6948700e606
Diffstat (limited to 'hal')
-rw-r--r--hal/audio_hw.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index c89d88ea..0786b3f6 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -1772,6 +1772,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);