From db7578596a6e51e0c65cbb30d5f892838f69c876 Mon Sep 17 00:00:00 2001 From: Mattia Iavarone Date: Mon, 9 Dec 2019 00:49:28 +0100 Subject: [PATCH] Test --- .github/workflows/emulator_script.sh | 2 +- .../com/otaliastudios/cameraview/engine/Camera1Engine.java | 4 ---- .../com/otaliastudios/cameraview/engine/Camera2Engine.java | 4 ---- .../com/otaliastudios/cameraview/engine/CameraEngine.java | 4 ++-- 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/.github/workflows/emulator_script.sh b/.github/workflows/emulator_script.sh index 8f3a7881..4cb2522e 100755 --- a/.github/workflows/emulator_script.sh +++ b/.github/workflows/emulator_script.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash adb logcat -c -adb logcat Camera*:I *:E & +adb logcat CameraOrchestrator:I CameraEngine:I CameraView:I *:E & ./gradlew cameraview:connectedCheck \ No newline at end of file diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera1Engine.java b/cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera1Engine.java index 59163449..e4791ae4 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera1Engine.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera1Engine.java @@ -54,10 +54,6 @@ public class Camera1Engine extends CameraEngine implements Camera.PreviewCallback, Camera.ErrorCallback, FrameManager.BufferCallback { - - private static final String TAG = Camera1Engine.class.getSimpleName(); - private static final CameraLogger LOG = CameraLogger.create(TAG); - private static final String JOB_FOCUS_RESET = "focus reset"; private static final String JOB_FOCUS_END = "focus end"; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera2Engine.java b/cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera2Engine.java index 80dfab0b..639de57f 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera2Engine.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera2Engine.java @@ -80,10 +80,6 @@ import java.util.concurrent.ExecutionException; @RequiresApi(Build.VERSION_CODES.LOLLIPOP) public class Camera2Engine extends CameraEngine implements ImageReader.OnImageAvailableListener, ActionHolder { - - private static final String TAG = Camera2Engine.class.getSimpleName(); - private static final CameraLogger LOG = CameraLogger.create(TAG); - private static final int FRAME_PROCESSING_FORMAT = ImageFormat.NV21; private static final int FRAME_PROCESSING_INPUT_FORMAT = ImageFormat.YUV_420_888; @VisibleForTesting static final long METER_TIMEOUT = 2500; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/engine/CameraEngine.java b/cameraview/src/main/java/com/otaliastudios/cameraview/engine/CameraEngine.java index b5019108..13726ef3 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/engine/CameraEngine.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/engine/CameraEngine.java @@ -131,8 +131,8 @@ public abstract class CameraEngine implements void dispatchOnVideoRecordingEnd(); } - private static final String TAG = CameraEngine.class.getSimpleName(); - private static final CameraLogger LOG = CameraLogger.create(TAG); + protected static final String TAG = CameraEngine.class.getSimpleName(); + protected static final CameraLogger LOG = CameraLogger.create(TAG); // Need to be protected @SuppressWarnings("WeakerAccess") protected final Callback mCallback;