diff options
author | Glenn Kasten <gkasten@google.com> | 2012-03-14 12:56:06 -0700 |
---|---|---|
committer | Glenn Kasten <gkasten@google.com> | 2012-03-15 13:15:27 -0700 |
commit | ab334fd351ae5a0e18903da123d63e565b536874 (patch) | |
tree | 9bcc5a6151326d9ca345f9dfac0d9d68d48e73b4 /cmds/stagefright/SimplePlayer.cpp | |
parent | 3c5bbaee376d235404f267fbe1693d1960bfaaef (diff) | |
download | frameworks_av-ab334fd351ae5a0e18903da123d63e565b536874.zip frameworks_av-ab334fd351ae5a0e18903da123d63e565b536874.tar.gz frameworks_av-ab334fd351ae5a0e18903da123d63e565b536874.tar.bz2 |
audio_channel_in/out_mask_from_count
and avoid ambiguous term "channels" where it might be confusing
as to whether it is a channel mask or channel count
Change-Id: I744fa08ccb6001a98c97bd638d2c9d56836c4234
Diffstat (limited to 'cmds/stagefright/SimplePlayer.cpp')
-rw-r--r-- | cmds/stagefright/SimplePlayer.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cmds/stagefright/SimplePlayer.cpp b/cmds/stagefright/SimplePlayer.cpp index fac3a8c..0cfeb3e 100644 --- a/cmds/stagefright/SimplePlayer.cpp +++ b/cmds/stagefright/SimplePlayer.cpp @@ -583,8 +583,7 @@ status_t SimplePlayer::onOutputFormatChanged( AUDIO_STREAM_MUSIC, sampleRate, AUDIO_FORMAT_PCM_16_BIT, - (channelCount == 1) - ? AUDIO_CHANNEL_OUT_MONO : AUDIO_CHANNEL_OUT_STEREO, + audio_channel_out_mask_from_count(channelCount), 0); state->mNumFramesWritten = 0; |