pull/696/head
Mattia Iavarone 6 years ago
parent 8b5fd8a989
commit db7578596a
  1. 2
      .github/workflows/emulator_script.sh
  2. 4
      cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera1Engine.java
  3. 4
      cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera2Engine.java
  4. 4
      cameraview/src/main/java/com/otaliastudios/cameraview/engine/CameraEngine.java

@ -1,4 +1,4 @@
#!/usr/bin/env bash #!/usr/bin/env bash
adb logcat -c adb logcat -c
adb logcat Camera*:I *:E & adb logcat CameraOrchestrator:I CameraEngine:I CameraView:I *:E &
./gradlew cameraview:connectedCheck ./gradlew cameraview:connectedCheck

@ -54,10 +54,6 @@ public class Camera1Engine extends CameraEngine implements
Camera.PreviewCallback, Camera.PreviewCallback,
Camera.ErrorCallback, Camera.ErrorCallback,
FrameManager.BufferCallback { 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_RESET = "focus reset";
private static final String JOB_FOCUS_END = "focus end"; private static final String JOB_FOCUS_END = "focus end";

@ -80,10 +80,6 @@ import java.util.concurrent.ExecutionException;
@RequiresApi(Build.VERSION_CODES.LOLLIPOP) @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
public class Camera2Engine extends CameraEngine implements ImageReader.OnImageAvailableListener, public class Camera2Engine extends CameraEngine implements ImageReader.OnImageAvailableListener,
ActionHolder { 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_FORMAT = ImageFormat.NV21;
private static final int FRAME_PROCESSING_INPUT_FORMAT = ImageFormat.YUV_420_888; private static final int FRAME_PROCESSING_INPUT_FORMAT = ImageFormat.YUV_420_888;
@VisibleForTesting static final long METER_TIMEOUT = 2500; @VisibleForTesting static final long METER_TIMEOUT = 2500;

@ -131,8 +131,8 @@ public abstract class CameraEngine implements
void dispatchOnVideoRecordingEnd(); void dispatchOnVideoRecordingEnd();
} }
private static final String TAG = CameraEngine.class.getSimpleName(); protected static final String TAG = CameraEngine.class.getSimpleName();
private static final CameraLogger LOG = CameraLogger.create(TAG); protected static final CameraLogger LOG = CameraLogger.create(TAG);
// Need to be protected // Need to be protected
@SuppressWarnings("WeakerAccess") protected final Callback mCallback; @SuppressWarnings("WeakerAccess") protected final Callback mCallback;

Loading…
Cancel
Save