From 4531981d5ec33b7fc902b2b18d736839e15eeeb1 Mon Sep 17 00:00:00 2001 From: Mattia Iavarone Date: Wed, 11 Dec 2019 15:37:45 +0100 Subject: [PATCH] Test --- .github/workflows/emulator_script.sh | 2 +- .../cameraview/engine/CameraIntegrationTest.java | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/emulator_script.sh b/.github/workflows/emulator_script.sh index 1810bbba..47e0f4b1 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 SnapshotVideoRecorder:I MessageQueue:W *: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 MessageQueue:W MPEG4Writer: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 74c8e5a2..b6e9229e 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/engine/CameraIntegrationTest.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/engine/CameraIntegrationTest.java @@ -632,10 +632,10 @@ public abstract class CameraIntegrationTest extends Base camera.setMode(Mode.VIDEO); camera.setVideoSize(SizeSelectors.maxArea(480 * 360)); openSync(true); - // Assuming video frame rate is 12... + // Assuming video frame rate is 20... //noinspection ConstantConditions - camera.setVideoBitRate((int) estimateVideoBitRate(camera.getVideoSize(), 12)); - camera.setVideoMaxSize(estimateVideoBytes(camera.getVideoBitRate(), 4000)); + camera.setVideoBitRate((int) estimateVideoBitRate(camera.getVideoSize(), 20)); + camera.setVideoMaxSize(estimateVideoBytes(camera.getVideoBitRate(), 6000)); takeVideoSync(true); waitForVideoResult(true); } @@ -645,11 +645,13 @@ public abstract class CameraIntegrationTest extends Base openSync(true); camera.setSnapshotMaxWidth(480); camera.setSnapshotMaxHeight(480); - camera.setPreviewFrameRate(12F); + // We don't want a very low FPS or the video frames are too sparse and recording + // can fail (e.g. audio reaching completion while video still struggling to start) + camera.setPreviewFrameRate(30F); //noinspection ConstantConditions camera.setVideoBitRate((int) estimateVideoBitRate(camera.getSnapshotSize(), (int) camera.getPreviewFrameRate())); - camera.setVideoMaxSize(estimateVideoBytes(camera.getVideoBitRate(), 4000)); + camera.setVideoMaxSize(estimateVideoBytes(camera.getVideoBitRate(), 6000)); takeVideoSnapshotSync(true); waitForVideoResult(true); }