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/libeffects/preprocessing | |
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/libeffects/preprocessing')
-rwxr-xr-x | media/libeffects/preprocessing/PreProcessing.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
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); } |