diff options
author | Glenn Kasten <gkasten@google.com> | 2011-12-15 09:51:17 -0800 |
---|---|---|
committer | Glenn Kasten <gkasten@google.com> | 2012-01-05 07:33:45 -0800 |
commit | f6b1678f8f508b447155a81b44e214475ab634a8 (patch) | |
tree | dabe2858dfed9133c6a270cd6b86877a9d3588b1 /media/libeffects/testlibs/AudioBiquadFilter.cpp | |
parent | 94023fa6744e24f26f0aba1699ec278649bd66df (diff) | |
download | frameworks_av-f6b1678f8f508b447155a81b44e214475ab634a8.zip frameworks_av-f6b1678f8f508b447155a81b44e214475ab634a8.tar.gz frameworks_av-f6b1678f8f508b447155a81b44e214475ab634a8.tar.bz2 |
Use the standard CC_LIKELY and CC_UNLIKELY macros
Several source files privately defined macros LIKELY and UNLIKELY in terms
of __builtin_expect. But <cutils/compiler.h> already has CC_LIKELY and
CC_UNLIKELY which are intended for this purpose. So rename the private
uses to use the standard names.
In addition, AudioFlinger was relying on the macro expanding to extra ( ).
Change-Id: I2494e087a0c0cac0ac998335f5e9c8ad02955873
Diffstat (limited to 'media/libeffects/testlibs/AudioBiquadFilter.cpp')
-rw-r--r-- | media/libeffects/testlibs/AudioBiquadFilter.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/media/libeffects/testlibs/AudioBiquadFilter.cpp b/media/libeffects/testlibs/AudioBiquadFilter.cpp index 72917a3..16dd1c5 100644 --- a/media/libeffects/testlibs/AudioBiquadFilter.cpp +++ b/media/libeffects/testlibs/AudioBiquadFilter.cpp @@ -17,12 +17,10 @@ #include <string.h> #include <assert.h> +#include <cutils/compiler.h> #include "AudioBiquadFilter.h" -#define LIKELY( exp ) (__builtin_expect( (exp) != 0, true )) -#define UNLIKELY( exp ) (__builtin_expect( (exp) != 0, false )) - namespace android { const audio_coef_t AudioBiquadFilter::IDENTITY_COEFS[AudioBiquadFilter::NUM_COEFS] = { AUDIO_COEF_ONE, 0, 0, 0, 0 }; @@ -55,7 +53,7 @@ void AudioBiquadFilter::clear() { void AudioBiquadFilter::setCoefs(const audio_coef_t coefs[NUM_COEFS], bool immediate) { memcpy(mTargetCoefs, coefs, sizeof(mTargetCoefs)); if (mState & STATE_ENABLED_MASK) { - if (UNLIKELY(immediate)) { + if (CC_UNLIKELY(immediate)) { memcpy(mCoefs, coefs, sizeof(mCoefs)); setState(STATE_NORMAL); } else { @@ -70,7 +68,7 @@ void AudioBiquadFilter::process(const audio_sample_t in[], audio_sample_t out[], } void AudioBiquadFilter::enable(bool immediate) { - if (UNLIKELY(immediate)) { + if (CC_UNLIKELY(immediate)) { memcpy(mCoefs, mTargetCoefs, sizeof(mCoefs)); setState(STATE_NORMAL); } else { @@ -79,7 +77,7 @@ void AudioBiquadFilter::enable(bool immediate) { } void AudioBiquadFilter::disable(bool immediate) { - if (UNLIKELY(immediate)) { + if (CC_UNLIKELY(immediate)) { memcpy(mCoefs, IDENTITY_COEFS, sizeof(mCoefs)); setState(STATE_BYPASS); } else { @@ -142,7 +140,7 @@ void AudioBiquadFilter::process_bypass(const audio_sample_t * in, audio_sample_t * out, int frameCount) { // The common case is in-place processing, because this is what the EQ does. - if (UNLIKELY(in != out)) { + if (CC_UNLIKELY(in != out)) { memcpy(out, in, frameCount * mNumChannels * sizeof(audio_sample_t)); } } |