Merge "Camera: Add support for video rotation" (22be7a7f) · Commits · e / os / android_frameworks_base

core/java/android/hardware/Camera.java

+49 −0

Original line number	Diff line number	Diff line
		@@ -4241,6 +4241,7 @@ public class Camera {
		private static final String KEY_QC_MIN_WB_CCT = "min-wb-cct";
		private static final String KEY_QC_MAX_WB_CCT = "max-wb-cct";
		private static final String KEY_QC_AUTO_HDR_ENABLE = "auto-hdr-enable";
		private static final String KEY_QC_VIDEO_ROTATION = "video-rotation";

		/** @hide
		* KEY_QC_AE_BRACKET_HDR
		@@ -4468,6 +4469,25 @@ public class Camera {
		**/
		public static final String FACE_DETECTION_ON = "on";

		// Values for video rotation settings.

		/** @hide
		* VIDEO_ROTATION_0
		**/
		public static final String VIDEO_ROTATION_0 = "0";
		/** @hide
		* VIDEO_ROTATION_90
		**/
		public static final String VIDEO_ROTATION_90 = "90";
		/** @hide
		* VIDEO_ROTATION_180
		**/
		public static final String VIDEO_ROTATION_180 = "180";
		/** @hide
		* VIDEO_ROTATION_270
		**/
		public static final String VIDEO_ROTATION_270 = "270";

		/* ### QC ADDED PARAMETER APIS*/
		/** @hide
		* Gets the supported preview sizes in high frame rate recording mode.
		@@ -5339,6 +5359,35 @@ public class Camera {
		set(KEY_QC_FACE_DETECTION, value);
		}

		/** @hide
		* Gets the current video rotation setting.
		*
		* @return one of VIDEO_QC_ROTATION_XXX string constant. null if video rotation
		* setting is not supported.
		*/
		public String getVideoRotation() {
		return get(KEY_QC_VIDEO_ROTATION);
		}

		/** @hide
		* Sets the current video rotation setting.
		*
		* @param value VIDEO_QC_ROTATION_XXX string constants.
		*/
		public void setVideoRotation(String value) {
		set(KEY_QC_VIDEO_ROTATION, value);
		}
		/** @hide
		* Gets the supported video rotation modes.
		*
		* @return a List of VIDEO_QC_ROTATION_XXX string constant. null if this
		* setting is not supported.
		*/
		public List<String> getSupportedVideoRotationValues() {
		String str = get(KEY_QC_VIDEO_ROTATION + SUPPORTED_VALUES_SUFFIX);
		return split(str);
		}

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