PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Refine QrCamera.getBestPreviewSize method"

Browse Source
This commit is contained in:
Johnson Lu
2018-11-21 05:38:15 +00:00
committed by Android (Google) Code Review
parent bbb4e91b3f b0e66c8807
commit 62367be28b
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/wifi/qrcode/QrCamera.java
View File

@@ -298,18 +298,30 @@ public class QrCamera extends Handler {
}
}
/** Get best preview size from the list of camera supported preview sizes. Compares the
* preview size and aspect ratio to choose the best one. */
private Size getBestPreviewSize(Camera.Parameters parameters) {
final double minRatioDiffPercent = 0.1;
final Size windowSize = mScannerCallback.getViewSize();
final double winRatio = getRatio(windowSize.getWidth(), windowSize.getHeight());
double bestChoiceRatio = 0;
Size bestChoice = new Size(0, 0);
for (Camera.Size size : parameters.getSupportedPreviewSizes()) {
if (size.width <= windowSize.getWidth() && size.height <= windowSize.getHeight()) {
double ratio = getRatio(size.width, size.height);
if (size.height * size.width > bestChoice.getWidth() * bestChoice.getHeight()
&& (Math.abs(bestChoiceRatio - winRatio) / winRatio > minRatioDiffPercent
|| Math.abs(ratio - winRatio) / winRatio <= minRatioDiffPercent)) {
bestChoice = new Size(size.width, size.height);
break;
bestChoiceRatio = getRatio(size.width, size.height);
}
}
return bestChoice;
}
private double getRatio(double x, double y) {
return (x < y) ? x / y : y / x;
}
@VisibleForTesting
protected void decodeImage(BinaryBitmap image) {
Result qrCode = null;