Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49c62f51 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala
Browse files

Camera: Add createCustomCameraSession to system API. 

This has been requested by various Android implementers as
a way to simplify building new device-specific features for
default camera applications.

Test: The added system API tests pass.
Bug: 34853980
Change-Id: I3190f59394af97c0b0c8e520696d096235d596b9
parent 0e04e910

api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -15590,10 +15590,14 @@ package android.hardware.camera2 { 
    method public abstract void createCaptureSession(java.util.List<android.view.Surface>, android.hardware.camera2.CameraCaptureSession.StateCallback, android.os.Handler) throws android.hardware.camera2.CameraAccessException;

    method public abstract void createCaptureSessionByOutputConfigurations(java.util.List<android.hardware.camera2.params.OutputConfiguration>, android.hardware.camera2.CameraCaptureSession.StateCallback, android.os.Handler) throws android.hardware.camera2.CameraAccessException;

    method public abstract void createConstrainedHighSpeedCaptureSession(java.util.List<android.view.Surface>, android.hardware.camera2.CameraCaptureSession.StateCallback, android.os.Handler) throws android.hardware.camera2.CameraAccessException;

    method public abstract void createCustomCaptureSession(android.hardware.camera2.params.InputConfiguration, java.util.List<android.hardware.camera2.params.OutputConfiguration>, int, android.hardware.camera2.CameraCaptureSession.StateCallback, android.os.Handler) throws android.hardware.camera2.CameraAccessException;

    method public abstract android.hardware.camera2.CaptureRequest.Builder createReprocessCaptureRequest(android.hardware.camera2.TotalCaptureResult) throws android.hardware.camera2.CameraAccessException;

    method public abstract void createReprocessableCaptureSession(android.hardware.camera2.params.InputConfiguration, java.util.List<android.view.Surface>, android.hardware.camera2.CameraCaptureSession.StateCallback, android.os.Handler) throws android.hardware.camera2.CameraAccessException;

    method public abstract void createReprocessableCaptureSessionByConfigurations(android.hardware.camera2.params.InputConfiguration, java.util.List<android.hardware.camera2.params.OutputConfiguration>, android.hardware.camera2.CameraCaptureSession.StateCallback, android.os.Handler) throws android.hardware.camera2.CameraAccessException;

    method public abstract java.lang.String getId();

    field public static final int SESSION_OPERATION_MODE_CONSTRAINED_HIGH_SPEED = 1; // 0x1

    field public static final int SESSION_OPERATION_MODE_NORMAL = 0; // 0x0

    field public static final int SESSION_OPERATION_MODE_VENDOR_START = 32768; // 0x8000

    field public static final int TEMPLATE_MANUAL = 6; // 0x6

    field public static final int TEMPLATE_PREVIEW = 1; // 0x1

    field public static final int TEMPLATE_RECORD = 3; // 0x3

api/test-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -14904,10 +14904,14 @@ package android.hardware.camera2 { 
    method public abstract void createCaptureSession(java.util.List<android.view.Surface>, android.hardware.camera2.CameraCaptureSession.StateCallback, android.os.Handler) throws android.hardware.camera2.CameraAccessException;

    method public abstract void createCaptureSessionByOutputConfigurations(java.util.List<android.hardware.camera2.params.OutputConfiguration>, android.hardware.camera2.CameraCaptureSession.StateCallback, android.os.Handler) throws android.hardware.camera2.CameraAccessException;

    method public abstract void createConstrainedHighSpeedCaptureSession(java.util.List<android.view.Surface>, android.hardware.camera2.CameraCaptureSession.StateCallback, android.os.Handler) throws android.hardware.camera2.CameraAccessException;

    method public abstract void createCustomCaptureSession(android.hardware.camera2.params.InputConfiguration, java.util.List<android.hardware.camera2.params.OutputConfiguration>, int, android.hardware.camera2.CameraCaptureSession.StateCallback, android.os.Handler) throws android.hardware.camera2.CameraAccessException;

    method public abstract android.hardware.camera2.CaptureRequest.Builder createReprocessCaptureRequest(android.hardware.camera2.TotalCaptureResult) throws android.hardware.camera2.CameraAccessException;

    method public abstract void createReprocessableCaptureSession(android.hardware.camera2.params.InputConfiguration, java.util.List<android.view.Surface>, android.hardware.camera2.CameraCaptureSession.StateCallback, android.os.Handler) throws android.hardware.camera2.CameraAccessException;

    method public abstract void createReprocessableCaptureSessionByConfigurations(android.hardware.camera2.params.InputConfiguration, java.util.List<android.hardware.camera2.params.OutputConfiguration>, android.hardware.camera2.CameraCaptureSession.StateCallback, android.os.Handler) throws android.hardware.camera2.CameraAccessException;

    method public abstract java.lang.String getId();

    field public static final int SESSION_OPERATION_MODE_CONSTRAINED_HIGH_SPEED = 1; // 0x1

    field public static final int SESSION_OPERATION_MODE_NORMAL = 0; // 0x0

    field public static final int SESSION_OPERATION_MODE_VENDOR_START = 32768; // 0x8000

    field public static final int TEMPLATE_MANUAL = 6; // 0x6

    field public static final int TEMPLATE_PREVIEW = 1; // 0x1

    field public static final int TEMPLATE_RECORD = 3; // 0x3

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

+50 −2
Original line number Diff line number Diff line
@@ -19,6 +19,10 @@ package android.hardware.camera2; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.IntDef;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import static android.hardware.camera2.ICameraDeviceUser.NORMAL_MODE;

import static android.hardware.camera2.ICameraDeviceUser.CONSTRAINED_HIGH_SPEED_MODE;

import android.hardware.camera2.params.InputConfiguration;

import android.hardware.camera2.params.StreamConfigurationMap;

import android.hardware.camera2.params.OutputConfiguration;
@@ -718,6 +722,47 @@ public abstract class CameraDevice implements AutoCloseable { 
            @Nullable Handler handler)

            throws CameraAccessException;



    /**

     * Standard camera operation mode.

     *

     * @see #createCustomCaptureSession

     * @hide

     */

    @SystemApi

    @TestApi

    public static final int SESSION_OPERATION_MODE_NORMAL =

            ICameraDeviceUser.NORMAL_MODE;



    /**

     * Constrained high-speed operation mode.

     *

     * @see #createCustomCaptureSession

     * @hide

     */

    @SystemApi

    @TestApi

    public static final int SESSION_OPERATION_MODE_CONSTRAINED_HIGH_SPEED =

            ICameraDeviceUser.CONSTRAINED_HIGH_SPEED_MODE;



    /**

     * First vendor-specific operating mode

     *

     * @see #createCustomCaptureSession

     * @hide

     */

    @SystemApi

    @TestApi

    public static final int SESSION_OPERATION_MODE_VENDOR_START =

            ICameraDeviceUser.VENDOR_MODE_START;



    /** @hide */

    @Retention(RetentionPolicy.SOURCE)

    @IntDef(

            {SESSION_OPERATION_MODE_NORMAL,

             SESSION_OPERATION_MODE_CONSTRAINED_HIGH_SPEED,

             SESSION_OPERATION_MODE_VENDOR_START})

    public @interface SessionOperatingMode {};



    /**

     * Create a new camera capture session with a custom operating mode.

     *
@@ -725,7 +770,8 @@ public abstract class CameraDevice implements AutoCloseable { 
     *                is desired, or {@code null} otherwise.

     * @param outputs The new set of {@link OutputConfiguration OutputConfigurations} that should be

     *                made available as targets for captured image data.

     * @param operatingMode The custom operating mode to use; a nonnegative value.

     * @param operatingMode The custom operating mode to use; a nonnegative value, either a custom

     *                vendor value or one of the SESSION_OPERATION_MODE_* values.

     * @param callback The callback to notify about the status of the new capture session.

     * @param handler The handler on which the callback should be invoked, or {@code null} to use

     *                the current thread's {@link android.os.Looper looper}.
@@ -744,10 +790,12 @@ public abstract class CameraDevice implements AutoCloseable { 
     * @see OutputConfiguration

     * @hide

     */

    @SystemApi

    @TestApi

    public abstract void createCustomCaptureSession(

            InputConfiguration inputConfig,

            @NonNull List<OutputConfiguration> outputs,

            int operatingMode,

            @SessionOperatingMode int operatingMode,

            @NonNull CameraCaptureSession.StateCallback callback,

            @Nullable Handler handler)

            throws CameraAccessException;