commit 375172c4ccb1b810e1065cf9dad98b8a9c4c5fc8
author Jean-Michel Trivi <jmtrivi@google.com> Tue May 01 17:11:33 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue May 01 17:11:33 2012 -0700
tree 97c62fb35fa0047ff9ee7c0623d62c0bd3449f6f
parent e0b6fc58cb1b5a560da8e7903b1f7d291e7448de
parent 2c3297ab6c4daaaa7b27eed8418c64cf168fe2a1

am 2c3297ab: No warning on using channel order in AudioPlayer

* commit '2c3297ab6c4daaaa7b27eed8418c64cf168fe2a1':
  No warning on using channel order in AudioPlayer

media/libstagefright/AudioPlayer.cpp

diff --git a/media/libstagefright/AudioPlayer.cpp b/media/libstagefright/AudioPlayer.cpp
index 2e0b013..8fb0d8d 100644
--- a/media/libstagefright/AudioPlayer.cpp
+++ b/media/libstagefright/AudioPlayer.cpp
@@ -117,7 +117,9 @@
     CHECK(success);
 
     if(!format->findInt32(kKeyChannelMask, &channelMask)) {
-        ALOGW("source format didn't specify channel mask, using channel order");
+        // log only when there's a risk of ambiguity of channel mask selection
+        ALOGI_IF(numChannels > 2,
+                "source format didn't specify channel mask, using (%d) channel order", numChannels);
         channelMask = CHANNEL_MASK_USE_CHANNEL_ORDER;
     }