From 430d89bdde106a2f34d7fc4e2bdae1d5fb7d351d Mon Sep 17 00:00:00 2001 From: Mattia Iavarone Date: Mon, 9 Dec 2019 21:02:32 +0100 Subject: [PATCH] Test --- .github/workflows/emulator_script.sh | 2 +- .../otaliastudios/cameraview/video/VideoRecorder.java | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/emulator_script.sh b/.github/workflows/emulator_script.sh index 6ee76a11..b9e29ca2 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 CameraOrchestrator:I CameraEngine:I CameraView:I CameraCallbacks:I CameraIntegrationTest:I MediaEncoderEngine:I MediaEncoder:I AudioMediaEncoder:I VideoMediaEncoder:I TextureMediaEncoder:I *:E -v color & +adb logcat CameraOrchestrator:I CameraEngine:I CameraView:I CameraCallbacks:I CameraIntegrationTest:I MediaEncoderEngine:I MediaEncoder:I AudioMediaEncoder:I VideoMediaEncoder:I TextureMediaEncoder:I VideoRecorder:I *:E -v color & ./gradlew cameraview:connectedCheck \ No newline at end of file diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/video/VideoRecorder.java b/cameraview/src/main/java/com/otaliastudios/cameraview/video/VideoRecorder.java index 62814e46..0705f392 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/video/VideoRecorder.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/video/VideoRecorder.java @@ -73,6 +73,7 @@ public abstract class VideoRecorder { "Ignoring. state:", mState); return; } + LOG.i("start:", "Changed state to STATE_RECORDING"); mState = STATE_RECORDING; } mResult = stub; @@ -91,6 +92,7 @@ public abstract class VideoRecorder { "Ignoring. isCameraShutdown:", isCameraShutdown); return; } + LOG.i("stop:", "Changed state to STATE_STOPPING"); mState = STATE_STOPPING; } onStop(isCameraShutdown); @@ -123,10 +125,15 @@ public abstract class VideoRecorder { */ protected final void dispatchResult() { synchronized (mStateLock) { - if (!isRecording()) return; + if (!isRecording()) { + LOG.w("dispatchResult:", "Called, but not recording! Aborting."); + return; + } + LOG.i("dispatchResult:", "Changed state to STATE_IDLE."); mState = STATE_IDLE; } onDispatchResult(); + LOG.i("dispatchResult:", "About to dispatch result:", mResult, mError); if (mListener != null) { mListener.onVideoResult(mResult, mError); }