Camera: Accept user-supplied executors in capture sessions (2f0184fa) · Commits · e / os / android_frameworks_base

api/current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -15727,6 +15727,8 @@ package android.hardware.camera2 {
		method public abstract void abortCaptures() throws android.hardware.camera2.CameraAccessException;
		method public abstract int capture(android.hardware.camera2.CaptureRequest, android.hardware.camera2.CameraCaptureSession.CaptureCallback, android.os.Handler) throws android.hardware.camera2.CameraAccessException;
		method public abstract int captureBurst(java.util.List<android.hardware.camera2.CaptureRequest>, android.hardware.camera2.CameraCaptureSession.CaptureCallback, android.os.Handler) throws android.hardware.camera2.CameraAccessException;
		method public int captureBurstRequests(java.util.List<android.hardware.camera2.CaptureRequest>, java.util.concurrent.Executor, android.hardware.camera2.CameraCaptureSession.CaptureCallback) throws android.hardware.camera2.CameraAccessException;
		method public int captureSingleRequest(android.hardware.camera2.CaptureRequest, java.util.concurrent.Executor, android.hardware.camera2.CameraCaptureSession.CaptureCallback) throws android.hardware.camera2.CameraAccessException;
		method public abstract void close();
		method public abstract void finalizeOutputConfigurations(java.util.List<android.hardware.camera2.params.OutputConfiguration>) throws android.hardware.camera2.CameraAccessException;
		method public abstract android.hardware.camera2.CameraDevice getDevice();
		@@ -15734,7 +15736,9 @@ package android.hardware.camera2 {
		method public abstract boolean isReprocessable();
		method public abstract void prepare(android.view.Surface) throws android.hardware.camera2.CameraAccessException;
		method public abstract int setRepeatingBurst(java.util.List<android.hardware.camera2.CaptureRequest>, android.hardware.camera2.CameraCaptureSession.CaptureCallback, android.os.Handler) throws android.hardware.camera2.CameraAccessException;
		method public int setRepeatingBurstRequests(java.util.List<android.hardware.camera2.CaptureRequest>, java.util.concurrent.Executor, android.hardware.camera2.CameraCaptureSession.CaptureCallback) throws android.hardware.camera2.CameraAccessException;
		method public abstract int setRepeatingRequest(android.hardware.camera2.CaptureRequest, android.hardware.camera2.CameraCaptureSession.CaptureCallback, android.os.Handler) throws android.hardware.camera2.CameraAccessException;
		method public int setSingleRepeatingRequest(android.hardware.camera2.CaptureRequest, java.util.concurrent.Executor, android.hardware.camera2.CameraCaptureSession.CaptureCallback) throws android.hardware.camera2.CameraAccessException;
		method public abstract void stopRepeating() throws android.hardware.camera2.CameraAccessException;
		method public void updateOutputConfiguration(android.hardware.camera2.params.OutputConfiguration) throws android.hardware.camera2.CameraAccessException;
		}

core/java/android/hardware/camera2/CameraCaptureSession.java

+173 −1

Original line number	Diff line number	Diff line
		@@ -16,15 +16,16 @@

		package android.hardware.camera2;

		import android.annotation.CallbackExecutor;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.hardware.camera2.params.OutputConfiguration;
		import android.os.Handler;
		import android.view.Surface;

		import java.util.concurrent.Executor;
		import java.util.List;


		/**
		* A configured capture session for a {@link CameraDevice}, used for capturing images from the
		* camera or reprocessing images captured from the camera in the same session previously.
		@@ -353,6 +354,50 @@ public abstract class CameraCaptureSession implements AutoCloseable {
		@Nullable CaptureCallback listener, @Nullable Handler handler)
		throws CameraAccessException;

		/**
		* <p>Submit a request for an image to be captured by the camera device.</p>
		*
		* <p>The behavior of this method matches that of
		* {@link #capture(CaptureRequest, CaptureCallback, Handler)},
		* except that it uses {@link java.util.concurrent.Executor} as an argument
		* instead of {@link android.os.Handler}.</p>
		*
		* @param request the settings for this capture
		* @param executor the executor which will be used for invoking the listener.
		* @param listener The callback object to notify once this request has been
		* processed.
		*
		* @return int A unique capture sequence ID used by
		* {@link CaptureCallback#onCaptureSequenceCompleted}.
		*
		* @throws CameraAccessException if the camera device is no longer connected or has
		* encountered a fatal error
		* @throws IllegalStateException if this session is no longer active, either because the session
		* was explicitly closed, a new session has been created
		* or the camera device has been closed.
		* @throws IllegalArgumentException if the request targets no Surfaces or Surfaces that are not
		* configured as outputs for this session; or the request
		* targets a set of Surfaces that cannot be submitted
		* simultaneously in a reprocessable capture session; or a
		* reprocess capture request is submitted in a
		* non-reprocessable capture session; or the reprocess capture
		* request was created with a {@link TotalCaptureResult} from
		* a different session; or the capture targets a Surface in
		* the middle of being {@link #prepare prepared}; or the
		* executor is null, or the listener is not null.
		*
		* @see #captureBurst
		* @see #setRepeatingRequest
		* @see #setRepeatingBurst
		* @see #abortCaptures
		* @see CameraDevice#createReprocessableCaptureSession
		*/
		public int captureSingleRequest(@NonNull CaptureRequest request,
		@NonNull @CallbackExecutor Executor executor, @NonNull CaptureCallback listener)
		throws CameraAccessException {
		throw new UnsupportedOperationException("Subclasses must override this method");
		}

		/**
		* Submit a list of requests to be captured in sequence as a burst. The
		* burst will be captured in the minimum amount of time possible, and will
		@@ -415,6 +460,53 @@ public abstract class CameraCaptureSession implements AutoCloseable {
		@Nullable CaptureCallback listener, @Nullable Handler handler)
		throws CameraAccessException;

		/**
		* Submit a list of requests to be captured in sequence as a burst. The
		* burst will be captured in the minimum amount of time possible, and will
		* not be interleaved with requests submitted by other capture or repeat
		* calls.
		*
		* <p>The behavior of this method matches that of
		* {@link #captureBurst(List, CaptureCallback, Handler)},
		* except that it uses {@link java.util.concurrent.Executor} as an argument
		* instead of {@link android.os.Handler}.</p>
		*
		* @param requests the list of settings for this burst capture
		* @param executor the executor which will be used for invoking the listener.
		* @param listener The callback object to notify each time one of the
		* requests in the burst has been processed.
		*
		* @return int A unique capture sequence ID used by
		* {@link CaptureCallback#onCaptureSequenceCompleted}.
		*
		* @throws CameraAccessException if the camera device is no longer connected or has
		* encountered a fatal error
		* @throws IllegalStateException if this session is no longer active, either because the session
		* was explicitly closed, a new session has been created
		* or the camera device has been closed.
		* @throws IllegalArgumentException If the requests target no Surfaces, or the requests target
		* Surfaces not currently configured as outputs; or one of the
		* requests targets a set of Surfaces that cannot be submitted
		* simultaneously in a reprocessable capture session; or a
		* reprocess capture request is submitted in a
		* non-reprocessable capture session; or one of the reprocess
		* capture requests was created with a
		* {@link TotalCaptureResult} from a different session; or one
		* of the captures targets a Surface in the middle of being
		* {@link #prepare prepared}; or if the executor is null; or if
		* the listener is null.
		*
		* @see #capture
		* @see #setRepeatingRequest
		* @see #setRepeatingBurst
		* @see #abortCaptures
		*/
		public int captureBurstRequests(@NonNull List<CaptureRequest> requests,
		@NonNull @CallbackExecutor Executor executor, @NonNull CaptureCallback listener)
		throws CameraAccessException {
		throw new UnsupportedOperationException("Subclasses must override this method");
		}

		/**
		* Request endlessly repeating capture of images by this capture session.
		*
		@@ -482,6 +574,45 @@ public abstract class CameraCaptureSession implements AutoCloseable {
		@Nullable CaptureCallback listener, @Nullable Handler handler)
		throws CameraAccessException;

		/**
		* Request endlessly repeating capture of images by this capture session.
		*
		* <p>The behavior of this method matches that of
		* {@link #setRepeatingRequest(CaptureRequest, CaptureCallback, Handler)},
		* except that it uses {@link java.util.concurrent.Executor} as an argument
		* instead of {@link android.os.Handler}.</p>
		*
		* @param request the request to repeat indefinitely
		* @param executor the executor which will be used for invoking the listener.
		* @param listener The callback object to notify every time the
		* request finishes processing.
		*
		* @return int A unique capture sequence ID used by
		* {@link CaptureCallback#onCaptureSequenceCompleted}.
		*
		* @throws CameraAccessException if the camera device is no longer connected or has
		* encountered a fatal error
		* @throws IllegalStateException if this session is no longer active, either because the session
		* was explicitly closed, a new session has been created
		* or the camera device has been closed.
		* @throws IllegalArgumentException If the request references no Surfaces or references Surfaces
		* that are not currently configured as outputs; or the request
		* is a reprocess capture request; or the capture targets a
		* Surface in the middle of being {@link #prepare prepared}; or
		* the executor is null; or the listener is null.
		*
		* @see #capture
		* @see #captureBurst
		* @see #setRepeatingBurst
		* @see #stopRepeating
		* @see #abortCaptures
		*/
		public int setSingleRepeatingRequest(@NonNull CaptureRequest request,
		@NonNull @CallbackExecutor Executor executor, @NonNull CaptureCallback listener)
		throws CameraAccessException {
		throw new UnsupportedOperationException("Subclasses must override this method");
		}

		/**
		* <p>Request endlessly repeating capture of a sequence of images by this
		* capture session.</p>
		@@ -554,6 +685,47 @@ public abstract class CameraCaptureSession implements AutoCloseable {
		@Nullable CaptureCallback listener, @Nullable Handler handler)
		throws CameraAccessException;

		/**
		* <p>Request endlessly repeating capture of a sequence of images by this
		* capture session.</p>
		*
		* <p>The behavior of this method matches that of
		* {@link #setRepeatingBurst(List, CaptureCallback, Handler)},
		* except that it uses {@link java.util.concurrent.Executor} as an argument
		* instead of {@link android.os.Handler}.</p>
		*
		* @param requests the list of requests to cycle through indefinitely
		* @param executor the executor which will be used for invoking the listener.
		* @param listener The callback object to notify each time one of the
		* requests in the repeating bursts has finished processing.
		*
		* @return int A unique capture sequence ID used by
		* {@link CaptureCallback#onCaptureSequenceCompleted}.
		*
		* @throws CameraAccessException if the camera device is no longer connected or has
		* encountered a fatal error
		* @throws IllegalStateException if this session is no longer active, either because the session
		* was explicitly closed, a new session has been created
		* or the camera device has been closed.
		* @throws IllegalArgumentException If the requests reference no Surfaces or reference Surfaces
		* not currently configured as outputs; or one of the requests
		* is a reprocess capture request; or one of the captures
		* targets a Surface in the middle of being
		* {@link #prepare prepared}; or the executor is null; or the
		* listener is null.
		*
		* @see #capture
		* @see #captureBurst
		* @see #setRepeatingRequest
		* @see #stopRepeating
		* @see #abortCaptures
		*/
		public int setRepeatingBurstRequests(@NonNull List<CaptureRequest> requests,
		@NonNull @CallbackExecutor Executor executor, @NonNull CaptureCallback listener)
		throws CameraAccessException {
		throw new UnsupportedOperationException("Subclasses must override this method");
		}

		/**
		* <p>Cancel any ongoing repeating capture set by either
		* {@link #setRepeatingRequest setRepeatingRequest} or

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

+155 −30

File changed.

Preview size limit exceeded, changes collapsed.

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

+36 −0

Original line number	Diff line number	Diff line
		@@ -192,6 +192,13 @@ public class CameraConstrainedHighSpeedCaptureSessionImpl
		+ " this method");
		}

		@Override
		public int captureSingleRequest(CaptureRequest request, Executor executor,
		CaptureCallback listener) throws CameraAccessException {
		throw new UnsupportedOperationException("Constrained high speed session doesn't support"
		+ " this method");
		}

		@Override
		public int captureBurst(List<CaptureRequest> requests, CaptureCallback listener,
		Handler handler) throws CameraAccessException {
		@@ -203,6 +210,17 @@ public class CameraConstrainedHighSpeedCaptureSessionImpl
		return mSessionImpl.captureBurst(requests, listener, handler);
		}

		@Override
		public int captureBurstRequests(List<CaptureRequest> requests, Executor executor,
		CaptureCallback listener) throws CameraAccessException {
		if (!isConstrainedHighSpeedRequestList(requests)) {
		throw new IllegalArgumentException(
		"Only request lists created by createHighSpeedRequestList() can be submitted to " +
		"a constrained high speed capture session");
		}
		return mSessionImpl.captureBurstRequests(requests, executor, listener);
		}

		@Override
		public int setRepeatingRequest(CaptureRequest request, CaptureCallback listener,
		Handler handler) throws CameraAccessException {
		@@ -210,6 +228,13 @@ public class CameraConstrainedHighSpeedCaptureSessionImpl
		+ " this method");
		}

		@Override
		public int setSingleRepeatingRequest(CaptureRequest request, Executor executor,
		CaptureCallback listener) throws CameraAccessException {
		throw new UnsupportedOperationException("Constrained high speed session doesn't support"
		+ " this method");
		}

		@Override
		public int setRepeatingBurst(List<CaptureRequest> requests, CaptureCallback listener,
		Handler handler) throws CameraAccessException {
		@@ -221,6 +246,17 @@ public class CameraConstrainedHighSpeedCaptureSessionImpl
		return mSessionImpl.setRepeatingBurst(requests, listener, handler);
		}

		@Override
		public int setRepeatingBurstRequests(List<CaptureRequest> requests, Executor executor,
		CaptureCallback listener) throws CameraAccessException {
		if (!isConstrainedHighSpeedRequestList(requests)) {
		throw new IllegalArgumentException(
		"Only request lists created by createHighSpeedRequestList() can be submitted to " +
		"a constrained high speed capture session");
		}
		return mSessionImpl.setRepeatingBurstRequests(requests, executor, listener);
		}

		@Override
		public void stopRepeating() throws CameraAccessException {
		mSessionImpl.stopRepeating();

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -2349,7 +2349,7 @@ public class CameraDeviceImpl extends CameraDevice
		*
		* <p>If the callback isn't null, check the executor, otherwise pass it through.</p>
		*/
		static <T> Executor checkExecutor(Executor executor, T callback) {
		public static <T> Executor checkExecutor(Executor executor, T callback) {
		return (callback != null) ? checkExecutor(executor) : executor;
		}