diff --git a/.github/workflows/emulator_script.sh b/.github/workflows/emulator_script.sh index b9e29ca2..9e1235bb 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 VideoRecorder: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 SnapshotVideoRecorder:I *:E -v color & ./gradlew cameraview:connectedCheck \ No newline at end of file diff --git a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/engine/CameraIntegrationTest.java b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/engine/CameraIntegrationTest.java index e3fc95ac..10a2eaba 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/engine/CameraIntegrationTest.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/engine/CameraIntegrationTest.java @@ -630,7 +630,8 @@ public abstract class CameraIntegrationTest extends Base @Test public void testEndVideo_withMaxSize() { camera.setMode(Mode.VIDEO); - camera.setVideoMaxSize(2000*1000); // Less is risky + camera.setVideoSize(SizeSelectors.smallest()); + camera.setVideoMaxSize(1000*1000); openSync(true); takeVideoSync(true); waitForVideoResult(true); @@ -638,7 +639,7 @@ public abstract class CameraIntegrationTest extends Base @Test public void testEndVideoSnapshot_withMaxSize() { - camera.setVideoMaxSize(2000*1000); + camera.setVideoMaxSize(1000*1000); openSync(true); takeVideoSnapshotSync(true); waitForVideoResult(true); diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/video/SnapshotVideoRecorder.java b/cameraview/src/main/java/com/otaliastudios/cameraview/video/SnapshotVideoRecorder.java index 8539ab6a..7ef9054d 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/video/SnapshotVideoRecorder.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/video/SnapshotVideoRecorder.java @@ -231,9 +231,10 @@ public class SnapshotVideoRecorder extends VideoRecorder implements RendererFram } if (mCurrentState == STATE_RECORDING) { + LOG.i("scheduling frame."); synchronized (mEncoderEngineLock) { if (mEncoderEngine != null) { // Can be null on teardown. - LOG.v("dispatching frame."); + LOG.i("dispatching frame."); TextureMediaEncoder textureEncoder = (TextureMediaEncoder) mEncoderEngine.getVideoEncoder(); TextureMediaEncoder.Frame frame = textureEncoder.acquireFrame();