commit f0d6a48c6ad852b84687127f14b1ffde02416dc4
author Wu-cheng Li <wuchengli@google.com> Thu Jul 28 05:30:59 2011 +0800
committer Wu-cheng Li <wuchengli@google.com> Fri Jul 29 07:14:38 2011 +0800
tree 6b4eed1bc3c71d8b61638d27c67cd43420aed92d
parent 2043b01b207aae3458da395bc6d501d76e59425c

Add frame metadata parameter to camera data_callback.

bug:4460717
Change-Id: Ib47d7d7df20af8155a719f3dabefe030893bfebc

core/jni/android_hardware_Camera.cpp

diff --git a/core/jni/android_hardware_Camera.cpp b/core/jni/android_hardware_Camera.cpp
index 3328fc8..3dcaa37 100644
--- a/core/jni/android_hardware_Camera.cpp
+++ b/core/jni/android_hardware_Camera.cpp
@@ -38,7 +38,7 @@
     jfieldID    surfaceTexture;
     jfieldID    facing;
     jfieldID    orientation;
-    jfieldID    face_rectangle;
+    jfieldID    face_rect;
     jfieldID    face_score;
     jfieldID    rect_left;
     jfieldID    rect_top;
@@ -859,8 +859,8 @@
           ANDROID_GRAPHICS_SURFACETEXTURE_JNI_ID, "I", &fields.surfaceTexture },
         { "android/hardware/Camera$CameraInfo", "facing",   "I", &fields.facing },
         { "android/hardware/Camera$CameraInfo", "orientation",   "I", &fields.orientation },
-        { "android/hardware/Camera$FaceMetadata", "face", "Landroid/graphics/Rect;", &fields.face_rectangle },
-        { "android/hardware/Camera$FaceMetadata", "score", "I", &fields.face_score },
+        { "android/hardware/Camera$Face", "rect", "Landroid/graphics/Rect;", &fields.face_rect },
+        { "android/hardware/Camera$Face", "score", "I", &fields.face_score },
         { "android/graphics/Rect", "left", "I", &fields.rect_left },
         { "android/graphics/Rect", "top", "I", &fields.rect_top },
         { "android/graphics/Rect", "right", "I", &fields.rect_right },