diff options
| author | Igor Murashkin <iam@google.com> | 2012-11-27 16:25:46 -0800 |
|---|---|---|
| committer | Igor Murashkin <iam@google.com> | 2012-12-03 14:40:48 -0800 |
| commit | d32b99b1a87497280add6efc0e99bd383e402de1 (patch) | |
| tree | caab20e025ca8e12bb4409e82f9beffe19290af3 /services/camera/libcameraservice/camera2/FrameProcessor.cpp | |
| parent | 083d1c1492d496960d5b28f4664ff02101736677 (diff) | |
| download | frameworks_av-d32b99b1a87497280add6efc0e99bd383e402de1.zip frameworks_av-d32b99b1a87497280add6efc0e99bd383e402de1.tar.gz frameworks_av-d32b99b1a87497280add6efc0e99bd383e402de1.tar.bz2 | |
Camera2: fix metadata symbols
Change-Id: I59e457824782de26b7b489cd92eb33d48e6ee2d9
Diffstat (limited to 'services/camera/libcameraservice/camera2/FrameProcessor.cpp')
| -rw-r--r-- | services/camera/libcameraservice/camera2/FrameProcessor.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/services/camera/libcameraservice/camera2/FrameProcessor.cpp b/services/camera/libcameraservice/camera2/FrameProcessor.cpp index e032522..8ee5de7 100644 --- a/services/camera/libcameraservice/camera2/FrameProcessor.cpp +++ b/services/camera/libcameraservice/camera2/FrameProcessor.cpp @@ -177,7 +177,7 @@ status_t FrameProcessor::processFaceDetect(const CameraMetadata &frame, SharedParameters::Lock l(client->getParameters()); enableFaceDetect = l.mParameters.enableFaceDetect; } - entry = frame.find(ANDROID_STATS_FACE_DETECT_MODE); + entry = frame.find(ANDROID_STATISTICS_FACE_DETECT_MODE); // TODO: This should be an error once implementations are compliant if (entry.count == 0) { @@ -190,9 +190,9 @@ status_t FrameProcessor::processFaceDetect(const CameraMetadata &frame, Vector<camera_face_t> faces; metadata.number_of_faces = 0; - if (enableFaceDetect && faceDetectMode != ANDROID_STATS_FACE_DETECTION_OFF) { + if (enableFaceDetect && faceDetectMode != ANDROID_STATISTICS_FACE_DETECT_MODE_OFF) { SharedParameters::Lock l(client->getParameters()); - entry = frame.find(ANDROID_STATS_FACE_RECTANGLES); + entry = frame.find(ANDROID_STATISTICS_FACE_RECTANGLES); if (entry.count == 0) { // No faces this frame /* warning: locks SharedCameraClient */ @@ -209,7 +209,7 @@ status_t FrameProcessor::processFaceDetect(const CameraMetadata &frame, } const int32_t *faceRects = entry.data.i32; - entry = frame.find(ANDROID_STATS_FACE_SCORES); + entry = frame.find(ANDROID_STATISTICS_FACE_SCORES); if (entry.count == 0) { ALOGE("%s: Camera %d: Unable to read face scores", __FUNCTION__, client->getCameraId()); @@ -220,8 +220,8 @@ status_t FrameProcessor::processFaceDetect(const CameraMetadata &frame, const int32_t *faceLandmarks = NULL; const int32_t *faceIds = NULL; - if (faceDetectMode == ANDROID_STATS_FACE_DETECTION_FULL) { - entry = frame.find(ANDROID_STATS_FACE_LANDMARKS); + if (faceDetectMode == ANDROID_STATISTICS_FACE_DETECT_MODE_FULL) { + entry = frame.find(ANDROID_STATISTICS_FACE_LANDMARKS); if (entry.count == 0) { ALOGE("%s: Camera %d: Unable to read face landmarks", __FUNCTION__, client->getCameraId()); @@ -229,7 +229,7 @@ status_t FrameProcessor::processFaceDetect(const CameraMetadata &frame, } faceLandmarks = entry.data.i32; - entry = frame.find(ANDROID_STATS_FACE_IDS); + entry = frame.find(ANDROID_STATISTICS_FACE_IDS); if (entry.count == 0) { ALOGE("%s: Camera %d: Unable to read face IDs", @@ -256,7 +256,7 @@ status_t FrameProcessor::processFaceDetect(const CameraMetadata &frame, face.rect[3] = l.mParameters.arrayYToNormalized(faceRects[i*4 + 3]); face.score = faceScores[i]; - if (faceDetectMode == ANDROID_STATS_FACE_DETECTION_FULL) { + if (faceDetectMode == ANDROID_STATISTICS_FACE_DETECT_MODE_FULL) { face.id = faceIds[i]; face.left_eye[0] = l.mParameters.arrayXToNormalized(faceLandmarks[i*6 + 0]); |