From 3d5d9321133805437ac159b5ca6d1b6e65fec741 Mon Sep 17 00:00:00 2001
From: Ren-Pei Zeng <kamesan@google.com>
Date: Fri, 23 Dec 2022 15:19:00 +0800
Subject: [PATCH] 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
---
 .../hardware/camera2/params/MandatoryStreamCombination.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/hardware/camera2/params/MandatoryStreamCombination.java b/core/java/android/hardware/camera2/params/MandatoryStreamCombination.java
index 6f77d12cc4630..3fc44f8f84ac5 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;
                 }