CAF Continuous Autofocus (95c86bbe) · Commits · e / os / android_frameworks_base

api/current.xml

+57 −0

Original line number	Diff line number	Diff line
		@@ -73584,6 +73584,17 @@
		visibility="public"
		>
		</method>
		<method name="getContinuousAf"
		return="java.lang.String"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="getExposureCompensation"
		return="int"
		abstract="false"
		@@ -73843,6 +73854,17 @@
		visibility="public"
		>
		</method>
		<method name="getSupportedContinuousAfModes"
		return="java.util.List<java.lang.String>"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="getSupportedFlashModes"
		return="java.util.List<java.lang.String>"
		abstract="false"
		@@ -74110,6 +74132,19 @@
		<parameter name="value" type="java.lang.String">
		</parameter>
		</method>
		<method name="setContinuousAf"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="value" type="java.lang.String">
		</parameter>
		</method>
		<method name="setExposureCompensation"
		return="void"
		abstract="false"
		@@ -74448,6 +74483,28 @@
		visibility="public"
		>
		</field>
		<field name="CAF_OFF"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""caf-off""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="CAF_ON"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""caf-on""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="EFFECT_AQUA"
		type="java.lang.String"
		transient="false"

core/java/android/hardware/Camera.java

+39 −1

Original line number	Diff line number	Diff line
		@@ -1021,6 +1021,7 @@ public class Camera {
		private static final String KEY_ZOOM_SUPPORTED = "zoom-supported";
		private static final String KEY_SMOOTH_ZOOM_SUPPORTED = "smooth-zoom-supported";
		private static final String KEY_FOCUS_DISTANCES = "focus-distances";
		private static final String KEY_CAF = "continuous-af";

		// Parameter key suffix for supported values.
		private static final String SUPPORTED_VALUES_SUFFIX = "-values";
		@@ -1253,6 +1254,11 @@ public class Camera {
		private static final String PIXEL_FORMAT_RGB565 = "rgb565";
		private static final String PIXEL_FORMAT_JPEG = "jpeg";

		//Values for Continuous AF

		public static final String CAF_OFF = "caf-off";
		public static final String CAF_ON = "caf-on";

		private HashMap<String, String> mMap;

		private Parameters() {
		@@ -2331,6 +2337,38 @@ public class Camera {
		splitFloat(get(KEY_FOCUS_DISTANCES), output);
		}

		/**
		* Gets the current Continuous AF setting.
		*
		* @return one of CONTINUOUS_AF_XXX string constant. null if continuous AF
		* setting is not supported.
		*
		*/
		public String getContinuousAf() {
		return get(KEY_CAF);
		}

		/**
		* Sets the current Continuous AF mode.
		* @param value CONTINUOUS_AF_XXX string constants.
		*
		*/
		public void setContinuousAf(String value) {
		set(KEY_CAF, value);
		}

		/**
		* Gets the supported Continuous AF modes.
		*
		* @return a List of CONTINUOUS_AF_XXX string constant. null if continuous AF
		* setting is not supported.
		*
		*/
		public List<String> getSupportedContinuousAfModes() {
		String str = get(KEY_CAF + SUPPORTED_VALUES_SUFFIX);
		return split(str);
		}

		// Splits a comma delimited string to an ArrayList of String.
		// Return null if the passing string is null or the size is 0.
		private ArrayList<String> split(String str) {

include/camera/CameraParameters.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -299,6 +299,10 @@ public:
		// Value for KEY_FOCUS_DISTANCES.
		static const char FOCUS_DISTANCE_INFINITY[];

		//Continuous AF.
		static const char KEY_CAF[];
		static const char KEY_SUPPORTED_CAF[];

		// Values for white balance settings.
		static const char WHITE_BALANCE_AUTO[];
		static const char WHITE_BALANCE_INCANDESCENT[];
		@@ -396,6 +400,10 @@ public:
		// applications should change the focus mode to other modes.
		static const char FOCUS_MODE_CONTINUOUS_VIDEO[];

		// Values for Continuous AF
		static const char CAF_OFF[] ;
		static const char CAF_ON[] ;

		private:
		DefaultKeyedVector<String8,String8> mMap;
		};

libs/camera/CameraParameters.cpp

+6 −0

Original line number	Diff line number	Diff line
		@@ -73,6 +73,8 @@ const char CameraParameters::KEY_ZOOM_SUPPORTED[] = "zoom-supported";
		const char CameraParameters::KEY_SMOOTH_ZOOM_SUPPORTED[] = "smooth-zoom-supported";
		const char CameraParameters::KEY_FOCUS_DISTANCES[] = "focus-distances";
		const char CameraParameters::KEY_VIDEO_FRAME_FORMAT[] = "video-frame-format";
		const char CameraParameters::KEY_CAF[] = "continuous-af";
		const char CameraParameters::KEY_SUPPORTED_CAF[] = "continuous-af-values";

		const char CameraParameters::TRUE[] = "true";
		const char CameraParameters::FOCUS_DISTANCE_INFINITY[] = "Infinity";
		@@ -144,6 +146,10 @@ const char CameraParameters::FOCUS_MODE_FIXED[] = "fixed";
		const char CameraParameters::FOCUS_MODE_EDOF[] = "edof";
		const char CameraParameters::FOCUS_MODE_CONTINUOUS_VIDEO[] = "continuous-video";

		//Values for Continuous AF
		const char CameraParameters::CAF_OFF[] = "caf-off";
		const char CameraParameters::CAF_ON[] = "caf-on";

		CameraParameters::CameraParameters()
		: mMap()
		{