commit 173bf04167dadfa400564a4d130d0e6c9cbca042
author Eino-Ville Talvala <etalvala@google.com> Tue Sep 18 10:28:35 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 18 10:28:36 2012 -0700
tree 72a1fe62605ca6cd71bc41968801da8433f081ac
parent c438b88ac929e4a14ebaa54aad8c827dbdab8c73
parent 0e0a14013dc3c0c02f96ec486d70d0871747062c

Merge changes Ibe5c08d5,I559f1281,I6f0f44fa into jb-mr1-dev

* changes:
  Camera2: Don't be bothered by lack of faces.
  Camera2: Filter out faces with 0 confidence.
  Camera2: Change face detect/scene mode priority.

services/camera/libcameraservice/camera2/FrameProcessor.cpp

diff --git a/services/camera/libcameraservice/camera2/FrameProcessor.cpp b/services/camera/libcameraservice/camera2/FrameProcessor.cpp
index e24db0b..a7d19aa 100644
--- a/services/camera/libcameraservice/camera2/FrameProcessor.cpp
+++ b/services/camera/libcameraservice/camera2/FrameProcessor.cpp
@@ -174,8 +174,7 @@
         SharedParameters::Lock l(client->getParameters());
         entry = frame.find(ANDROID_STATS_FACE_RECTANGLES);
         if (entry.count == 0) {
-            ALOGE("%s: Camera %d: Unable to read face rectangles",
-                    __FUNCTION__, client->getCameraId());
+            // No faces this frame
             return res;
         }
         metadata.number_of_faces = entry.count / 4;
@@ -220,7 +219,13 @@
 
         faces.setCapacity(metadata.number_of_faces);
 
-        for (int i = 0; i < metadata.number_of_faces; i++) {
+        size_t maxFaces = metadata.number_of_faces;
+        for (size_t i = 0; i < maxFaces; i++) {
+            if (faceScores[i] == 0) {
+                metadata.number_of_faces--;
+                continue;
+            }
+
             camera_face_t face;
 
             face.rect[0] = l.mParameters.arrayXToNormalized(faceRects[i*4 + 0]);

services/camera/libcameraservice/camera2/Parameters.cpp

diff --git a/services/camera/libcameraservice/camera2/Parameters.cpp b/services/camera/libcameraservice/camera2/Parameters.cpp
index c07a6ac..c6d7747 100644
--- a/services/camera/libcameraservice/camera2/Parameters.cpp
+++ b/services/camera/libcameraservice/camera2/Parameters.cpp
@@ -1380,8 +1380,11 @@
             &reqControlMode, 1);
     if (res != OK) return res;
 
-    uint8_t reqSceneMode = enableFaceDetect ?
-            (uint8_t)ANDROID_CONTROL_SCENE_MODE_FACE_PRIORITY : sceneMode;
+    uint8_t reqSceneMode =
+            (sceneMode !=
+                    (uint8_t)ANDROID_CONTROL_SCENE_MODE_UNSUPPORTED) ? sceneMode :
+            enableFaceDetect ? (uint8_t)ANDROID_CONTROL_SCENE_MODE_FACE_PRIORITY :
+            (uint8_t)ANDROID_CONTROL_SCENE_MODE_UNSUPPORTED;
     res = request->update(ANDROID_CONTROL_SCENE_MODE,
             &reqSceneMode, 1);
     if (res != OK) return res;