diff options
| 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 |
| commit | 1746929ddc7592ab397c402724a61352e45df093 (patch) | |
| tree | 1911bbd03adeac6bb6e8fa91de3ee1833a40e401 /media/libmedia/JetPlayer.cpp | |
| parent | eb76ff27c13386eb5a2dad73b1a8366f80eb0ff7 (diff) | |
| parent | ab334fd351ae5a0e18903da123d63e565b536874 (diff) | |
| download | frameworks_av-1746929ddc7592ab397c402724a61352e45df093.zip frameworks_av-1746929ddc7592ab397c402724a61352e45df093.tar.gz frameworks_av-1746929ddc7592ab397c402724a61352e45df093.tar.bz2 | |
Merge "audio_channel_in/out_mask_from_count"
Diffstat (limited to 'media/libmedia/JetPlayer.cpp')
| -rw-r--r-- | media/libmedia/JetPlayer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmedia/JetPlayer.cpp b/media/libmedia/JetPlayer.cpp index 312a493..f1f62f7 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); |