From d1a44da6925bf90d287a4301d92c4107ae577e90 Mon Sep 17 00:00:00 2001 From: Zhijun He Date: Sun, 6 Oct 2013 13:03:07 -0700 Subject: camera_metadata: Add CaptureResult cts test Also remove the new line from CameraMetadataKeys.mako to avoid adding new line to the generated file every time we run the script. Bug: 11082745 Change-Id: I6bed9a71463d866adfe4178e00c33df7b9158ab8 --- camera/docs/CameraCaptureResultTest.mako | 42 ++++++++++++++++++++++++++++++++ camera/docs/CameraMetadataKeys.mako | 2 +- camera/docs/metadata-generate | 3 +++ 3 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 camera/docs/CameraCaptureResultTest.mako diff --git a/camera/docs/CameraCaptureResultTest.mako b/camera/docs/CameraCaptureResultTest.mako new file mode 100644 index 00000000..4b325bda --- /dev/null +++ b/camera/docs/CameraCaptureResultTest.mako @@ -0,0 +1,42 @@ +## -*- coding: utf-8 -*- +## +## Copyright (C) 2013 The Android Open Source Project +## +## Licensed under the Apache License, Version 2.0 (the "License"); +## you may not use this file except in compliance with the License. +## You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## + /*@O~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~ + * The key entries below this point are generated from metadata + * definitions in /system/media/camera/docs. Do not modify by hand or + * modify the comment blocks at the start or end. + *~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~*/ + + private static List> getAllCaptureResultKeys() { + ArrayList> resultKeys = new ArrayList>(); +% for sec in find_all_sections(metadata): + % for entry in find_unique_entries(sec): + % if entry.kind == 'dynamic' and entry.visibility == "public": + resultKeys.add(CaptureResult.${jkey_identifier(entry.name)}); + % endif + % endfor +% endfor + + // Add STATISTICS_FACES key separately here because it is not + // defined in metadata xml file. + resultKeys.add(CaptureResult.STATISTICS_FACES); + + return resultKeys; + } + + /*~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~ + * End generated code + *~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~O@*/ diff --git a/camera/docs/CameraMetadataKeys.mako b/camera/docs/CameraMetadataKeys.mako index 5c7ff2d2..815ce39e 100644 --- a/camera/docs/CameraMetadataKeys.mako +++ b/camera/docs/CameraMetadataKeys.mako @@ -92,4 +92,4 @@ ${generate_key(entry)} ${single_kind_keys(java_class, xml_kind)}\ /*~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~ * End generated code - *~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~O@*/ + *~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~O@*/ \ No newline at end of file diff --git a/camera/docs/metadata-generate b/camera/docs/metadata-generate index 85c18096..ec9e9476 100755 --- a/camera/docs/metadata-generate +++ b/camera/docs/metadata-generate @@ -22,6 +22,7 @@ # ../src/camera_metadata_tag_info.c # ../src/camera_metadata_tags.h # ../../../../cts/tests/tests/hardware/src/android/hardware/camera2/cts/CameraCharacteristicsTest.java +# ../../../../cts/tests/tests/hardware/src/android/hardware/camera2/cts/CameraCaptureResultTest.java # ../../../../frameworks/base/core/java/android/hardware/camera2/CameraCharacteristics.java # ../../../../frameworks/base/core/java/android/hardware/camera2/CaptureRequest.java # ../../../../frameworks/base/core/java/android/hardware/camera2/CaptureResult.java @@ -169,6 +170,7 @@ gen_file_abs CameraMetadataEnums.mako "$outdir/CameraMetadataEnums.java.part" no gen_file_abs CameraCharacteristicsKeys.mako "$outdir/CameraCharacteristicsKeys.java.part" no || exit 1 gen_file_abs CaptureRequestKeys.mako "$outdir/CaptureRequestKeys.java.part" no || exit 1 gen_file_abs CaptureResultKeys.mako "$outdir/CaptureResultKeys.java.part" no || exit 1 +gen_file_abs CameraCaptureResultTest.mako "$outdir/CameraCaptureResultTest.java.part" no || exit 1 insert_file "$outdir/CameraMetadataEnums.java.part" "$fwkdir/CameraMetadata.java" || exit 1 insert_file "$outdir/CameraCharacteristicsKeys.java.part" "$fwkdir/CameraCharacteristics.java" || exit 1 @@ -177,6 +179,7 @@ insert_file "$outdir/CaptureResultKeys.java.part" "$fwkdir/CaptureResult.java" | # Generate CTS tests gen_file_abs CameraCharacteristicsTest.mako "$ctsdir/CameraCharacteristicsTest.java" || exit 1 +insert_file "$outdir/CameraCaptureResultTest.java.part" "$ctsdir/CameraCaptureResultTest.java" || exit 1 echo "" echo "====================================================" -- cgit v1.2.3