From 78712a8bd7275542013ba099f33536eead0167fb Mon Sep 17 00:00:00 2001 From: Igor Murashkin Date: Tue, 27 May 2014 18:32:18 -0700 Subject: camera2: Add new metadata keys, change types for existing range keys Also adds the following keys: * android.control.maxRegionsAe * android.control.maxRegionsAwb * android.control.maxRegionsAf * android.request.maxNumOutputRaw * android.request.maxNumOutputProc * android.request.maxNumOutputProcStalling Changes the following keys' type generations: * android.control.aeTargetFpsRange * (Range) * android.control.aeAvailableTargetFpsRanges * (Range[]) * android.control.aeCompensationRange * (Range) * android.lens.focusRange * (Range) Bug: 14628001 Change-Id: I141847dffc4b0d89cea37c19a54d6d5faf24a9bb --- .../unit/CameraMetadataTest.java | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'media') diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/CameraMetadataTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/CameraMetadataTest.java index a3caba2..cc64f00 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/CameraMetadataTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/CameraMetadataTest.java @@ -1166,6 +1166,48 @@ public class CameraMetadataTest extends junit.framework.TestCase { } } + private void assertKeyValueEquals(T expected, CameraCharacteristics.Key key) { + assertKeyValueEquals(expected, key.getNativeKey()); + } + + private void assertKeyValueEquals(T expected, Key key) { + T actual = mMetadata.get(key); + + assertEquals("Expected value for key " + key + " to match", expected, actual); + } + + @SmallTest + public void testOverrideMaxRegions() { + // All keys are null before doing any writes. + assertKeyValueEquals(null, CameraCharacteristics.CONTROL_MAX_REGIONS_AE); + assertKeyValueEquals(null, CameraCharacteristics.CONTROL_MAX_REGIONS_AWB); + assertKeyValueEquals(null, CameraCharacteristics.CONTROL_MAX_REGIONS_AF); + + mMetadata.set(CameraCharacteristics.CONTROL_MAX_REGIONS, + new int[] { /*AE*/1, /*AWB*/2, /*AF*/3 }); + + // All keys are the expected value after doing a write + assertKeyValueEquals(1, CameraCharacteristics.CONTROL_MAX_REGIONS_AE); + assertKeyValueEquals(2, CameraCharacteristics.CONTROL_MAX_REGIONS_AWB); + assertKeyValueEquals(3, CameraCharacteristics.CONTROL_MAX_REGIONS_AF); + } + + @SmallTest + public void testOverrideMaxNumOutputStreams() { + // All keys are null before doing any writes. + assertKeyValueEquals(null, CameraCharacteristics.REQUEST_MAX_NUM_OUTPUT_RAW); + assertKeyValueEquals(null, CameraCharacteristics.REQUEST_MAX_NUM_OUTPUT_PROC); + assertKeyValueEquals(null, CameraCharacteristics.REQUEST_MAX_NUM_OUTPUT_PROC_STALLING); + + mMetadata.set(CameraCharacteristics.REQUEST_MAX_NUM_OUTPUT_STREAMS, + new int[] { /*AE*/1, /*AWB*/2, /*AF*/3 }); + + // All keys are the expected value after doing a write + assertKeyValueEquals(1, CameraCharacteristics.REQUEST_MAX_NUM_OUTPUT_RAW); + assertKeyValueEquals(2, CameraCharacteristics.REQUEST_MAX_NUM_OUTPUT_PROC); + assertKeyValueEquals(3, CameraCharacteristics.REQUEST_MAX_NUM_OUTPUT_PROC_STALLING); + } + @SmallTest public void testCaptureResult() { mMetadata.set(CaptureRequest.CONTROL_AE_MODE, -- cgit v1.1