From ab334fd351ae5a0e18903da123d63e565b536874 Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Wed, 14 Mar 2012 12:56:06 -0700 Subject: 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 --- media/libstagefright/AudioSource.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'media/libstagefright/AudioSource.cpp') 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, -- cgit v1.1