Camera: Add framework support for Autoexposure. (acd962f5) · Commits · e / os / android_frameworks_base

api/current.xml

+79 −46

Original line number	Original line	Diff line number	Diff line
	@@ -68600,6 +68600,39 @@
	visibility="public"		visibility="public"
	>		>
	</field>		</field>
			<field name="AUTO_EXPOSURE_CENTER_WEIGHTED"
			type="java.lang.String"
			transient="false"
			volatile="false"
			value=""center-weighted""
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			<field name="AUTO_EXPOSURE_FRAME_AVG"
			type="java.lang.String"
			transient="false"
			volatile="false"
			value=""frame-average""
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			<field name="AUTO_EXPOSURE_SPOT_METERING"
			type="java.lang.String"
			transient="false"
			volatile="false"
			value=""spot-metering""
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
	<field name="EFFECT_AQUA"		<field name="EFFECT_AQUA"
	type="java.lang.String"		type="java.lang.String"
	transient="false"		transient="false"
	@@ -68798,253 +68831,253 @@
	visibility="public"		visibility="public"
	>		>
	</field>		</field>
	<field name="SCENE_MODE_ACTION"		<field name="ISO_100"
	type="java.lang.String"		type="java.lang.String"
	transient="false"		transient="false"
	volatile="false"		volatile="false"
	value=""action""		value=""ISO100""
	static="true"		static="true"
	final="true"		final="true"
	deprecated="not deprecated"		deprecated="not deprecated"
	visibility="public"		visibility="public"
	>		>
	</field>		</field>
	<field name="SCENE_MODE_AUTO"		<field name="ISO_200"
	type="java.lang.String"		type="java.lang.String"
	transient="false"		transient="false"
	volatile="false"		volatile="false"
	value=""auto""		value=""ISO200""
	static="true"		static="true"
	final="true"		final="true"
	deprecated="not deprecated"		deprecated="not deprecated"
	visibility="public"		visibility="public"
	>		>
	</field>		</field>
	<field name="SCENE_MODE_BEACH"		<field name="ISO_400"
	type="java.lang.String"		type="java.lang.String"
	transient="false"		transient="false"
	volatile="false"		volatile="false"
	value=""beach""		value=""ISO400""
	static="true"		static="true"
	final="true"		final="true"
	deprecated="not deprecated"		deprecated="not deprecated"
	visibility="public"		visibility="public"
	>		>
	</field>		</field>
	<field name="SCENE_MODE_CANDLELIGHT"		<field name="ISO_800"
	type="java.lang.String"		type="java.lang.String"
	transient="false"		transient="false"
	volatile="false"		volatile="false"
	value=""candlelight""		value=""ISO800""
	static="true"		static="true"
	final="true"		final="true"
	deprecated="not deprecated"		deprecated="not deprecated"
	visibility="public"		visibility="public"
	>		>
	</field>		</field>
	<field name="SCENE_MODE_FIREWORKS"		<field name="ISO_AUTO"
	type="java.lang.String"		type="java.lang.String"
	transient="false"		transient="false"
	volatile="false"		volatile="false"
	value=""fireworks""		value=""auto""
	static="true"		static="true"
	final="true"		final="true"
	deprecated="not deprecated"		deprecated="not deprecated"
	visibility="public"		visibility="public"
	>		>
	</field>		</field>
	<field name="SCENE_MODE_LANDSCAPE"		<field name="ISO_HJR"
	type="java.lang.String"		type="java.lang.String"
	transient="false"		transient="false"
	volatile="false"		volatile="false"
	value=""landscape""		value=""ISO_HJR""
	static="true"		static="true"
	final="true"		final="true"
	deprecated="not deprecated"		deprecated="not deprecated"
	visibility="public"		visibility="public"
	>		>
	</field>		</field>
	<field name="SCENE_MODE_NIGHT"		<field name="LENSSHADE_DISABLE"
	type="java.lang.String"		type="java.lang.String"
	transient="false"		transient="false"
	volatile="false"		volatile="false"
	value=""night""		value=""disable""
	static="true"		static="true"
	final="true"		final="true"
	deprecated="not deprecated"		deprecated="not deprecated"
	visibility="public"		visibility="public"
	>		>
	</field>		</field>
	<field name="SCENE_MODE_NIGHT_PORTRAIT"		<field name="LENSSHADE_ENABLE"
	type="java.lang.String"		type="java.lang.String"
	transient="false"		transient="false"
	volatile="false"		volatile="false"
	value=""night-portrait""		value=""enable""
	static="true"		static="true"
	final="true"		final="true"
	deprecated="not deprecated"		deprecated="not deprecated"
	visibility="public"		visibility="public"
	>		>
	</field>		</field>
	<field name="SCENE_MODE_PARTY"		<field name="SCENE_MODE_ACTION"
	type="java.lang.String"		type="java.lang.String"
	transient="false"		transient="false"
	volatile="false"		volatile="false"
	value=""party""		value=""action""
	static="true"		static="true"
	final="true"		final="true"
	deprecated="not deprecated"		deprecated="not deprecated"
	visibility="public"		visibility="public"
	>		>
	</field>		</field>
	<field name="SCENE_MODE_PORTRAIT"		<field name="SCENE_MODE_AUTO"
	type="java.lang.String"		type="java.lang.String"
	transient="false"		transient="false"
	volatile="false"		volatile="false"
	value=""portrait""		value=""auto""
	static="true"		static="true"
	final="true"		final="true"
	deprecated="not deprecated"		deprecated="not deprecated"
	visibility="public"		visibility="public"
	>		>
	</field>		</field>
	<field name="SCENE_MODE_SNOW"		<field name="SCENE_MODE_BEACH"
	type="java.lang.String"		type="java.lang.String"
	transient="false"		transient="false"
	volatile="false"		volatile="false"
	value=""snow""		value=""beach""
	static="true"		static="true"
	final="true"		final="true"
	deprecated="not deprecated"		deprecated="not deprecated"
	visibility="public"		visibility="public"
	>		>
	</field>		</field>
	<field name="SCENE_MODE_SPORTS"		<field name="SCENE_MODE_CANDLELIGHT"
	type="java.lang.String"		type="java.lang.String"
	transient="false"		transient="false"
	volatile="false"		volatile="false"
	value=""sports""		value=""candlelight""
	static="true"		static="true"
	final="true"		final="true"
	deprecated="not deprecated"		deprecated="not deprecated"
	visibility="public"		visibility="public"
	>		>
	</field>		</field>
	<field name="SCENE_MODE_STEADYPHOTO"		<field name="SCENE_MODE_FIREWORKS"
	type="java.lang.String"		type="java.lang.String"
	transient="false"		transient="false"
	volatile="false"		volatile="false"
	value=""steadyphoto""		value=""fireworks""
	static="true"		static="true"
	final="true"		final="true"
	deprecated="not deprecated"		deprecated="not deprecated"
	visibility="public"		visibility="public"
	>		>
	</field>		</field>
	<field name="SCENE_MODE_SUNSET"		<field name="SCENE_MODE_LANDSCAPE"
	type="java.lang.String"		type="java.lang.String"
	transient="false"		transient="false"
	volatile="false"		volatile="false"
	value=""sunset""		value=""landscape""
	static="true"		static="true"
	final="true"		final="true"
	deprecated="not deprecated"		deprecated="not deprecated"
	visibility="public"		visibility="public"
	>		>
	</field>		</field>
	<field name="SCENE_MODE_THEATRE"		<field name="SCENE_MODE_NIGHT"
	type="java.lang.String"		type="java.lang.String"
	transient="false"		transient="false"
	volatile="false"		volatile="false"
	value=""theatre""		value=""night""
	static="true"		static="true"
	final="true"		final="true"
	deprecated="not deprecated"		deprecated="not deprecated"
	visibility="public"		visibility="public"
	>		>
	</field>		</field>
	<field name="ISO_AUTO"		<field name="SCENE_MODE_NIGHT_PORTRAIT"
	type="java.lang.String"		type="java.lang.String"
	transient="false"		transient="false"
	volatile="false"		volatile="false"
	value=""auto""		value=""night-portrait""
	static="true"		static="true"
	final="true"		final="true"
	deprecated="not deprecated"		deprecated="not deprecated"
	visibility="public"		visibility="public"
	>		>
	</field>		</field>
	<field name="ISO_HJR"		<field name="SCENE_MODE_PARTY"
	type="java.lang.String"		type="java.lang.String"
	transient="false"		transient="false"
	volatile="false"		volatile="false"
	value=""ISO_HJR""		value=""party""
	static="true"		static="true"
	final="true"		final="true"
	deprecated="not deprecated"		deprecated="not deprecated"
	visibility="public"		visibility="public"
	>		>
	</field>		</field>
	<field name="ISO_100"		<field name="SCENE_MODE_PORTRAIT"
	type="java.lang.String"		type="java.lang.String"
	transient="false"		transient="false"
	volatile="false"		volatile="false"
	value=""ISO100""		value=""portrait""
	static="true"		static="true"
	final="true"		final="true"
	deprecated="not deprecated"		deprecated="not deprecated"
	visibility="public"		visibility="public"
	>		>
	</field>		</field>
	<field name="ISO_200"		<field name="SCENE_MODE_SNOW"
	type="java.lang.String"		type="java.lang.String"
	transient="false"		transient="false"
	volatile="false"		volatile="false"
	value=""ISO200""		value=""snow""
	static="true"		static="true"
	final="true"		final="true"
	deprecated="not deprecated"		deprecated="not deprecated"
	visibility="public"		visibility="public"
	>		>
	</field>		</field>
	<field name="ISO_400"		<field name="SCENE_MODE_SPORTS"
	type="java.lang.String"		type="java.lang.String"
	transient="false"		transient="false"
	volatile="false"		volatile="false"
	value=""ISO400""		value=""sports""
	static="true"		static="true"
	final="true"		final="true"
	deprecated="not deprecated"		deprecated="not deprecated"
	visibility="public"		visibility="public"
	>		>
	</field>		</field>
	<field name="ISO_800"		<field name="SCENE_MODE_STEADYPHOTO"
	type="java.lang.String"		type="java.lang.String"
	transient="false"		transient="false"
	volatile="false"		volatile="false"
	value=""ISO800""		value=""steadyphoto""
	static="true"		static="true"
	final="true"		final="true"
	deprecated="not deprecated"		deprecated="not deprecated"
	visibility="public"		visibility="public"
	>		>
	</field>		</field>
	<field name="LENSSHADE_ENABLE"		<field name="SCENE_MODE_SUNSET"
	type="java.lang.String"		type="java.lang.String"
	transient="false"		transient="false"
	volatile="false"		volatile="false"
	value=""enable""		value=""sunset""
	static="true"		static="true"
	final="true"		final="true"
	deprecated="not deprecated"		deprecated="not deprecated"
	visibility="public"		visibility="public"
	>		>
	</field>		</field>
	<field name="LENSSHADE_DISABLE"		<field name="SCENE_MODE_THEATRE"
	type="java.lang.String"		type="java.lang.String"
	transient="false"		transient="false"
	volatile="false"		volatile="false"
	value=""disable""		value=""theatre""
	static="true"		static="true"
	final="true"		final="true"
	deprecated="not deprecated"		deprecated="not deprecated"

core/java/android/hardware/Camera.java

+38 −0

Original line number	Original line	Diff line number	Diff line
	@@ -681,6 +681,7 @@ public class Camera {
	private static final String KEY_GPS_TIMESTAMP = "gps-timestamp";		private static final String KEY_GPS_TIMESTAMP = "gps-timestamp";
	private static final String KEY_WHITE_BALANCE = "whitebalance";		private static final String KEY_WHITE_BALANCE = "whitebalance";
	private static final String KEY_EFFECT = "effect";		private static final String KEY_EFFECT = "effect";
			private static final String KEY_AUTO_EXPOSURE = "auto-exposure";
	private static final String KEY_ANTIBANDING = "antibanding";		private static final String KEY_ANTIBANDING = "antibanding";
	private static final String KEY_SCENE_MODE = "scene-mode";		private static final String KEY_SCENE_MODE = "scene-mode";
	private static final String KEY_FLASH_MODE = "flash-mode";		private static final String KEY_FLASH_MODE = "flash-mode";
	@@ -711,6 +712,11 @@ public class Camera {
	public static final String EFFECT_BLACKBOARD = "blackboard";		public static final String EFFECT_BLACKBOARD = "blackboard";
	public static final String EFFECT_AQUA = "aqua";		public static final String EFFECT_AQUA = "aqua";

			// Values for auto exposure settings.
			public static final String AUTO_EXPOSURE_FRAME_AVG = "frame-average";
			public static final String AUTO_EXPOSURE_CENTER_WEIGHTED = "center-weighted";
			public static final String AUTO_EXPOSURE_SPOT_METERING = "spot-metering";

	// Values for antibanding settings.		// Values for antibanding settings.
	public static final String ANTIBANDING_AUTO = "auto";		public static final String ANTIBANDING_AUTO = "auto";
	public static final String ANTIBANDING_50HZ = "50hz";		public static final String ANTIBANDING_50HZ = "50hz";
	@@ -1345,6 +1351,38 @@ public class Camera {
	return split(str);		return split(str);
	}		}

			/**
			* Gets the current auto exposure setting.
			*
			* @return one of AUTO_EXPOSURE_XXX string constant. null if auto exposure
			* setting is not supported.
			* @hide
			*/
			public String getAutoExposure() {
			return get(KEY_AUTO_EXPOSURE);
			}

			/**
			* Sets the current auto exposure setting.
			*
			* @param value AUTO_EXPOSURE_XXX string constants.
			* @hide
			*/
			public void setAutoExposure(String value) {
			set(KEY_AUTO_EXPOSURE, value);
			}

			/**
			* Gets the supported auto exposure setting.
			*
			* @return a List of AUTO_EXPOSURE_XXX string constants. null if auto exposure
			* setting is not supported.
			* @hide
			*/
			public List<String> getSupportedAutoexposure() {
			String str = get(KEY_AUTO_EXPOSURE + SUPPORTED_VALUES_SUFFIX);
			return split(str);
			}

	/**		/**
	* Gets the current antibanding setting.		* Gets the current antibanding setting.

include/ui/CameraParameters.h

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -157,6 +157,9 @@ public:
	// Supported color effect settings.		// Supported color effect settings.
	// Example value: "none,mono,sepia". Read only.		// Example value: "none,mono,sepia". Read only.
	static const char KEY_SUPPORTED_EFFECTS[];		static const char KEY_SUPPORTED_EFFECTS[];
			//Auto exposure settings.
			static const char KEY_AUTO_EXPOSURE[];
			static const char KEY_SUPPORTED_AUTO_EXPOSURE[];
	// Current antibanding setting.		// Current antibanding setting.
	// Example value: "auto" or ANTIBANDING_XXX constants. Read/write.		// Example value: "auto" or ANTIBANDING_XXX constants. Read/write.
	static const char KEY_ANTIBANDING[];		static const char KEY_ANTIBANDING[];
	@@ -212,6 +215,11 @@ public:
	static const char EFFECT_BLACKBOARD[];		static const char EFFECT_BLACKBOARD[];
	static const char EFFECT_AQUA[];		static const char EFFECT_AQUA[];

			// Values for auto exposure settings.
			static const char AUTO_EXPOSURE_FRAME_AVG[];
			static const char AUTO_EXPOSURE_CENTER_WEIGHTED[];
			static const char AUTO_EXPOSURE_SPOT_METERING[];

	// Values for antibanding settings.		// Values for antibanding settings.
	static const char ANTIBANDING_AUTO[];		static const char ANTIBANDING_AUTO[];
	static const char ANTIBANDING_50HZ[];		static const char ANTIBANDING_50HZ[];

libs/ui/CameraParameters.cpp

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -48,6 +48,8 @@ const char CameraParameters::KEY_WHITE_BALANCE[] = "whitebalance";
	const char CameraParameters::KEY_SUPPORTED_WHITE_BALANCE[] = "whitebalance-values";		const char CameraParameters::KEY_SUPPORTED_WHITE_BALANCE[] = "whitebalance-values";
	const char CameraParameters::KEY_EFFECT[] = "effect";		const char CameraParameters::KEY_EFFECT[] = "effect";
	const char CameraParameters::KEY_SUPPORTED_EFFECTS[] = "effect-values";		const char CameraParameters::KEY_SUPPORTED_EFFECTS[] = "effect-values";
			const char CameraParameters::KEY_AUTO_EXPOSURE[] = "auto-exposure";
			const char CameraParameters::KEY_SUPPORTED_AUTO_EXPOSURE[] = "auto-exposure-values";
	const char CameraParameters::KEY_ANTIBANDING[] = "antibanding";		const char CameraParameters::KEY_ANTIBANDING[] = "antibanding";
	const char CameraParameters::KEY_SUPPORTED_ANTIBANDING[] = "antibanding-values";		const char CameraParameters::KEY_SUPPORTED_ANTIBANDING[] = "antibanding-values";
	const char CameraParameters::KEY_SCENE_MODE[] = "scene-mode";		const char CameraParameters::KEY_SCENE_MODE[] = "scene-mode";
	@@ -82,6 +84,11 @@ const char CameraParameters::EFFECT_WHITEBOARD[] = "whiteboard";
	const char CameraParameters::EFFECT_BLACKBOARD[] = "blackboard";		const char CameraParameters::EFFECT_BLACKBOARD[] = "blackboard";
	const char CameraParameters::EFFECT_AQUA[] = "aqua";		const char CameraParameters::EFFECT_AQUA[] = "aqua";

			// Values for auto exposure settings.
			const char CameraParameters::AUTO_EXPOSURE_FRAME_AVG[] = "frame-average";
			const char CameraParameters::AUTO_EXPOSURE_CENTER_WEIGHTED[] = "center-weighted";
			const char CameraParameters::AUTO_EXPOSURE_SPOT_METERING[] = "spot-metering";

	// Values for antibanding settings.		// Values for antibanding settings.
	const char CameraParameters::ANTIBANDING_AUTO[] = "auto";		const char CameraParameters::ANTIBANDING_AUTO[] = "auto";
	const char CameraParameters::ANTIBANDING_50HZ[] = "50hz";		const char CameraParameters::ANTIBANDING_50HZ[] = "50hz";