diff options
| author | SathishKumar Mani <smani@codeaurora.org> | 2012-09-25 23:34:51 -0700 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2012-10-07 16:45:38 -0700 |
| commit | bf1c87481d62736cab8832e9085c121fbafdbb6b (patch) | |
| tree | 39dba978745f04e7d7f2dd6a59de7a1d38940ec0 /alsa_sound/ALSAStreamOps.cpp | |
| parent | b357a77dc9c72cb6e327e945421f440052233b51 (diff) | |
| download | hardware_qcom_audio-bf1c87481d62736cab8832e9085c121fbafdbb6b.tar.gz hardware_qcom_audio-bf1c87481d62736cab8832e9085c121fbafdbb6b.tar.bz2 hardware_qcom_audio-bf1c87481d62736cab8832e9085c121fbafdbb6b.zip | |
alsa_sound: Add support for multichannel hdmi
- Multichannel audio support for HDMI for AAC
format with 5.1 channels max.
Bug: 7156174
Change-Id: I42e92fa2b14d35a5882cc6d84c6651a6a4d5092a
Signed-off-by: Iliyan Malchev <malchev@google.com>
Diffstat (limited to 'alsa_sound/ALSAStreamOps.cpp')
| -rw-r--r-- | alsa_sound/ALSAStreamOps.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/alsa_sound/ALSAStreamOps.cpp b/alsa_sound/ALSAStreamOps.cpp index f38b35e7..aafc7369 100644 --- a/alsa_sound/ALSAStreamOps.cpp +++ b/alsa_sound/ALSAStreamOps.cpp @@ -104,6 +104,11 @@ status_t ALSAStreamOps::set(int *format, *channels = 0; if (mHandle->devices & AudioSystem::DEVICE_OUT_ALL) { switch(mHandle->channels) { + case 6: + case 5: + *channels |= audio_channel_out_mask_from_count(mHandle->channels); + break; + // Do not fall through case 4: *channels |= AudioSystem::CHANNEL_OUT_BACK_LEFT; *channels |= AudioSystem::CHANNEL_OUT_BACK_RIGHT; @@ -348,6 +353,11 @@ uint32_t ALSAStreamOps::channels() const if (mDevices & AudioSystem::DEVICE_OUT_ALL) switch(count) { + case 6: + case 5: + channels |=audio_channel_out_mask_from_count(count); + break; + // Do not fall through case 4: channels |= AudioSystem::CHANNEL_OUT_BACK_LEFT; channels |= AudioSystem::CHANNEL_OUT_BACK_RIGHT; |