summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2012-05-01 14:30:58 -0700
committerJean-Michel Trivi <jmtrivi@google.com>2012-05-01 15:30:24 -0700
commit2c3297ab6c4daaaa7b27eed8418c64cf168fe2a1 (patch)
tree4ea2fe5895644b4d4aa3a861b1ca4ed3f03ba2ed
parentdaaf7b119649674cfc414a8761585fed6b0296df (diff)
downloadframeworks_av-2c3297ab6c4daaaa7b27eed8418c64cf168fe2a1.zip
frameworks_av-2c3297ab6c4daaaa7b27eed8418c64cf168fe2a1.tar.gz
frameworks_av-2c3297ab6c4daaaa7b27eed8418c64cf168fe2a1.tar.bz2
No warning on using channel order in AudioPlayer
Don't log a warning when an AudioPlayer derives a channel mask from the channel count, only info-log when channel count is higher than 2. Change-Id: Ia1cbced660903483654eede300ef72f7f17dcf78
-rw-r--r--media/libstagefright/AudioPlayer.cpp4
1 files changed, 3 insertions, 1 deletions
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 @@ status_t AudioPlayer::start(bool sourceAlreadyStarted) {
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;
}