summaryrefslogtreecommitdiffstats
path: root/media/jni/audioeffect
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2011-10-20 11:56:00 +0100
committerSteve Block <steveblock@google.com>2011-10-26 09:57:54 +0100
commit71f2cf116aab893e224056c38ab146bd1538dd3e (patch)
tree75a9162a0ea00830184b12a9ca51d3a1a040a5bb /media/jni/audioeffect
parent1da79501066a74b630c8aa138db0f86ab6c690bb (diff)
downloadframeworks_base-71f2cf116aab893e224056c38ab146bd1538dd3e.zip
frameworks_base-71f2cf116aab893e224056c38ab146bd1538dd3e.tar.gz
frameworks_base-71f2cf116aab893e224056c38ab146bd1538dd3e.tar.bz2
Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
Diffstat (limited to 'media/jni/audioeffect')
-rw-r--r--media/jni/audioeffect/android_media_AudioEffect.cpp24
-rw-r--r--media/jni/audioeffect/android_media_Visualizer.cpp18
2 files changed, 21 insertions, 21 deletions
diff --git a/media/jni/audioeffect/android_media_AudioEffect.cpp b/media/jni/audioeffect/android_media_AudioEffect.cpp
index 277ea55..d517a58 100644
--- a/media/jni/audioeffect/android_media_AudioEffect.cpp
+++ b/media/jni/audioeffect/android_media_AudioEffect.cpp
@@ -106,7 +106,7 @@ static void effectCallback(int event, void* user, void *info) {
effect_callback_cookie *callbackInfo = (effect_callback_cookie *)user;
JNIEnv *env = AndroidRuntime::getJNIEnv();
- LOGV("effectCallback: callbackInfo %p, audioEffect_ref %p audioEffect_class %p",
+ ALOGV("effectCallback: callbackInfo %p, audioEffect_ref %p audioEffect_class %p",
callbackInfo,
callbackInfo->audioEffect_ref,
callbackInfo->audioEffect_class);
@@ -124,7 +124,7 @@ static void effectCallback(int event, void* user, void *info) {
}
param = *(bool *)info;
arg1 = (int)param;
- LOGV("EVENT_CONTROL_STATUS_CHANGED");
+ ALOGV("EVENT_CONTROL_STATUS_CHANGED");
break;
case AudioEffect::EVENT_ENABLE_STATUS_CHANGED:
if (info == 0) {
@@ -133,7 +133,7 @@ static void effectCallback(int event, void* user, void *info) {
}
param = *(bool *)info;
arg1 = (int)param;
- LOGV("EVENT_ENABLE_STATUS_CHANGED");
+ ALOGV("EVENT_ENABLE_STATUS_CHANGED");
break;
case AudioEffect::EVENT_PARAMETER_CHANGED:
if (info == 0) {
@@ -156,7 +156,7 @@ static void effectCallback(int event, void* user, void *info) {
memcpy(bytes, p, size);
env->ReleaseByteArrayElements(array, bytes, 0);
obj = array;
- LOGV("EVENT_PARAMETER_CHANGED");
+ ALOGV("EVENT_PARAMETER_CHANGED");
break;
case AudioEffect::EVENT_ERROR:
LOGW("EVENT_ERROR");
@@ -187,7 +187,7 @@ static void
android_media_AudioEffect_native_init(JNIEnv *env)
{
- LOGV("android_media_AudioEffect_native_init");
+ ALOGV("android_media_AudioEffect_native_init");
fields.clazzEffect = NULL;
fields.clazzDesc = NULL;
@@ -251,7 +251,7 @@ static jint
android_media_AudioEffect_native_setup(JNIEnv *env, jobject thiz, jobject weak_this,
jstring type, jstring uuid, jint priority, jint sessionId, jintArray jId, jobjectArray javadesc)
{
- LOGV("android_media_AudioEffect_native_setup");
+ ALOGV("android_media_AudioEffect_native_setup");
AudioEffectJniStorage* lpJniStorage = NULL;
int lStatus = AUDIOEFFECT_ERROR_NO_MEMORY;
AudioEffect* lpAudioEffect = NULL;
@@ -298,7 +298,7 @@ android_media_AudioEffect_native_setup(JNIEnv *env, jobject thiz, jobject weak_t
// we use a weak reference so the AudioEffect object can be garbage collected.
lpJniStorage->mCallbackData.audioEffect_ref = env->NewGlobalRef(weak_this);
- LOGV("setup: lpJniStorage: %p audioEffect_ref %p audioEffect_class %p, &mCallbackData %p",
+ ALOGV("setup: lpJniStorage: %p audioEffect_ref %p audioEffect_class %p, &mCallbackData %p",
lpJniStorage,
lpJniStorage->mCallbackData.audioEffect_ref,
lpJniStorage->mCallbackData.audioEffect_class,
@@ -425,13 +425,13 @@ setup_failure:
// ----------------------------------------------------------------------------
static void android_media_AudioEffect_native_finalize(JNIEnv *env, jobject thiz) {
- LOGV("android_media_AudioEffect_native_finalize jobject: %x\n", (int)thiz);
+ ALOGV("android_media_AudioEffect_native_finalize jobject: %x\n", (int)thiz);
// delete the AudioEffect object
AudioEffect* lpAudioEffect = (AudioEffect *)env->GetIntField(
thiz, fields.fidNativeAudioEffect);
if (lpAudioEffect) {
- LOGV("deleting AudioEffect: %x\n", (int)lpAudioEffect);
+ ALOGV("deleting AudioEffect: %x\n", (int)lpAudioEffect);
delete lpAudioEffect;
}
@@ -439,7 +439,7 @@ static void android_media_AudioEffect_native_finalize(JNIEnv *env, jobject thiz
AudioEffectJniStorage* lpJniStorage = (AudioEffectJniStorage *)env->GetIntField(
thiz, fields.fidJniData);
if (lpJniStorage) {
- LOGV("deleting pJniStorage: %x\n", (int)lpJniStorage);
+ ALOGV("deleting pJniStorage: %x\n", (int)lpJniStorage);
delete lpJniStorage;
}
}
@@ -720,7 +720,7 @@ android_media_AudioEffect_native_queryEffects(JNIEnv *env, jclass clazz)
return ret;
}
- LOGV("queryEffects() numEffects: %d", numEffects);
+ ALOGV("queryEffects() numEffects: %d", numEffects);
for (i = 0; i < numEffects; i++) {
if (AudioEffect::queryEffect(i, &desc) != NO_ERROR) {
@@ -808,7 +808,7 @@ android_media_AudioEffect_native_queryPreProcessings(JNIEnv *env, jclass clazz,
delete[] descriptors;
return NULL;
}
- LOGV("queryDefaultPreProcessing() got %d effects", numEffects);
+ ALOGV("queryDefaultPreProcessing() got %d effects", numEffects);
jobjectArray ret = env->NewObjectArray(numEffects, fields.clazzDesc, NULL);
if (ret == NULL) {
diff --git a/media/jni/audioeffect/android_media_Visualizer.cpp b/media/jni/audioeffect/android_media_Visualizer.cpp
index 27b28ee..b64505c 100644
--- a/media/jni/audioeffect/android_media_Visualizer.cpp
+++ b/media/jni/audioeffect/android_media_Visualizer.cpp
@@ -107,7 +107,7 @@ static void captureCallback(void* user,
visualizer_callback_cookie *callbackInfo = (visualizer_callback_cookie *)user;
JNIEnv *env = AndroidRuntime::getJNIEnv();
- LOGV("captureCallback: callbackInfo %p, visualizer_ref %p visualizer_class %p",
+ ALOGV("captureCallback: callbackInfo %p, visualizer_ref %p visualizer_class %p",
callbackInfo,
callbackInfo->visualizer_ref,
callbackInfo->visualizer_class);
@@ -178,7 +178,7 @@ static void
android_media_visualizer_native_init(JNIEnv *env)
{
- LOGV("android_media_visualizer_native_init");
+ ALOGV("android_media_visualizer_native_init");
fields.clazzEffect = NULL;
@@ -225,7 +225,7 @@ static jint
android_media_visualizer_native_setup(JNIEnv *env, jobject thiz, jobject weak_this,
jint sessionId, jintArray jId)
{
- LOGV("android_media_visualizer_native_setup");
+ ALOGV("android_media_visualizer_native_setup");
visualizerJniStorage* lpJniStorage = NULL;
int lStatus = VISUALIZER_ERROR_NO_MEMORY;
Visualizer* lpVisualizer = NULL;
@@ -241,7 +241,7 @@ android_media_visualizer_native_setup(JNIEnv *env, jobject thiz, jobject weak_th
// we use a weak reference so the Visualizer object can be garbage collected.
lpJniStorage->mCallbackData.visualizer_ref = env->NewGlobalRef(weak_this);
- LOGV("setup: lpJniStorage: %p visualizer_ref %p visualizer_class %p, &mCallbackData %p",
+ ALOGV("setup: lpJniStorage: %p visualizer_ref %p visualizer_class %p, &mCallbackData %p",
lpJniStorage,
lpJniStorage->mCallbackData.visualizer_ref,
lpJniStorage->mCallbackData.visualizer_class,
@@ -307,13 +307,13 @@ setup_failure:
// ----------------------------------------------------------------------------
static void android_media_visualizer_native_finalize(JNIEnv *env, jobject thiz) {
- LOGV("android_media_visualizer_native_finalize jobject: %x\n", (int)thiz);
+ ALOGV("android_media_visualizer_native_finalize jobject: %x\n", (int)thiz);
// delete the Visualizer object
Visualizer* lpVisualizer = (Visualizer *)env->GetIntField(
thiz, fields.fidNativeVisualizer);
if (lpVisualizer) {
- LOGV("deleting Visualizer: %x\n", (int)lpVisualizer);
+ ALOGV("deleting Visualizer: %x\n", (int)lpVisualizer);
delete lpVisualizer;
}
@@ -321,7 +321,7 @@ static void android_media_visualizer_native_finalize(JNIEnv *env, jobject thiz)
visualizerJniStorage* lpJniStorage = (visualizerJniStorage *)env->GetIntField(
thiz, fields.fidJniData);
if (lpJniStorage) {
- LOGV("deleting pJniStorage: %x\n", (int)lpJniStorage);
+ ALOGV("deleting pJniStorage: %x\n", (int)lpJniStorage);
delete lpJniStorage;
}
}
@@ -366,7 +366,7 @@ android_media_visualizer_native_getCaptureSizeRange(JNIEnv *env, jobject thiz)
jint *nRange = env->GetIntArrayElements(jRange, NULL);
nRange[0] = Visualizer::getMinCaptureSize();
nRange[1] = Visualizer::getMaxCaptureSize();
- LOGV("getCaptureSizeRange() min %d max %d", nRange[0], nRange[1]);
+ ALOGV("getCaptureSizeRange() min %d max %d", nRange[0], nRange[1]);
env->ReleaseIntArrayElements(jRange, nRange, 0);
return jRange;
}
@@ -458,7 +458,7 @@ android_media_setPeriodicCapture(JNIEnv *env, jobject thiz, jint rate, jboolean
return VISUALIZER_ERROR_NO_INIT;
}
- LOGV("setPeriodicCapture: rate %d, jWaveform %d jFft %d",
+ ALOGV("setPeriodicCapture: rate %d, jWaveform %d jFft %d",
rate,
jWaveform,
jFft);