commit 9806555d3930be43e11106281dee354820ac1c88
author Andreas Huber <andih@google.com> Thu May 03 11:33:01 2012 -0700
committer Andreas Huber <andih@google.com> Thu May 03 11:47:08 2012 -0700
tree b5aa448cc0bfede361540f45b97c81ad398a9df4
parent 6a3969cc3bcbfc84dbcc27aa726eb96bc03a830b

Respect channel mask in ACodec and NuPlayer.

Refactor conversion from MetaData into AMessage while we're at it.

Change-Id: I5479129836ea4316e8de28cf1b472bf19e3ac4ab
related-to-bug: 6439076

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index 2a770cd..86e122f 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -375,10 +375,15 @@
                         flags = AUDIO_OUTPUT_FLAG_NONE;
                     }
 
+                    int32_t channelMask;
+                    if (!codecRequest->findInt32("channel-mask", &channelMask)) {
+                        channelMask = CHANNEL_MASK_USE_CHANNEL_ORDER;
+                    }
+
                     CHECK_EQ(mAudioSink->open(
                                 sampleRate,
                                 numChannels,
-                                CHANNEL_MASK_USE_CHANNEL_ORDER,
+                                (audio_channel_mask_t)channelMask,
                                 AUDIO_FORMAT_PCM_16_BIT,
                                 8 /* bufferCount */,
                                 NULL,