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/libstagefright | |
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/libstagefright')
-rw-r--r-- | media/libstagefright/AudioPlayer.cpp | 2 | ||||
-rw-r--r-- | media/libstagefright/AudioSource.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/media/libstagefright/AudioPlayer.cpp b/media/libstagefright/AudioPlayer.cpp index 9db3c97..0f816e7 100644 --- a/media/libstagefright/AudioPlayer.cpp +++ b/media/libstagefright/AudioPlayer.cpp @@ -144,7 +144,7 @@ status_t AudioPlayer::start(bool sourceAlreadyStarted) { } else { // playing to an AudioTrack, set up mask if necessary audio_channel_mask_t audioMask = channelMask == CHANNEL_MASK_USE_CHANNEL_ORDER ? - audio_channel_mask_from_count(numChannels) : channelMask; + audio_channel_out_mask_from_count(numChannels) : channelMask; if (0 == audioMask) { return BAD_VALUE; } diff --git a/media/libstagefright/AudioSource.cpp b/media/libstagefright/AudioSource.cpp index cbe709b..0f1d841 100644 --- a/media/libstagefright/AudioSource.cpp +++ b/media/libstagefright/AudioSource.cpp @@ -47,22 +47,22 @@ static void AudioRecordCallbackFunction(int event, void *user, void *info) { } AudioSource::AudioSource( - audio_source_t inputSource, uint32_t sampleRate, uint32_t channels) + audio_source_t inputSource, uint32_t sampleRate, uint32_t channelCount) : mStarted(false), mSampleRate(sampleRate), mPrevSampleTimeUs(0), mNumFramesReceived(0), mNumClientOwnedBuffers(0) { - ALOGV("sampleRate: %d, channels: %d", sampleRate, channels); - CHECK(channels == 1 || channels == 2); + ALOGV("sampleRate: %d, channelCount: %d", sampleRate, channelCount); + CHECK(channelCount == 1 || channelCount == 2); AudioRecord::record_flags flags = (AudioRecord::record_flags) (AudioRecord::RECORD_AGC_ENABLE | AudioRecord::RECORD_NS_ENABLE | AudioRecord::RECORD_IIR_ENABLE); mRecord = new AudioRecord( inputSource, sampleRate, AUDIO_FORMAT_PCM_16_BIT, - channels > 1? AUDIO_CHANNEL_IN_STEREO: AUDIO_CHANNEL_IN_MONO, + audio_channel_in_mask_from_count(channelCount), 4 * kMaxBufferSize / sizeof(int16_t), /* Enable ping-pong buffers */ flags, AudioRecordCallbackFunction, |