Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix hardcoded log tags.

Browse source
This commit is contained in:
Guillaume Beraudo 2011-03-11 15:37:18 +01:00
parent 911ca03af2
commit c0eb64a75c
4 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/org/linphone/core/Hacks.java
View file

@ -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());
}
}

2
src/org/linphone/core/tutorials/JavaCameraRecordImpl.java
View file

@ -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;
}

2
src/org/linphone/core/video/AndroidCameraRecord8.java
View file

@ -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);
}

8
src/org/linphone/core/video/AndroidCameraRecordImpl.java
View file

@ -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;