mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Issue #38 : extra defensive -- don't even assume the list is sorted in case of buggy phones

Browse source
This commit is contained in:
Sean Owen 2014-01-24 20:23:16 +00:00
parent e174140d8d
commit a8c9897da3
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/src/com/google/zxing/client/android/camera/CameraConfigurationManager.java
View file

@ -239,9 +239,11 @@ final class CameraConfigurationManager {
if (supportedPreviewFpsRanges != null && !supportedPreviewFpsRanges.isEmpty()) { if (supportedPreviewFpsRanges != null && !supportedPreviewFpsRanges.isEmpty()) {
int[] minimumSuitableFpsRange = null; int[] minimumSuitableFpsRange = null;
for (int[] fpsRange : supportedPreviewFpsRanges) { for (int[] fpsRange : supportedPreviewFpsRanges) {
if (fpsRange[Camera.Parameters.PREVIEW_FPS_MAX_INDEX] >= MIN_FPS * 1000) { int fpsMax = fpsRange[Camera.Parameters.PREVIEW_FPS_MAX_INDEX];
if (fpsMax >= MIN_FPS * 1000 &&
(minimumSuitableFpsRange == null ||
fpsMax > minimumSuitableFpsRange[Camera.Parameters.PREVIEW_FPS_MAX_INDEX])) {
minimumSuitableFpsRange = fpsRange; minimumSuitableFpsRange = fpsRange;
break;
} }
} }
if (minimumSuitableFpsRange == null) { if (minimumSuitableFpsRange == null) {