From 727dbc2968c8761a3150faebba254155fb042530 Mon Sep 17 00:00:00 2001 From: Per Date: Thu, 26 Nov 2015 15:15:46 +0100 Subject: [PATCH] VideoCapturerAndroid - allow lower frame rate in bad lightning Insted of using a fixed frame rate, we allow the camera to use a lower frame rate. The camera will choose depending on lightning condition. TESTED= In a room with low light on N5, N6 N7, Galaxy 4. BUG=webrtc:5262 R=magjed@webrtc.org Review URL: https://codereview.webrtc.org/1479563004 . Cr-Commit-Position: refs/heads/master@{#10807} --- .../java/android/org/webrtc/CameraEnumerationAndroid.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/talk/app/webrtc/java/android/org/webrtc/CameraEnumerationAndroid.java b/talk/app/webrtc/java/android/org/webrtc/CameraEnumerationAndroid.java index 347befc5ec..32341a3421 100644 --- a/talk/app/webrtc/java/android/org/webrtc/CameraEnumerationAndroid.java +++ b/talk/app/webrtc/java/android/org/webrtc/CameraEnumerationAndroid.java @@ -203,8 +203,9 @@ public class CameraEnumerationAndroid { return Collections.min(listFpsRange, new ClosestComparator() { @Override int diff(int[] range) { - return abs(framerate - range[android.hardware.Camera.Parameters.PREVIEW_FPS_MIN_INDEX]) - + abs(framerate - range[android.hardware.Camera.Parameters.PREVIEW_FPS_MAX_INDEX]); + return range[android.hardware.Camera.Parameters.PREVIEW_FPS_MIN_INDEX] + + 10 * abs(framerate + - range[android.hardware.Camera.Parameters.PREVIEW_FPS_MAX_INDEX]); } }); }