From 227b94f59963786bf3c144c8376c465eaae4bf9e Mon Sep 17 00:00:00 2001 From: Mattia Iavarone Date: Thu, 28 Sep 2017 13:34:20 +0200 Subject: [PATCH] Add logs --- .../main/java/com/otaliastudios/cameraview/CameraView.java | 1 + .../src/main/views/com/otaliastudios/cameraview/Preview.java | 2 +- .../com/otaliastudios/cameraview/SurfaceViewPreview.java | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java index 692a378b..97588dbf 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java @@ -161,6 +161,7 @@ public class CameraView extends FrameLayout { protected Preview instantiatePreview(Context context, ViewGroup container) { // TextureView is not supported without hardware acceleration. + LOG.i("preview:", "isHardwareAccelerated:", isHardwareAccelerated()); return isHardwareAccelerated() ? new TextureViewPreview(context, container, null) : new SurfaceViewPreview(context, container, null); diff --git a/cameraview/src/main/views/com/otaliastudios/cameraview/Preview.java b/cameraview/src/main/views/com/otaliastudios/cameraview/Preview.java index b8b0e58d..769ac1ce 100644 --- a/cameraview/src/main/views/com/otaliastudios/cameraview/Preview.java +++ b/cameraview/src/main/views/com/otaliastudios/cameraview/Preview.java @@ -8,7 +8,7 @@ import android.view.ViewGroup; abstract class Preview { - protected final static CameraLogger LOG = CameraLogger.create(Preview.class.getSimpleName()); + private final static CameraLogger LOG = CameraLogger.create(Preview.class.getSimpleName()); // Used for testing. Task mCropTask = new Task<>(); diff --git a/cameraview/src/main/views/com/otaliastudios/cameraview/SurfaceViewPreview.java b/cameraview/src/main/views/com/otaliastudios/cameraview/SurfaceViewPreview.java index 497298db..f9bd5499 100644 --- a/cameraview/src/main/views/com/otaliastudios/cameraview/SurfaceViewPreview.java +++ b/cameraview/src/main/views/com/otaliastudios/cameraview/SurfaceViewPreview.java @@ -11,6 +11,7 @@ import android.view.ViewGroup; // Fallback preview when hardware acceleration is off. class SurfaceViewPreview extends Preview { + private final static CameraLogger LOG = CameraLogger.create(SurfaceViewPreview.class.getSimpleName()); SurfaceViewPreview(Context context, ViewGroup parent, SurfaceCallback callback) { super(context, parent, callback); @@ -29,12 +30,14 @@ class SurfaceViewPreview extends Preview { @Override public void surfaceCreated(SurfaceHolder holder) { + LOG.i("callback:", "surfaceCreated"); // Looks like this is too early to call anything. // onSurfaceAvailable(getView().getWidth(), getView().getHeight()); } @Override public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) { + LOG.i("callback:", "surfaceChanged", "w:", width, "h:", height, "firstTime:", mFirstTime); if (mFirstTime) { onSurfaceAvailable(width, height); mFirstTime = false; @@ -45,6 +48,7 @@ class SurfaceViewPreview extends Preview { @Override public void surfaceDestroyed(SurfaceHolder holder) { + LOG.i("callback:", "surfaceDestroyed"); onSurfaceDestroyed(); mFirstTime = true; }