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/libaah_rtp/aah_decoder_pump.cpp | 5 ++--- media/libaah_rtp/aah_decoder_pump.h | 2 +- media/libeffects/preprocessing/PreProcessing.cpp | 9 ++++----- media/libmedia/JetPlayer.cpp | 2 +- media/libmediaplayerservice/MediaPlayerService.cpp | 2 +- media/libstagefright/AudioPlayer.cpp | 2 +- media/libstagefright/AudioSource.cpp | 8 ++++---- 7 files changed, 14 insertions(+), 16 deletions(-) (limited to 'media') diff --git a/media/libaah_rtp/aah_decoder_pump.cpp b/media/libaah_rtp/aah_decoder_pump.cpp index 28b8c7b..bebba54 100644 --- a/media/libaah_rtp/aah_decoder_pump.cpp +++ b/media/libaah_rtp/aah_decoder_pump.cpp @@ -105,9 +105,8 @@ void AAH_DecoderPump::queueToRenderer(MediaBuffer* decoded_sample) { AudioTrack::getMinFrameCount(&frameCount, AUDIO_STREAM_DEFAULT, static_cast(format_sample_rate_)); - int ch_format = (format_channels_ == 1) - ? AUDIO_CHANNEL_OUT_MONO - : AUDIO_CHANNEL_OUT_STEREO; + audio_channel_mask_t ch_format = + audio_channel_out_mask_from_count(format_channels_); res = renderer_->set(AUDIO_STREAM_DEFAULT, format_sample_rate_, diff --git a/media/libaah_rtp/aah_decoder_pump.h b/media/libaah_rtp/aah_decoder_pump.h index f5a6529..4d57e49 100644 --- a/media/libaah_rtp/aah_decoder_pump.h +++ b/media/libaah_rtp/aah_decoder_pump.h @@ -75,7 +75,7 @@ class AAH_DecoderPump : public MediaSource { void stopAndCleanupRenderer(); sp format_; - int32_t format_channels_; + int32_t format_channels_; // channel count, not channel mask int32_t format_sample_rate_; sp decoder_; diff --git a/media/libeffects/preprocessing/PreProcessing.cpp b/media/libeffects/preprocessing/PreProcessing.cpp index dc27d38..1d76f62 100755 --- a/media/libeffects/preprocessing/PreProcessing.cpp +++ b/media/libeffects/preprocessing/PreProcessing.cpp @@ -956,10 +956,9 @@ void Session_GetConfig(preproc_session_t *session, effect_config_t *config) memset(config, 0, sizeof(effect_config_t)); config->inputCfg.samplingRate = config->outputCfg.samplingRate = session->samplingRate; config->inputCfg.format = config->outputCfg.format = AUDIO_FORMAT_PCM_16_BIT; - config->inputCfg.channels = session->inChannelCount == 1 ? - AUDIO_CHANNEL_IN_MONO : AUDIO_CHANNEL_IN_STEREO; - config->outputCfg.channels = session->outChannelCount == 1 ? - AUDIO_CHANNEL_IN_MONO : AUDIO_CHANNEL_IN_STEREO; + config->inputCfg.channels = audio_channel_in_mask_from_count(session->inChannelCount); + // "out" doesn't mean output device, so this is the correct API to convert channel count to mask + config->outputCfg.channels = audio_channel_in_mask_from_count(session->outChannelCount); config->inputCfg.mask = config->outputCfg.mask = (EFFECT_CONFIG_SMP_RATE | EFFECT_CONFIG_CHANNELS | EFFECT_CONFIG_FORMAT); } @@ -999,7 +998,7 @@ void Session_GetReverseConfig(preproc_session_t *session, effect_config_t *confi config->inputCfg.samplingRate = config->outputCfg.samplingRate = session->samplingRate; config->inputCfg.format = config->outputCfg.format = AUDIO_FORMAT_PCM_16_BIT; config->inputCfg.channels = config->outputCfg.channels = - session->revChannelCount == 1 ? AUDIO_CHANNEL_IN_MONO : AUDIO_CHANNEL_IN_STEREO; + audio_channel_in_mask_from_count(session->revChannelCount); config->inputCfg.mask = config->outputCfg.mask = (EFFECT_CONFIG_SMP_RATE | EFFECT_CONFIG_CHANNELS | EFFECT_CONFIG_FORMAT); } 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); 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; 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, -- cgit v1.1