summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Murashkin <iam@google.com>2012-10-03 14:23:03 -0700
committerIgor Murashkin <iam@google.com>2012-10-03 14:23:03 -0700
commit6c94a620035d8e719bf4e5040e39db92700bff6c (patch)
treedcd6251408d7a67259045fc78cad238a21891d27
parent94879bd88f7ac3f2f678221497b8ad50c0bb3314 (diff)
downloadandroid_system_media-6c94a620035d8e719bf4e5040e39db92700bff6c.tar.gz
android_system_media-6c94a620035d8e719bf4e5040e39db92700bff6c.tar.bz2
android_system_media-6c94a620035d8e719bf4e5040e39db92700bff6c.zip
Camera: Add quirk for metering regions to ignore crop regioncm-10.1-M1
If the HAL already takes into account the crop region when consuming a{ewf}Region or producing face detection rectangles, then it should set this quirk to 1. Bug: 7246065 Change-Id: Ib77788b2fced1509d60a7fd1e2a4411e9c8f19dc
-rw-r--r--camera/include/system/camera_metadata_tags.h1
-rw-r--r--camera/src/camera_metadata_tag_info.c4
2 files changed, 4 insertions, 1 deletions
diff --git a/camera/include/system/camera_metadata_tags.h b/camera/include/system/camera_metadata_tags.h
index 727fa0ad..796e5713 100644
--- a/camera/include/system/camera_metadata_tags.h
+++ b/camera/include/system/camera_metadata_tags.h
@@ -313,6 +313,7 @@ enum {
ANDROID_QUIRKS_TRIGGER_AF_WITH_AUTO = ANDROID_QUIRKS_INFO_START,
ANDROID_QUIRKS_USE_ZSL_FORMAT,
+ ANDROID_QUIRKS_METERING_CROP_REGION,
ANDROID_QUIRKS_INFO_END
};
diff --git a/camera/src/camera_metadata_tag_info.c b/camera/src/camera_metadata_tag_info.c
index 2ae7e148..2b723c9b 100644
--- a/camera/src/camera_metadata_tag_info.c
+++ b/camera/src/camera_metadata_tag_info.c
@@ -528,7 +528,9 @@ tag_info_t android_quirks_info[ANDROID_QUIRKS_INFO_END -
TIIDX(QUIRKS, TRIGGER_AF_WITH_AUTO) =
{ "triggerAfWithAuto", TYPE_BYTE },
TIIDX(QUIRKS, USE_ZSL_FORMAT) =
- { "useZslFormat", TYPE_BYTE }
+ { "useZslFormat", TYPE_BYTE },
+ TIIDX(QUIRKS, METERING_CROP_REGION) =
+ { "meteringCropRegion", TYPE_BYTE },
};
#undef TIDX