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 /media/libmediaplayerservice/MediaPlayerService.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 'media/libmediaplayerservice/MediaPlayerService.cpp')
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index 1cc120c..8f62ee4 100644 --- a/media/libmediaplayerservice/MediaPlayerService.cpp +++ b/media/libmediaplayerservice/MediaPlayerService.cpp @@ -1514,7 +1514,7 @@ status_t MediaPlayerService::AudioOutput::open( frameCount = (sampleRate*afFrameCount*bufferCount)/afSampleRate; if (channelMask == CHANNEL_MASK_USE_CHANNEL_ORDER) { - channelMask = audio_channel_mask_from_count(channelCount); + channelMask = audio_channel_out_mask_from_count(channelCount); if (0 == channelMask) { ALOGE("open() error, can\'t derive mask for %d audio channels", channelCount); return NO_INIT; |