summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ren-Pei Zeng <kamesan@google.com> 2022-12-23 15:19:00 +0800
committer Ren-Pei Zeng <kamesan@google.com> 2022-12-23 15:19:00 +0800
commit3d5d9321133805437ac159b5ca6d1b6e65fec741 (patch)
treee3145a70ae42beca21c2c6e239b00316b1103f35
parent616299378093304e39e79befd1c1398a0fa7da81 (diff)
Camera: Fix max video size for external camera
Similar to https://r.android.com/2148797, fix the frame duration comparison formula to filter >=30fps resolutions. Bug: 262577978, 237230436 Test: android.hardware.camera2.cts.RobustnessTest#testVerifyMandatoryOutputCombinationTables Change-Id: I6aedfbbdf2b3840746f32f4b05c8c158fc3d70c3
-rw-r--r--core/java/android/hardware/camera2/params/MandatoryStreamCombination.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/hardware/camera2/params/MandatoryStreamCombination.java b/core/java/android/hardware/camera2/params/MandatoryStreamCombination.java
index 6f77d12cc463..3fc44f8f84ac 100644
--- a/core/java/android/hardware/camera2/params/MandatoryStreamCombination.java
+++ b/core/java/android/hardware/camera2/params/MandatoryStreamCombination.java
@@ -2429,7 +2429,7 @@ public final class MandatoryStreamCombination {
long minFrameDuration = mStreamConfigMap.getOutputMinFrameDuration(
android.media.MediaRecorder.class, sz);
// Give some margin for rounding error
- if (minFrameDuration > (1e9 / 30.1)) {
+ if (minFrameDuration < (1e9 / 29.9)) {
Log.i(TAG, "External camera " + mCameraId + " has max video size:" + sz);
return sz;
}