diff options
| -rw-r--r-- | core/jni/android_media_AudioRecord.cpp | 10 | ||||
| -rw-r--r-- | core/jni/android_media_AudioTrack.cpp | 10 | ||||
| -rw-r--r-- | media/jni/android_media_MediaDrm.cpp | 10 | ||||
| -rw-r--r-- | media/jni/android_media_ResampleInputStream.cpp | 2 | ||||
| -rw-r--r-- | media/jni/audioeffect/android_media_AudioEffect.cpp | 14 | ||||
| -rw-r--r-- | media/jni/audioeffect/android_media_Visualizer.cpp | 14 |
6 files changed, 30 insertions, 30 deletions
diff --git a/core/jni/android_media_AudioRecord.cpp b/core/jni/android_media_AudioRecord.cpp index b977e377f2f3..b45ec51661d4 100644 --- a/core/jni/android_media_AudioRecord.cpp +++ b/core/jni/android_media_AudioRecord.cpp @@ -67,11 +67,11 @@ static SortedVector <audiorecord_callback_cookie *> sAudioRecordCallBackCookies; // ---------------------------------------------------------------------------- -#define AUDIORECORD_ERROR_SETUP_ZEROFRAMECOUNT -16 -#define AUDIORECORD_ERROR_SETUP_INVALIDCHANNELMASK -17 -#define AUDIORECORD_ERROR_SETUP_INVALIDFORMAT -18 -#define AUDIORECORD_ERROR_SETUP_INVALIDSOURCE -19 -#define AUDIORECORD_ERROR_SETUP_NATIVEINITFAILED -20 +#define AUDIORECORD_ERROR_SETUP_ZEROFRAMECOUNT (-16) +#define AUDIORECORD_ERROR_SETUP_INVALIDCHANNELMASK (-17) +#define AUDIORECORD_ERROR_SETUP_INVALIDFORMAT (-18) +#define AUDIORECORD_ERROR_SETUP_INVALIDSOURCE (-19) +#define AUDIORECORD_ERROR_SETUP_NATIVEINITFAILED (-20) // ---------------------------------------------------------------------------- static void recorderCallback(int event, void* user, void *info) { diff --git a/core/jni/android_media_AudioTrack.cpp b/core/jni/android_media_AudioTrack.cpp index 7860b74cc804..692264e03c49 100644 --- a/core/jni/android_media_AudioTrack.cpp +++ b/core/jni/android_media_AudioTrack.cpp @@ -108,11 +108,11 @@ static SortedVector <audiotrack_callback_cookie *> sAudioTrackCallBackCookies; // ---------------------------------------------------------------------------- #define DEFAULT_OUTPUT_SAMPLE_RATE 44100 -#define AUDIOTRACK_ERROR_SETUP_AUDIOSYSTEM -16 -#define AUDIOTRACK_ERROR_SETUP_INVALIDCHANNELMASK -17 -#define AUDIOTRACK_ERROR_SETUP_INVALIDFORMAT -18 -#define AUDIOTRACK_ERROR_SETUP_INVALIDSTREAMTYPE -19 -#define AUDIOTRACK_ERROR_SETUP_NATIVEINITFAILED -20 +#define AUDIOTRACK_ERROR_SETUP_AUDIOSYSTEM (-16) +#define AUDIOTRACK_ERROR_SETUP_INVALIDCHANNELMASK (-17) +#define AUDIOTRACK_ERROR_SETUP_INVALIDFORMAT (-18) +#define AUDIOTRACK_ERROR_SETUP_INVALIDSTREAMTYPE (-19) +#define AUDIOTRACK_ERROR_SETUP_NATIVEINITFAILED (-20) // ---------------------------------------------------------------------------- static void audioCallback(int event, void* user, void *info) { diff --git a/media/jni/android_media_MediaDrm.cpp b/media/jni/android_media_MediaDrm.cpp index 275de1ad5ccb..557db6c684fe 100644 --- a/media/jni/android_media_MediaDrm.cpp +++ b/media/jni/android_media_MediaDrm.cpp @@ -37,23 +37,23 @@ namespace android { #define FIND_CLASS(var, className) \ var = env->FindClass(className); \ - LOG_FATAL_IF(! var, "Unable to find class " className); + LOG_FATAL_IF(! (var), "Unable to find class " className); #define GET_FIELD_ID(var, clazz, fieldName, fieldDescriptor) \ var = env->GetFieldID(clazz, fieldName, fieldDescriptor); \ - LOG_FATAL_IF(! var, "Unable to find field " fieldName); + LOG_FATAL_IF(! (var), "Unable to find field " fieldName); #define GET_METHOD_ID(var, clazz, fieldName, fieldDescriptor) \ var = env->GetMethodID(clazz, fieldName, fieldDescriptor); \ - LOG_FATAL_IF(! var, "Unable to find method " fieldName); + LOG_FATAL_IF(! (var), "Unable to find method " fieldName); #define GET_STATIC_FIELD_ID(var, clazz, fieldName, fieldDescriptor) \ var = env->GetStaticFieldID(clazz, fieldName, fieldDescriptor); \ - LOG_FATAL_IF(! var, "Unable to find field " fieldName); + LOG_FATAL_IF(! (var), "Unable to find field " fieldName); #define GET_STATIC_METHOD_ID(var, clazz, fieldName, fieldDescriptor) \ var = env->GetStaticMethodID(clazz, fieldName, fieldDescriptor); \ - LOG_FATAL_IF(! var, "Unable to find static method " fieldName); + LOG_FATAL_IF(! (var), "Unable to find static method " fieldName); struct RequestFields { diff --git a/media/jni/android_media_ResampleInputStream.cpp b/media/jni/android_media_ResampleInputStream.cpp index d06baa57071d..fa755242a86b 100644 --- a/media/jni/android_media_ResampleInputStream.cpp +++ b/media/jni/android_media_ResampleInputStream.cpp @@ -36,7 +36,7 @@ using namespace android; -#define FIR_COEF(coef) (short)(0x10000 * coef) +#define FIR_COEF(coef) (short)(0x10000 * (coef)) static const short fir21[] = { FIR_COEF(-0.006965742326), FIR_COEF(-0.008428945737), diff --git a/media/jni/audioeffect/android_media_AudioEffect.cpp b/media/jni/audioeffect/android_media_AudioEffect.cpp index fa6913573add..e7c2168a5860 100644 --- a/media/jni/audioeffect/android_media_AudioEffect.cpp +++ b/media/jni/audioeffect/android_media_AudioEffect.cpp @@ -30,13 +30,13 @@ using namespace android; #define AUDIOEFFECT_SUCCESS 0 -#define AUDIOEFFECT_ERROR -1 -#define AUDIOEFFECT_ERROR_ALREADY_EXISTS -2 -#define AUDIOEFFECT_ERROR_NO_INIT -3 -#define AUDIOEFFECT_ERROR_BAD_VALUE -4 -#define AUDIOEFFECT_ERROR_INVALID_OPERATION -5 -#define AUDIOEFFECT_ERROR_NO_MEMORY -6 -#define AUDIOEFFECT_ERROR_DEAD_OBJECT -7 +#define AUDIOEFFECT_ERROR (-1) +#define AUDIOEFFECT_ERROR_ALREADY_EXISTS (-2) +#define AUDIOEFFECT_ERROR_NO_INIT (-3) +#define AUDIOEFFECT_ERROR_BAD_VALUE (-4) +#define AUDIOEFFECT_ERROR_INVALID_OPERATION (-5) +#define AUDIOEFFECT_ERROR_NO_MEMORY (-6) +#define AUDIOEFFECT_ERROR_DEAD_OBJECT (-7) // ---------------------------------------------------------------------------- static const char* const kClassPathName = "android/media/audiofx/AudioEffect"; diff --git a/media/jni/audioeffect/android_media_Visualizer.cpp b/media/jni/audioeffect/android_media_Visualizer.cpp index 3d3adba609c0..ce886eeb5f93 100644 --- a/media/jni/audioeffect/android_media_Visualizer.cpp +++ b/media/jni/audioeffect/android_media_Visualizer.cpp @@ -31,13 +31,13 @@ using namespace android; #define VISUALIZER_SUCCESS 0 -#define VISUALIZER_ERROR -1 -#define VISUALIZER_ERROR_ALREADY_EXISTS -2 -#define VISUALIZER_ERROR_NO_INIT -3 -#define VISUALIZER_ERROR_BAD_VALUE -4 -#define VISUALIZER_ERROR_INVALID_OPERATION -5 -#define VISUALIZER_ERROR_NO_MEMORY -6 -#define VISUALIZER_ERROR_DEAD_OBJECT -7 +#define VISUALIZER_ERROR (-1) +#define VISUALIZER_ERROR_ALREADY_EXISTS (-2) +#define VISUALIZER_ERROR_NO_INIT (-3) +#define VISUALIZER_ERROR_BAD_VALUE (-4) +#define VISUALIZER_ERROR_INVALID_OPERATION (-5) +#define VISUALIZER_ERROR_NO_MEMORY (-6) +#define VISUALIZER_ERROR_DEAD_OBJECT (-7) #define NATIVE_EVENT_PCM_CAPTURE 0 #define NATIVE_EVENT_FFT_CAPTURE 1 |