From 15618d9d8271efc83a2a1ed100da4d27977685a3 Mon Sep 17 00:00:00 2001 From: Mattia Iavarone Date: Mon, 12 Aug 2019 21:59:29 +0200 Subject: [PATCH] Fix tests again --- .../cameraview/internal/DeviceEncodersTest.java | 2 +- .../otaliastudios/cameraview/internal/DeviceEncoders.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/internal/DeviceEncodersTest.java b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/internal/DeviceEncodersTest.java index e368790c..32e313c2 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/internal/DeviceEncodersTest.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/internal/DeviceEncodersTest.java @@ -38,7 +38,7 @@ public class DeviceEncodersTest extends BaseTest { // This is guaranteed to work, see // https://developer.android.com/guide/topics/media/media-formats - private final static Size GUARANTEED_SIZE = new Size(360, 380); + private final static Size GUARANTEED_SIZE = new Size(176, 144); private boolean enabled; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/internal/DeviceEncoders.java b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/DeviceEncoders.java index 80e00c51..4fbd6dac 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/internal/DeviceEncoders.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/DeviceEncoders.java @@ -150,6 +150,11 @@ public class DeviceEncoders { " Desired:" + height + " Range:" + mVideoCapabilities.getSupportedHeights()); } + if (!mVideoCapabilities.isSizeSupported(width, height)) { + throw new RuntimeException("Size not supported for unknown reason." + + " Might be an aspect ratio issue." + + " Desired size:" + size); + } Size adjusted = new Size(width, height); LOG.i("getSupportedVideoSize -", "inputSize:", size, "adjustedSize:", adjusted); return adjusted;