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

Merge "Camera2: Ignore unsupported face detection results in LEGACY." into lmp-mr1-dev

Browse Source
This commit is contained in:
Ruben Brunk
2014-11-24 23:11:31 +00:00
committed by Android (Google) Code Review
parent 07aca15b96 000973a163
commit 8791a1e81a
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -918,7 +918,9 @@ public class ParameterUtils {
convertCameraAreaToActiveArrayRectangle(activeArray, zoomData, fakeArea); convertCameraAreaToActiveArrayRectangle(activeArray, zoomData, fakeArea);
Point leftEye = face.leftEye, rightEye = face.rightEye, mouth = face.mouth; Point leftEye = face.leftEye, rightEye = face.rightEye, mouth = face.mouth;
if (leftEye != null && rightEye != null && mouth != null) { if (leftEye != null && rightEye != null && mouth != null && leftEye.x != -2000 &&
leftEye.y != -2000 && rightEye.x != -2000 && rightEye.y != -2000 &&
mouth.x != -2000 && mouth.y != -2000) {
leftEye = convertCameraPointToActiveArrayPoint(activeArray, zoomData, leftEye = convertCameraPointToActiveArrayPoint(activeArray, zoomData,
leftEye, /*usePreviewCrop*/true); leftEye, /*usePreviewCrop*/true);
rightEye = convertCameraPointToActiveArrayPoint(activeArray, zoomData, rightEye = convertCameraPointToActiveArrayPoint(activeArray, zoomData,