summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Shuzhen Wang <shuzhenwang@google.com> 2018-07-27 12:00:52 -0700
committer Shuzhen Wang <shuzhenwang@google.com> 2018-07-30 23:49:31 +0000
commit7b821ce99d4997dc5051835effcb29a2a5e862ff (patch)
tree6274100e6e02d2213b8394849e78ddcb5a743bed
parenta81d70742f92628f9ffc1c0e8bd295ec51fc3227 (diff)
Camera2: legacy: Fill in default preCorrectionActiveArraySize
Use default active array size as preCorrectionActiveArraySize. Test: Camera CTS on legacy device Bug: 111445301 Change-Id: Ia184a8e68d6c8c0d5d4a648c6b3f4b99c99ccf5b
-rw-r--r--core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java b/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java
index 5423ca97eb28..8822f713257d 100644
--- a/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java
+++ b/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java
@@ -781,6 +781,7 @@ public class LegacyMetadataMapper {
CameraCharacteristics.SENSOR_INFO_ACTIVE_ARRAY_SIZE ,
CameraCharacteristics.SENSOR_INFO_PHYSICAL_SIZE ,
CameraCharacteristics.SENSOR_INFO_PIXEL_ARRAY_SIZE ,
+ CameraCharacteristics.SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE ,
CameraCharacteristics.SENSOR_INFO_TIMESTAMP_SOURCE ,
CameraCharacteristics.SENSOR_ORIENTATION ,
CameraCharacteristics.STATISTICS_INFO_AVAILABLE_FACE_DETECT_MODES ,
@@ -941,11 +942,12 @@ public class LegacyMetadataMapper {
// Use the largest jpeg size (by area) for both active array and pixel array
Size largestJpegSize = getLargestSupportedJpegSizeByArea(p);
/*
- * sensor.info.activeArraySize
+ * sensor.info.activeArraySize, and preCorrectionActiveArraySize
*/
{
Rect activeArrayRect = ParamsUtils.createRect(largestJpegSize);
m.set(SENSOR_INFO_ACTIVE_ARRAY_SIZE, activeArrayRect);
+ m.set(SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE, activeArrayRect);
}
/*