Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "Fix misc-macro-parentheses warnings in audio media jni." am: 9ecb10d1b5 am: ca3f49d594" into nyc-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2016-05-24 18:57:11 +00:00
committed by Android (Google) Code Review
parent 4493049a88 0b5608015b
commit a90bd3a04a
6 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/jni/android_media_AudioRecord.cpp
View File

@@ -71,11 +71,11 @@ static SortedVector <audiorecord_callback_cookie *> sAudioRecordCallBackCookies;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#define AUDIORECORD_ERROR_SETUP_ZEROFRAMECOUNT -16 #define AUDIORECORD_ERROR_SETUP_ZEROFRAMECOUNT (-16)
#define AUDIORECORD_ERROR_SETUP_INVALIDCHANNELMASK -17 #define AUDIORECORD_ERROR_SETUP_INVALIDCHANNELMASK (-17)
#define AUDIORECORD_ERROR_SETUP_INVALIDFORMAT -18 #define AUDIORECORD_ERROR_SETUP_INVALIDFORMAT (-18)
#define AUDIORECORD_ERROR_SETUP_INVALIDSOURCE -19 #define AUDIORECORD_ERROR_SETUP_INVALIDSOURCE (-19)
#define AUDIORECORD_ERROR_SETUP_NATIVEINITFAILED -20 #define AUDIORECORD_ERROR_SETUP_NATIVEINITFAILED (-20)
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
static void recorderCallback(int event, void* user, void *info) { static void recorderCallback(int event, void* user, void *info) {

10
core/jni/android_media_AudioTrack.cpp
View File

@@ -110,11 +110,11 @@ static SortedVector <audiotrack_callback_cookie *> sAudioTrackCallBackCookies;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#define DEFAULT_OUTPUT_SAMPLE_RATE 44100 #define DEFAULT_OUTPUT_SAMPLE_RATE 44100
#define AUDIOTRACK_ERROR_SETUP_AUDIOSYSTEM -16 #define AUDIOTRACK_ERROR_SETUP_AUDIOSYSTEM (-16)
#define AUDIOTRACK_ERROR_SETUP_INVALIDCHANNELMASK -17 #define AUDIOTRACK_ERROR_SETUP_INVALIDCHANNELMASK (-17)
#define AUDIOTRACK_ERROR_SETUP_INVALIDFORMAT -18 #define AUDIOTRACK_ERROR_SETUP_INVALIDFORMAT (-18)
#define AUDIOTRACK_ERROR_SETUP_INVALIDSTREAMTYPE -19 #define AUDIOTRACK_ERROR_SETUP_INVALIDSTREAMTYPE (-19)
#define AUDIOTRACK_ERROR_SETUP_NATIVEINITFAILED -20 #define AUDIOTRACK_ERROR_SETUP_NATIVEINITFAILED (-20)
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
static void audioCallback(int event, void* user, void *info) { static void audioCallback(int event, void* user, void *info) {

10
media/jni/android_media_MediaDrm.cpp
View File

@@ -38,23 +38,23 @@ namespace android {
#define FIND_CLASS(var, className) \ #define FIND_CLASS(var, className) \
var = env->FindClass(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) \ #define GET_FIELD_ID(var, clazz, fieldName, fieldDescriptor) \
var = env->GetFieldID(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) \ #define GET_METHOD_ID(var, clazz, fieldName, fieldDescriptor) \
var = env->GetMethodID(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) \ #define GET_STATIC_FIELD_ID(var, clazz, fieldName, fieldDescriptor) \
var = env->GetStaticFieldID(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) \ #define GET_STATIC_METHOD_ID(var, clazz, fieldName, fieldDescriptor) \
var = env->GetStaticMethodID(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 { struct RequestFields {

2
media/jni/android_media_ResampleInputStream.cpp
View File

@@ -36,7 +36,7 @@
using namespace android; using namespace android;
#define FIR_COEF(coef) (short)(0x10000 * coef) #define FIR_COEF(coef) (short)(0x10000 * (coef))
static const short fir21[] = { static const short fir21[] = {
FIR_COEF(-0.006965742326), FIR_COEF(-0.006965742326),
FIR_COEF(-0.008428945737), FIR_COEF(-0.008428945737),

14
media/jni/audioeffect/android_media_AudioEffect.cpp
View File

@@ -30,13 +30,13 @@
using namespace android; using namespace android;
#define AUDIOEFFECT_SUCCESS 0 #define AUDIOEFFECT_SUCCESS 0
#define AUDIOEFFECT_ERROR -1 #define AUDIOEFFECT_ERROR (-1)
#define AUDIOEFFECT_ERROR_ALREADY_EXISTS -2 #define AUDIOEFFECT_ERROR_ALREADY_EXISTS (-2)
#define AUDIOEFFECT_ERROR_NO_INIT -3 #define AUDIOEFFECT_ERROR_NO_INIT (-3)
#define AUDIOEFFECT_ERROR_BAD_VALUE -4 #define AUDIOEFFECT_ERROR_BAD_VALUE (-4)
#define AUDIOEFFECT_ERROR_INVALID_OPERATION -5 #define AUDIOEFFECT_ERROR_INVALID_OPERATION (-5)
#define AUDIOEFFECT_ERROR_NO_MEMORY -6 #define AUDIOEFFECT_ERROR_NO_MEMORY (-6)
#define AUDIOEFFECT_ERROR_DEAD_OBJECT -7 #define AUDIOEFFECT_ERROR_DEAD_OBJECT (-7)
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
static const char* const kClassPathName = "android/media/audiofx/AudioEffect"; static const char* const kClassPathName = "android/media/audiofx/AudioEffect";

14
media/jni/audioeffect/android_media_Visualizer.cpp
View File

@@ -31,13 +31,13 @@
using namespace android; using namespace android;
#define VISUALIZER_SUCCESS 0 #define VISUALIZER_SUCCESS 0
#define VISUALIZER_ERROR -1 #define VISUALIZER_ERROR (-1)
#define VISUALIZER_ERROR_ALREADY_EXISTS -2 #define VISUALIZER_ERROR_ALREADY_EXISTS (-2)
#define VISUALIZER_ERROR_NO_INIT -3 #define VISUALIZER_ERROR_NO_INIT (-3)
#define VISUALIZER_ERROR_BAD_VALUE -4 #define VISUALIZER_ERROR_BAD_VALUE (-4)
#define VISUALIZER_ERROR_INVALID_OPERATION -5 #define VISUALIZER_ERROR_INVALID_OPERATION (-5)
#define VISUALIZER_ERROR_NO_MEMORY -6 #define VISUALIZER_ERROR_NO_MEMORY (-6)
#define VISUALIZER_ERROR_DEAD_OBJECT -7 #define VISUALIZER_ERROR_DEAD_OBJECT (-7)
#define NATIVE_EVENT_PCM_CAPTURE 0 #define NATIVE_EVENT_PCM_CAPTURE 0
#define NATIVE_EVENT_FFT_CAPTURE 1 #define NATIVE_EVENT_FFT_CAPTURE 1