summaryrefslogtreecommitdiff
path: root/media/libmedia/JetPlayer.cpp
diff options
context:
space:
mode:
author Glenn Kasten <gkasten@google.com> 2012-03-19 07:31:58 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2012-03-19 07:31:58 -0700
commitf6b8f7b34f5fe94cd1d8753ec356b967293f1f9c (patch)
tree33525b50e1e39afd9c39e4858fd710ee8304a19c /media/libmedia/JetPlayer.cpp
parentb106153ba97f3eded6e71ffc92859314b614e0ba (diff)
parent94a36440ba11f7e9d6d444e985a7510cb56f886b (diff)
Merge "audio_channel_in/out_mask_from_count"
Diffstat (limited to 'media/libmedia/JetPlayer.cpp')
-rw-r--r--media/libmedia/JetPlayer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmedia/JetPlayer.cpp b/media/libmedia/JetPlayer.cpp
index 312a4939b65b..f1f62f76ea75 100644
--- a/media/libmedia/JetPlayer.cpp
+++ b/media/libmedia/JetPlayer.cpp
@@ -92,7 +92,7 @@ int JetPlayer::init()
mAudioTrack->set(AUDIO_STREAM_MUSIC, //TODO parametrize this
pLibConfig->sampleRate,
AUDIO_FORMAT_PCM_16_BIT,
- (pLibConfig->numChannels == 2) ? AUDIO_CHANNEL_OUT_STEREO : AUDIO_CHANNEL_OUT_MONO,
+ audio_channel_out_mask_from_count(pLibConfig->numChannels),
mTrackBufferSize,
AUDIO_POLICY_OUTPUT_FLAG_NONE);