commit 7b54d4eebaa0b4bf2c814594e02941339f8abfd4
author Linux Build Service Account <lnxbuild@localhost> Sat Dec 07 00:25:51 2013 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat Dec 07 00:25:51 2013 -0800
tree 862abe509e5366f439f186e113ea7c4caa310dde
parent 20d8342e9997f6c80db7e9462c691a32decfecde
parent 116f1eccefd1feb1449ff73a0457dea53387c770

Merge "Merge commit 'android-4.4.1_r1' into HEAD"

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index a81a53a..bca6a26 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -1002,7 +1002,7 @@
         return 0;
 
     if (channels == adev->cur_hdmi_channels) {
-        ALOGD("%s: Requested channels are same as current", __func__);
+        ALOGD("%s: Requested channels are same as current channels(%d)", __func__, channels);
         return 0;
     }
 
@@ -1101,8 +1101,12 @@
     uc_info->out_snd_device = SND_DEVICE_NONE;
 
     /* This must be called before adding this usecase to the list */
-    if (out->devices & AUDIO_DEVICE_OUT_AUX_DIGITAL)
-        check_and_set_hdmi_channels(adev, out->config.channels);
+    if (out->devices & AUDIO_DEVICE_OUT_AUX_DIGITAL) {
+        if (out->usecase == USECASE_AUDIO_PLAYBACK_OFFLOAD)
+            check_and_set_hdmi_channels(adev, out->compr_config.codec->ch_in);
+        else
+            check_and_set_hdmi_channels(adev, out->config.channels);
+    }
 
     list_add_tail(&adev->usecase_list, &uc_info->list);