am 76fc56fb: am 926d9a89: am 08caa704: am c58b4232: Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF. (62331ea9) · Commits · e / os / android_frameworks_base

api/current.xml

+22 −0

Original line number	Diff line number	Diff line
		@@ -73019,6 +73019,17 @@
		visibility="public"
		>
		</field>
		<field name="FOCUS_MODE_EDOF"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""edof""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="FOCUS_MODE_FIXED"
		type="java.lang.String"
		transient="false"
		@@ -73074,6 +73085,17 @@
		visibility="public"
		>
		</field>
		<field name="SCENE_MODE_BARCODE"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""barcode""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="SCENE_MODE_BEACH"
		type="java.lang.String"
		transient="false"

core/java/android/hardware/Camera.java

+18 −3

Original line number	Diff line number	Diff line
		@@ -824,6 +824,12 @@ public class Camera {
		public static final String SCENE_MODE_PARTY = "party";
		public static final String SCENE_MODE_CANDLELIGHT = "candlelight";

		/**
		* Applications are looking for a barcode. Camera driver will be
		* optimized for barcode reading.
		*/
		public static final String SCENE_MODE_BARCODE = "barcode";

		// Values for focus mode settings.
		/**
		* Auto-focus mode.
		@@ -845,6 +851,13 @@ public class Camera {
		*/
		public static final String FOCUS_MODE_FIXED = "fixed";

		/**
		* Extended depth of field (EDOF). Focusing is done digitally and
		* continuously. Applications should not call {@link
		* #autoFocus(AutoFocusCallback)} in this mode.
		*/
		public static final String FOCUS_MODE_EDOF = "edof";

		// Formats for setPreviewFormat and setPictureFormat.
		private static final String PIXEL_FORMAT_YUV422SP = "yuv422sp";
		private static final String PIXEL_FORMAT_YUV420SP = "yuv420sp";
		@@ -1507,9 +1520,11 @@ public class Camera {
		}

		/**
		* Sets the scene mode. Other parameters may be changed after changing
		* scene mode. For example, flash and supported flash mode may be
		* changed to "off" in night scene mode. After setting scene mode,
		* Sets the scene mode. Changing scene mode may override other
		* parameters (such as flash mode, focus mode, white balance). For
		* example, suppose originally flash mode is on and supported flash
		* modes are on/off. In night scene mode, both flash mode and supported
		* flash mode may be changed to off. After setting scene mode,
		* applications should call getParameters to know if some parameters are
		* changed.
		*

include/camera/CameraParameters.h

+7 −0

Original line number	Diff line number	Diff line
		@@ -289,6 +289,9 @@ public:
		static const char SCENE_MODE_SPORTS[];
		static const char SCENE_MODE_PARTY[];
		static const char SCENE_MODE_CANDLELIGHT[];
		// Applications are looking for a barcode. Camera driver will be optimized
		// for barcode reading.
		static const char SCENE_MODE_BARCODE[];

		// Formats for setPreviewFormat and setPictureFormat.
		static const char PIXEL_FORMAT_YUV422SP[];
		@@ -309,6 +312,10 @@ public:
		// focus, which is usually at hyperfocal distance. Applications should
		// not call CameraHardwareInterface.autoFocus in this mode.
		static const char FOCUS_MODE_FIXED[];
		// Extended depth of field (EDOF). Focusing is done digitally and
		// continuously. Applications should not call
		// CameraHardwareInterface.autoFocus in this mode.
		static const char FOCUS_MODE_EDOF[];

		private:
		DefaultKeyedVector<String8,String8> mMap;

libs/camera/CameraParameters.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -122,6 +122,7 @@ const char CameraParameters::SCENE_MODE_FIREWORKS[] = "fireworks";
		const char CameraParameters::SCENE_MODE_SPORTS[] = "sports";
		const char CameraParameters::SCENE_MODE_PARTY[] = "party";
		const char CameraParameters::SCENE_MODE_CANDLELIGHT[] = "candlelight";
		const char CameraParameters::SCENE_MODE_BARCODE[] = "barcode";

		// Formats for setPreviewFormat and setPictureFormat.
		const char CameraParameters::PIXEL_FORMAT_YUV422SP[] = "yuv422sp";
		@@ -135,6 +136,7 @@ const char CameraParameters::FOCUS_MODE_AUTO[] = "auto";
		const char CameraParameters::FOCUS_MODE_INFINITY[] = "infinity";
		const char CameraParameters::FOCUS_MODE_MACRO[] = "macro";
		const char CameraParameters::FOCUS_MODE_FIXED[] = "fixed";
		const char CameraParameters::FOCUS_MODE_EDOF[] = "edof";

		CameraParameters::CameraParameters()
		: mMap()