Merge "Camera: Low Light Boost AE Mode" into main (b8a3f978) · Commits · e / os / android_hardware_interfaces

camera/metadata/aidl/aidl_api/android.hardware.camera.metadata/current/android/hardware/camera/metadata/CameraMetadataTag.aidl

+2 −0

Original line number	Diff line number	Diff line
		@@ -98,6 +98,8 @@ enum CameraMetadataTag {
		ANDROID_CONTROL_AUTOFRAMING,
		ANDROID_CONTROL_AUTOFRAMING_AVAILABLE,
		ANDROID_CONTROL_AUTOFRAMING_STATE,
		ANDROID_CONTROL_LOW_LIGHT_BOOST_INFO_LUMINANCE_RANGE,
		ANDROID_CONTROL_LOW_LIGHT_BOOST_STATE,
		ANDROID_DEMOSAIC_MODE = android.hardware.camera.metadata.CameraMetadataSectionStart.ANDROID_DEMOSAIC_START /* 131072 */,
		ANDROID_EDGE_MODE = android.hardware.camera.metadata.CameraMetadataSectionStart.ANDROID_EDGE_START /* 196608 */,
		ANDROID_EDGE_STRENGTH,

camera/metadata/aidl/aidl_api/android.hardware.camera.metadata/current/android/hardware/camera/metadata/ControlAeMode.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -44,4 +44,5 @@ enum ControlAeMode {
		ANDROID_CONTROL_AE_MODE_ON_ALWAYS_FLASH,
		ANDROID_CONTROL_AE_MODE_ON_AUTO_FLASH_REDEYE,
		ANDROID_CONTROL_AE_MODE_ON_EXTERNAL_FLASH,
		ANDROID_CONTROL_AE_MODE_ON_LOW_LIGHT_BOOST_BRIGHTNESS_PRIORITY,
		}

camera/metadata/aidl/aidl_api/android.hardware.camera.metadata/current/android/hardware/camera/metadata/ControlLowLightBoostState.aidl

0 → 100644

+43 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 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.
		//
		* Autogenerated from camera metadata definitions in
		* /system/media/camera/docs/metadata_definitions.xml
		* * DO NOT EDIT BY HAND *
		*/
		///////////////////////////////////////////////////////////////////////////////
		// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. //
		///////////////////////////////////////////////////////////////////////////////

		// This file is a snapshot of an AIDL file. Do not edit it manually. There are
		// two cases:
		// 1). this is a frozen version file - do not edit this in any case.
		// 2). this is a 'current' file. If you make a backwards compatible change to
		// the interface (from the latest frozen version), the build system will
		// prompt you to update this file with `m <name>-update-api`.
		//
		// You must not make a backward incompatible change to any AIDL file built
		// with the aidl_interface module type with versions property set. The module
		// type is used to build AIDL files in a way that they can be used across
		// independently updatable components of the system. If a device is shipped
		// with such a backward incompatible change, it has a high risk of breaking
		// later when a module using the interface is updated, e.g., Mainline modules.

		package android.hardware.camera.metadata;
		@Backing(type="int") @VintfStability
		enum ControlLowLightBoostState {
		ANDROID_CONTROL_LOW_LIGHT_BOOST_STATE_INACTIVE,
		ANDROID_CONTROL_LOW_LIGHT_BOOST_STATE_ACTIVE,
		}

camera/metadata/aidl/android/hardware/camera/metadata/CameraMetadataTag.aidl

+12 −0

Original line number	Diff line number	Diff line
		@@ -489,6 +489,18 @@ enum CameraMetadataTag {
		* <p>Current state of auto-framing.</p>
		*/
		ANDROID_CONTROL_AUTOFRAMING_STATE,
		/**
		* android.control.lowLightBoostInfoLuminanceRange [static, float[], public]
		*
		* <p>The operating luminance range of low light boost measured in lux (lx).</p>
		*/
		ANDROID_CONTROL_LOW_LIGHT_BOOST_INFO_LUMINANCE_RANGE,
		/**
		* android.control.lowLightBoostState [dynamic, enum, public]
		*
		* <p>Current state of the low light boost AE mode.</p>
		*/
		ANDROID_CONTROL_LOW_LIGHT_BOOST_STATE,
		/**
		* android.demosaic.mode [controls, enum, system]
		*

camera/metadata/aidl/android/hardware/camera/metadata/ControlAeMode.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -35,4 +35,5 @@ enum ControlAeMode {
		ANDROID_CONTROL_AE_MODE_ON_ALWAYS_FLASH,
		ANDROID_CONTROL_AE_MODE_ON_AUTO_FLASH_REDEYE,
		ANDROID_CONTROL_AE_MODE_ON_EXTERNAL_FLASH,
		ANDROID_CONTROL_AE_MODE_ON_LOW_LIGHT_BOOST_BRIGHTNESS_PRIORITY,
		}