Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "camera2: Fix crop selection in LEGACY." into mnc-dev

Browse Source
This commit is contained in:
Ruben Brunk
2015-05-13 00:09:49 +00:00
committed by Android (Google) Code Review
parent 8c6cd9088e 607e4cb9ec
commit 4143fbcfa8
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/hardware/camera2/legacy/ParameterUtils.java
View File

@@ -61,6 +61,8 @@ public class ParameterUtils {
public static final Rect RECTANGLE_EMPTY = public static final Rect RECTANGLE_EMPTY =
new Rect(/*left*/0, /*top*/0, /*right*/0, /*bottom*/0); new Rect(/*left*/0, /*top*/0, /*right*/0, /*bottom*/0);
private static final double ASPECT_RATIO_TOLERANCE = 0.05f;
/** /**
* Calculate effective/reported zoom data from a user-specified crop region. * Calculate effective/reported zoom data from a user-specified crop region.
*/ */
@@ -498,7 +500,10 @@ public class ParameterUtils {
float aspectRatioPreview = previewSize.getWidth() * 1.0f / previewSize.getHeight(); float aspectRatioPreview = previewSize.getWidth() * 1.0f / previewSize.getHeight();
float cropH, cropW; float cropH, cropW;
if (aspectRatioPreview < aspectRatioArray) { if (Math.abs(aspectRatioPreview - aspectRatioArray) < ASPECT_RATIO_TOLERANCE) {
cropH = activeArray.height();
cropW = activeArray.width();
} else if (aspectRatioPreview < aspectRatioArray) {
// The new width must be smaller than the height, so scale the width by AR // The new width must be smaller than the height, so scale the width by AR
cropH = activeArray.height(); cropH = activeArray.height();
cropW = cropH * aspectRatioPreview; cropW = cropH * aspectRatioPreview;