Merge "Camera: add @hide API for setting camera rotation" (d6ee06a0) · Commits · e / os / android_frameworks_base

core/java/android/hardware/camera2/CameraDevice.java

+15 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package android.hardware.camera2;

		import android.hardware.camera2.params.StreamConfigurationMap;
		import android.hardware.camera2.params.OutputConfiguration;
		import android.os.Handler;
		import android.view.Surface;

		@@ -379,6 +380,20 @@ public abstract class CameraDevice implements AutoCloseable {
		CameraCaptureSession.StateCallback callback, Handler handler)
		throws CameraAccessException;

		/**
		* <p>Create a new camera capture session by providing the target output set of Surfaces and
		* its corresponding surface configuration to the camera device.</p>
		*
		* @see #createCaptureSession
		* @see OutputConfiguration
		*
		* @hide
		*/
		public abstract void createCaptureSessionByOutputConfiguration(
		List<OutputConfiguration> outputConfigurations,
		CameraCaptureSession.StateCallback callback, Handler handler)
		throws CameraAccessException;

		/**
		* <p>Create a {@link CaptureRequest.Builder} for new capture requests,
		* initialized with template for a target use case. The settings are chosen

core/java/android/hardware/camera2/impl/CameraDeviceImpl.java

+19 −2

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ import android.hardware.camera2.CaptureFailure;
		import android.hardware.camera2.ICameraDeviceCallbacks;
		import android.hardware.camera2.ICameraDeviceUser;
		import android.hardware.camera2.TotalCaptureResult;
		import android.hardware.camera2.params.OutputConfiguration;
		import android.hardware.camera2.utils.CameraBinderDecorator;
		import android.hardware.camera2.utils.CameraRuntimeException;
		import android.hardware.camera2.utils.LongParcelable;
		@@ -415,6 +416,18 @@ public class CameraDeviceImpl extends CameraDevice {
		public void createCaptureSession(List<Surface> outputs,
		CameraCaptureSession.StateCallback callback, Handler handler)
		throws CameraAccessException {
		List<OutputConfiguration> outConfigurations = new ArrayList<>(outputs.size());
		for (Surface surface : outputs) {
		outConfigurations.add(new OutputConfiguration(surface));
		}
		createCaptureSessionByOutputConfiguration(outConfigurations, callback, handler);
		}

		@Override
		public void createCaptureSessionByOutputConfiguration(
		List<OutputConfiguration> outputConfigurations,
		CameraCaptureSession.StateCallback callback, Handler handler)
		throws CameraAccessException {
		synchronized(mInterfaceLock) {
		if (DEBUG) {
		Log.d(TAG, "createCaptureSession");
		@@ -431,8 +444,12 @@ public class CameraDeviceImpl extends CameraDevice {
		// TODO: dont block for this
		boolean configureSuccess = true;
		CameraAccessException pendingException = null;
		List<Surface> outSurfaces = new ArrayList<>(outputConfigurations.size());
		for (OutputConfiguration config : outputConfigurations) {
		outSurfaces.add(config.getSurface());
		}
		try {
		configureSuccess = configureOutputsChecked(outputs); // and then block until IDLE
		configureSuccess = configureOutputsChecked(outSurfaces); // and then block until IDLE
		} catch (CameraAccessException e) {
		configureSuccess = false;
		pendingException = e;
		@@ -444,7 +461,7 @@ public class CameraDeviceImpl extends CameraDevice {
		// Fire onConfigured if configureOutputs succeeded, fire onConfigureFailed otherwise.
		CameraCaptureSessionImpl newSession =
		new CameraCaptureSessionImpl(mNextSessionId++,
		outputs, callback, handler, this, mDeviceHandler,
		outSurfaces, callback, handler, this, mDeviceHandler,
		configureSuccess);

		// TODO: wait until current session closes, then create the new session

core/java/android/hardware/camera2/params/OutputConfiguration.java

0 → 100644

+116 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2015 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.
		*/


		package android.hardware.camera2.params;

		import android.hardware.camera2.CameraDevice;
		import android.view.Surface;

		import static com.android.internal.util.Preconditions.*;

		/**
		* Immutable class for describing camera output, which contains a {@link Surface} and its specific
		* configuration for creating capture session.
		*
		* @see CameraDevice#createCaptureSession
		*
		* @hide
		*/
		public final class OutputConfiguration {

		/**
		* Rotation constant: 0 degree rotation (no rotation)
		*/
		public static final int ROTATION_0 = 0;

		/**
		* Rotation constant: 90 degree counterclockwise rotation.
		*/
		public static final int ROTATION_90 = 1;

		/**
		* Rotation constant: 180 degree counterclockwise rotation.
		*/
		public static final int ROTATION_180 = 2;

		/**
		* Rotation constant: 270 degree counterclockwise rotation.
		*/
		public static final int ROTATION_270 = 3;

		/**
		* Create a new immutable SurfaceConfiguration instance.
		*
		* @param surface
		* A Surface for camera to output to.
		*
		* <p>This constructor creates a default configuration</p>
		*
		*/
		public OutputConfiguration(Surface surface) {
		checkNotNull(surface, "Surface must not be null");
		mSurface = surface;
		mRotation = ROTATION_0;
		}

		/**
		* Create a new immutable SurfaceConfiguration instance.
		*
		* <p>This constructor takes an argument for desired camera rotation</p>
		*
		* @param surface
		* A Surface for camera to output to.
		* @param rotation
		* The desired rotation to be applied on camera output. Value must be one of
		* ROTATION_[0, 90, 180, 270]. Note that when the rotation is 90 or 270 degree,
		* application should make sure corresponding surface size has width and height
		* transposed corresponding to the width and height without rotation. For example,
		* if application needs camera to capture 1280x720 picture and rotate it by 90 degree,
		* application should set rotation to {@code ROTATION_90} and make sure the
		* corresponding Surface size is 720x1280. Note that {@link CameraDevice} might
		* throw {@code IllegalArgumentException} if device cannot perform such rotation.
		*
		*/
		public OutputConfiguration(Surface surface, int rotation) {
		checkNotNull(surface, "Surface must not be null");
		checkArgumentInRange(rotation, ROTATION_0, ROTATION_270, "Rotation constant");
		mSurface = surface;
		mRotation = rotation;
		}

		/**
		* Get the {@link Surface} associated with this {@link OutputConfiguration}.
		*
		* @return the {@link Surface} associated with this {@link OutputConfiguration}.
		*/
		public Surface getSurface() {
		return mSurface;
		}

		/**
		* Get the rotation associated with this {@link OutputConfiguration}.
		*
		* @return the rotation associated with this {@link OutputConfiguration}.
		* Value will be one of ROTATION_[0, 90, 180, 270]
		*/
		public int getRotation() {
		return mRotation;
		}

		private final Surface mSurface;
		private final int mRotation;
		}