From c0eb64a75c52a0f4436bc614bc74e5881db8d519 Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Fri, 11 Mar 2011 15:37:18 +0100 Subject: [PATCH] Fix hardcoded log tags. --- src/org/linphone/core/Hacks.java | 4 +++- src/org/linphone/core/tutorials/JavaCameraRecordImpl.java | 2 +- src/org/linphone/core/video/AndroidCameraRecord8.java | 2 +- src/org/linphone/core/video/AndroidCameraRecordImpl.java | 8 ++++---- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/org/linphone/core/Hacks.java b/src/org/linphone/core/Hacks.java index 01f6d401d..d90588130 100644 --- a/src/org/linphone/core/Hacks.java +++ b/src/org/linphone/core/Hacks.java @@ -18,6 +18,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ package org.linphone.core; +import org.linphone.LinphoneManager; + import android.media.AudioManager; import android.os.Build; import android.util.Log; @@ -78,6 +80,6 @@ public final class Hacks { //sb.append("MANUFACTURER=").append(Build.MANUFACTURER).append("\n"); sb.append("SDK=").append(Build.VERSION.SDK); - Log.d("Linphone", sb.toString()); + Log.d(LinphoneManager.TAG, sb.toString()); } } diff --git a/src/org/linphone/core/tutorials/JavaCameraRecordImpl.java b/src/org/linphone/core/tutorials/JavaCameraRecordImpl.java index a40bee238..341bd28cc 100644 --- a/src/org/linphone/core/tutorials/JavaCameraRecordImpl.java +++ b/src/org/linphone/core/tutorials/JavaCameraRecordImpl.java @@ -59,7 +59,7 @@ class JavaCameraRecordImpl extends AndroidCameraRecord implements PreviewCallbac Size s = camera.getParameters().getPreviewSize(); int expectedBuffLength = s.width * s.height * 3 /2; if (expectedBuffLength != data.length) { - Log.e("Linphone", "onPreviewFrame called with bad buffer length " + data.length + Log.e(tag, "onPreviewFrame called with bad buffer length " + data.length + " whereas expected is " + expectedBuffLength + " don't calling putImage"); return; } diff --git a/src/org/linphone/core/video/AndroidCameraRecord8.java b/src/org/linphone/core/video/AndroidCameraRecord8.java index 20805bd64..ef8425d7e 100644 --- a/src/org/linphone/core/video/AndroidCameraRecord8.java +++ b/src/org/linphone/core/video/AndroidCameraRecord8.java @@ -40,7 +40,7 @@ class AndroidCameraRecord8 extends AndroidCameraRecordImpl { @Override protected void lowLevelSetPreviewCallback(Camera camera, PreviewCallback cb) { if (cb != null) { - Log.d("Linphone", "Setting optimized callback with buffer (Android >= 8). Remember to manage the pool of buffers!!!"); + Log.d(tag, "Setting optimized callback with buffer (Android >= 8). Remember to manage the pool of buffers!!!"); } camera.setPreviewCallbackWithBuffer(cb); } diff --git a/src/org/linphone/core/video/AndroidCameraRecordImpl.java b/src/org/linphone/core/video/AndroidCameraRecordImpl.java index 9e30cca07..84c22a0e4 100644 --- a/src/org/linphone/core/video/AndroidCameraRecordImpl.java +++ b/src/org/linphone/core/video/AndroidCameraRecordImpl.java @@ -56,17 +56,17 @@ class AndroidCameraRecordImpl extends AndroidCameraRecord implements PreviewCall public void onPreviewFrame(byte[] data, Camera camera) { if (data == null) { - Log.e("Linphone", "onPreviewFrame Called with null buffer"); + Log.e(tag, "onPreviewFrame Called with null buffer"); return; } if (filterCtxPtr == 0l) { - Log.e("Linphone", "onPreviewFrame Called with no filterCtxPtr set"); + Log.e(tag, "onPreviewFrame Called with no filterCtxPtr set"); return; } int expectedBuffLength = getExpectedBufferLength(); if (expectedBuffLength != data.length) { - Log.e("Linphone", "onPreviewFrame called with bad buffer length " + data.length + Log.e(tag, "onPreviewFrame called with bad buffer length " + data.length + " whereas expected is " + expectedBuffLength + " don't calling putImage"); return; } @@ -80,7 +80,7 @@ class AndroidCameraRecordImpl extends AndroidCameraRecord implements PreviewCall double currentTimeElapsed = 0.8 * (curTime - lastFrameTime) / 1000 + 0.2 * timeElapsedBetweenFrames; if (currentTimeElapsed < expectedTimeBetweenFrames) { -// Log.d("Linphone", "Clipping frame " + Math.round(1 / currentTimeElapsed) + " > " + fps); +// Log.d(tag, "Clipping frame " + Math.round(1 / currentTimeElapsed) + " > " + fps); return; } lastFrameTime = curTime;