diff options
| author | Glenn Kasten <gkasten@google.com> | 2013-06-18 11:46:28 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2013-07-10 15:56:47 -0700 |
| commit | b7f08d386f2bddb8f3c87858f9204754b7fdb857 (patch) | |
| tree | 84600437e114225c05ef7d83b177273b8d157f93 /media/libeffects | |
| parent | 551ababe67ce31778000d52958e53e1c56e1a294 (diff) | |
| download | frameworks_av-b7f08d386f2bddb8f3c87858f9204754b7fdb857.zip frameworks_av-b7f08d386f2bddb8f3c87858f9204754b7fdb857.tar.gz frameworks_av-b7f08d386f2bddb8f3c87858f9204754b7fdb857.tar.bz2 | |
Clean up references to AUDIO_FORMAT_PCM_8_24_BIT
Change-Id: I08771eb2664b7082561a40937218c7f4414e2cce
Diffstat (limited to 'media/libeffects')
| -rw-r--r-- | media/libeffects/testlibs/AudioFormatAdapter.h | 1 | ||||
| -rw-r--r-- | media/libeffects/testlibs/EffectEqualizer.cpp | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/media/libeffects/testlibs/AudioFormatAdapter.h b/media/libeffects/testlibs/AudioFormatAdapter.h index 41f1810..dea2734 100644 --- a/media/libeffects/testlibs/AudioFormatAdapter.h +++ b/media/libeffects/testlibs/AudioFormatAdapter.h @@ -75,6 +75,7 @@ public: while (numSamples > 0) { uint32_t numSamplesIter = min(numSamples, mMaxSamplesPerCall); uint32_t nSamplesChannels = numSamplesIter * mNumChannels; + // This branch of "if" is untested if (mPcmFormat == AUDIO_FORMAT_PCM_8_24_BIT) { if (mBehavior == EFFECT_BUFFER_ACCESS_WRITE) { mpProcessor->process( diff --git a/media/libeffects/testlibs/EffectEqualizer.cpp b/media/libeffects/testlibs/EffectEqualizer.cpp index c35453b..8d00206 100644 --- a/media/libeffects/testlibs/EffectEqualizer.cpp +++ b/media/libeffects/testlibs/EffectEqualizer.cpp @@ -234,8 +234,7 @@ int Equalizer_setConfig(EqualizerContext *pContext, effect_config_t *pConfig) (pConfig->inputCfg.channels == AUDIO_CHANNEL_OUT_STEREO)); CHECK_ARG(pConfig->outputCfg.accessMode == EFFECT_BUFFER_ACCESS_WRITE || pConfig->outputCfg.accessMode == EFFECT_BUFFER_ACCESS_ACCUMULATE); - CHECK_ARG(pConfig->inputCfg.format == AUDIO_FORMAT_PCM_8_24_BIT - || pConfig->inputCfg.format == AUDIO_FORMAT_PCM_16_BIT); + CHECK_ARG(pConfig->inputCfg.format == AUDIO_FORMAT_PCM_16_BIT); int channelCount; if (pConfig->inputCfg.channels == AUDIO_CHANNEL_OUT_MONO) { |