am abeee0ec: Camera2: fix metadata symbols: DO NOT MERGE (da76dc4d) · Commits · e / os / android_frameworks_av

services/camera/libcameraservice/Camera2Client.cpp

+22 −22

Original line number	Diff line number	Diff line
		@@ -187,37 +187,37 @@ status_t Camera2Client::dump(int fd, const Vector<String16>& args) {

		result.append(" White balance mode: ");
		switch (p.wbMode) {
		CASE_APPEND_ENUM(ANDROID_CONTROL_AWB_AUTO)
		CASE_APPEND_ENUM(ANDROID_CONTROL_AWB_INCANDESCENT)
		CASE_APPEND_ENUM(ANDROID_CONTROL_AWB_FLUORESCENT)
		CASE_APPEND_ENUM(ANDROID_CONTROL_AWB_WARM_FLUORESCENT)
		CASE_APPEND_ENUM(ANDROID_CONTROL_AWB_DAYLIGHT)
		CASE_APPEND_ENUM(ANDROID_CONTROL_AWB_CLOUDY_DAYLIGHT)
		CASE_APPEND_ENUM(ANDROID_CONTROL_AWB_TWILIGHT)
		CASE_APPEND_ENUM(ANDROID_CONTROL_AWB_SHADE)
		CASE_APPEND_ENUM(ANDROID_CONTROL_AWB_MODE_AUTO)
		CASE_APPEND_ENUM(ANDROID_CONTROL_AWB_MODE_INCANDESCENT)
		CASE_APPEND_ENUM(ANDROID_CONTROL_AWB_MODE_FLUORESCENT)
		CASE_APPEND_ENUM(ANDROID_CONTROL_AWB_MODE_WARM_FLUORESCENT)
		CASE_APPEND_ENUM(ANDROID_CONTROL_AWB_MODE_DAYLIGHT)
		CASE_APPEND_ENUM(ANDROID_CONTROL_AWB_MODE_CLOUDY_DAYLIGHT)
		CASE_APPEND_ENUM(ANDROID_CONTROL_AWB_MODE_TWILIGHT)
		CASE_APPEND_ENUM(ANDROID_CONTROL_AWB_MODE_SHADE)
		default: result.append("UNKNOWN\n");
		}

		result.append(" Effect mode: ");
		switch (p.effectMode) {
		CASE_APPEND_ENUM(ANDROID_CONTROL_EFFECT_OFF)
		CASE_APPEND_ENUM(ANDROID_CONTROL_EFFECT_MONO)
		CASE_APPEND_ENUM(ANDROID_CONTROL_EFFECT_NEGATIVE)
		CASE_APPEND_ENUM(ANDROID_CONTROL_EFFECT_SOLARIZE)
		CASE_APPEND_ENUM(ANDROID_CONTROL_EFFECT_SEPIA)
		CASE_APPEND_ENUM(ANDROID_CONTROL_EFFECT_POSTERIZE)
		CASE_APPEND_ENUM(ANDROID_CONTROL_EFFECT_WHITEBOARD)
		CASE_APPEND_ENUM(ANDROID_CONTROL_EFFECT_BLACKBOARD)
		CASE_APPEND_ENUM(ANDROID_CONTROL_EFFECT_AQUA)
		CASE_APPEND_ENUM(ANDROID_CONTROL_EFFECT_MODE_OFF)
		CASE_APPEND_ENUM(ANDROID_CONTROL_EFFECT_MODE_MONO)
		CASE_APPEND_ENUM(ANDROID_CONTROL_EFFECT_MODE_NEGATIVE)
		CASE_APPEND_ENUM(ANDROID_CONTROL_EFFECT_MODE_SOLARIZE)
		CASE_APPEND_ENUM(ANDROID_CONTROL_EFFECT_MODE_SEPIA)
		CASE_APPEND_ENUM(ANDROID_CONTROL_EFFECT_MODE_POSTERIZE)
		CASE_APPEND_ENUM(ANDROID_CONTROL_EFFECT_MODE_WHITEBOARD)
		CASE_APPEND_ENUM(ANDROID_CONTROL_EFFECT_MODE_BLACKBOARD)
		CASE_APPEND_ENUM(ANDROID_CONTROL_EFFECT_MODE_AQUA)
		default: result.append("UNKNOWN\n");
		}

		result.append(" Antibanding mode: ");
		switch (p.antibandingMode) {
		CASE_APPEND_ENUM(ANDROID_CONTROL_AE_ANTIBANDING_AUTO)
		CASE_APPEND_ENUM(ANDROID_CONTROL_AE_ANTIBANDING_OFF)
		CASE_APPEND_ENUM(ANDROID_CONTROL_AE_ANTIBANDING_50HZ)
		CASE_APPEND_ENUM(ANDROID_CONTROL_AE_ANTIBANDING_60HZ)
		CASE_APPEND_ENUM(ANDROID_CONTROL_AE_ANTIBANDING_MODE_AUTO)
		CASE_APPEND_ENUM(ANDROID_CONTROL_AE_ANTIBANDING_MODE_OFF)
		CASE_APPEND_ENUM(ANDROID_CONTROL_AE_ANTIBANDING_MODE_50HZ)
		CASE_APPEND_ENUM(ANDROID_CONTROL_AE_ANTIBANDING_MODE_60HZ)
		default: result.append("UNKNOWN\n");
		}

		@@ -1265,7 +1265,7 @@ status_t Camera2Client::commandStartFaceDetectionL(int type) {
		}
		// Ignoring type
		if (l.mParameters.fastInfo.bestFaceDetectMode ==
		ANDROID_STATS_FACE_DETECTION_OFF) {
		ANDROID_STATISTICS_FACE_DETECT_MODE_OFF) {
		ALOGE("%s: Camera %d: Face detection not supported",
		__FUNCTION__, mCameraId);
		return INVALID_OPERATION;

services/camera/libcameraservice/camera2/FrameProcessor.cpp

+8 −8

Original line number	Diff line number	Diff line
		@@ -178,7 +178,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) {
		@@ -191,9 +191,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 */
		@@ -210,7 +210,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());
		@@ -221,8 +221,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());
		@@ -230,7 +230,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",
		@@ -257,7 +257,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]);

services/camera/libcameraservice/camera2/Parameters.cpp

+116 −116

File changed.

Preview size limit exceeded, changes collapsed.

services/camera/libcameraservice/camera2/Parameters.h

+7 −7

Original line number	Diff line number	Diff line
		@@ -73,16 +73,16 @@ struct Parameters {
		FLASH_MODE_AUTO,
		FLASH_MODE_ON,
		FLASH_MODE_TORCH,
		FLASH_MODE_RED_EYE = ANDROID_CONTROL_AE_ON_AUTO_FLASH_REDEYE,
		FLASH_MODE_RED_EYE = ANDROID_CONTROL_AE_MODE_ON_AUTO_FLASH_REDEYE,
		FLASH_MODE_INVALID = -1
		} flashMode;

		enum focusMode_t {
		FOCUS_MODE_AUTO = ANDROID_CONTROL_AF_AUTO,
		FOCUS_MODE_MACRO = ANDROID_CONTROL_AF_MACRO,
		FOCUS_MODE_CONTINUOUS_VIDEO = ANDROID_CONTROL_AF_CONTINUOUS_VIDEO,
		FOCUS_MODE_CONTINUOUS_PICTURE = ANDROID_CONTROL_AF_CONTINUOUS_PICTURE,
		FOCUS_MODE_EDOF = ANDROID_CONTROL_AF_EDOF,
		FOCUS_MODE_AUTO = ANDROID_CONTROL_AF_MODE_AUTO,
		FOCUS_MODE_MACRO = ANDROID_CONTROL_AF_MODE_MACRO,
		FOCUS_MODE_CONTINUOUS_VIDEO = ANDROID_CONTROL_AF_MODE_CONTINUOUS_VIDEO,
		FOCUS_MODE_CONTINUOUS_PICTURE = ANDROID_CONTROL_AF_MODE_CONTINUOUS_PICTURE,
		FOCUS_MODE_EDOF = ANDROID_CONTROL_AF_MODE_EDOF,
		FOCUS_MODE_INFINITY,
		FOCUS_MODE_FIXED,
		FOCUS_MODE_INVALID = -1
		@@ -179,7 +179,7 @@ struct Parameters {
		focusMode_t focusMode;
		OverrideModes():
		flashMode(FLASH_MODE_INVALID),
		wbMode(ANDROID_CONTROL_AWB_OFF),
		wbMode(ANDROID_CONTROL_AWB_MODE_OFF),
		focusMode(FOCUS_MODE_INVALID) {
		}
		};