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

Commit 445b3167 authored by Zhijun He's avatar Zhijun He
Browse files

Camera2: add surface set ID 

Add surface set ID to OutputConfiguration class,and make this class public.

Bug: 25088440
Change-Id: Ib5fd74aa2c7bc06aed70771765767d6fcfefa98f
parent db338405

api/current.txt

+13 −0
Original line number Diff line number Diff line
@@ -13651,9 +13651,11 @@ package android.hardware.camera2 { 
    method public abstract void close();

    method public abstract android.hardware.camera2.CaptureRequest.Builder createCaptureRequest(int) throws android.hardware.camera2.CameraAccessException;

    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 createCaptureSessionByOutputConfiguration(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 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 createReprocessableCaptureSessionWithConfigurations(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 TEMPLATE_MANUAL = 6; // 0x6

    field public static final int TEMPLATE_PREVIEW = 1; // 0x1
@@ -14150,6 +14152,17 @@ package android.hardware.camera2.params { 
    field public static final int METERING_WEIGHT_MIN = 0; // 0x0

  }













  public final class OutputConfiguration implements android.os.Parcelable {













    ctor public OutputConfiguration(android.view.Surface);













    method public int describeContents();













    method public android.view.Surface getSurface();













    method public int getSurfaceSetId();













    method public void setSurfaceSetId(int);













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.hardware.camera2.params.OutputConfiguration> CREATOR;













    field public static final int SURFACE_SET_ID_INVALID = -1; // 0xffffffff













  }



























  public final class RggbChannelVector {















    ctor public RggbChannelVector(float, float, float, float);















    method public void copyTo(float[], int);

























api/system-current.txt



+20
−0






























Original line number
Diff line number
Diff line








@@ -14048,9 +14048,11 @@ package android.hardware.camera2 {













    method public abstract void close();















    method public abstract android.hardware.camera2.CaptureRequest.Builder createCaptureRequest(int) throws android.hardware.camera2.CameraAccessException;















    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 createCaptureSessionByOutputConfiguration(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 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 createReprocessableCaptureSessionWithConfigurations(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 TEMPLATE_MANUAL = 6; // 0x6















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










@@ -14547,6 +14549,24 @@ package android.hardware.camera2.params {













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















  }



























  public final class OutputConfiguration implements android.os.Parcelable {













    ctor public OutputConfiguration(android.view.Surface);













    ctor public OutputConfiguration(android.view.Surface, int);













    ctor public OutputConfiguration(android.hardware.camera2.params.OutputConfiguration);













    method public int describeContents();













    method public int getRotation();













    method public android.view.Surface getSurface();













    method public int getSurfaceSetId();













    method public void setSurfaceSetId(int);













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.hardware.camera2.params.OutputConfiguration> CREATOR;













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













    field public static final int ROTATION_180 = 2; // 0x2













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













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













    field public static final int SURFACE_SET_ID_INVALID = -1; // 0xffffffff













  }



























  public final class RggbChannelVector {















    ctor public RggbChannelVector(float, float, float, float);















    method public void copyTo(float[], int);

























api/test-current.txt



+13
−0






























Original line number
Diff line number
Diff line








@@ -13659,9 +13659,11 @@ package android.hardware.camera2 {













    method public abstract void close();















    method public abstract android.hardware.camera2.CaptureRequest.Builder createCaptureRequest(int) throws android.hardware.camera2.CameraAccessException;















    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 createCaptureSessionByOutputConfiguration(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 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 createReprocessableCaptureSessionWithConfigurations(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 TEMPLATE_MANUAL = 6; // 0x6















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










@@ -14158,6 +14160,17 @@ package android.hardware.camera2.params {













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















  }



























  public final class OutputConfiguration implements android.os.Parcelable {













    ctor public OutputConfiguration(android.view.Surface);













    method public int describeContents();













    method public android.view.Surface getSurface();













    method public int getSurfaceSetId();













    method public void setSurfaceSetId(int);













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.hardware.camera2.params.OutputConfiguration> CREATOR;













    field public static final int SURFACE_SET_ID_INVALID = -1; // 0xffffffff













  }



























  public final class RggbChannelVector {















    ctor public RggbChannelVector(float, float, float, float);















    method public void copyTo(float[], int);

























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



+16
−2






























Original line number
Diff line number
Diff line








@@ -421,8 +421,6 @@ public abstract class CameraDevice implements AutoCloseable {













     *















     * @see #createCaptureSession















     * @see OutputConfiguration













     *













     * @hide















     */















    public abstract void createCaptureSessionByOutputConfiguration(















            List<OutputConfiguration> outputConfigurations,










@@ -586,6 +584,22 @@ public abstract class CameraDevice implements AutoCloseable {













            @Nullable Handler handler)















            throws CameraAccessException;





























    /**













     * Create a new reprocessable camera capture session by providing the desired reprocessing













     * input configuration and output {@link OutputConfiguration}













     * to the camera device.













     *













     * @see #createReprocessableCaptureSession













     * @see OutputConfiguration













     *













     */













    public abstract void createReprocessableCaptureSessionWithConfigurations(













            @NonNull InputConfiguration inputConfig,













            @NonNull List<OutputConfiguration> outputs,













            @NonNull CameraCaptureSession.StateCallback callback,













            @Nullable Handler handler)













            throws CameraAccessException;





























    /**















     * <p>Create a new constrained high speed capture session.</p>















     *

































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



+35
−1






























Original line number
Diff line number
Diff line








@@ -485,7 +485,13 @@ public class CameraDeviceImpl extends CameraDevice {













            Log.d(TAG, "createCaptureSessionByOutputConfiguration");















        }





























        createCaptureSessionInternal(null, outputConfigurations, callback, handler,













        // OutputConfiguration objects aren't immutable, make a copy before using.













        List<OutputConfiguration> currentOutputs = new ArrayList<OutputConfiguration>();













        for (OutputConfiguration output : outputConfigurations) {













            currentOutputs.add(new OutputConfiguration(output));













        }



























        createCaptureSessionInternal(null, currentOutputs, callback, handler,















                /*isConstrainedHighSpeed*/false);















    }

























@@ -509,6 +515,34 @@ public class CameraDeviceImpl extends CameraDevice {













                /*isConstrainedHighSpeed*/false);















    }





























    @Override













    public void createReprocessableCaptureSessionWithConfigurations(InputConfiguration inputConfig,













            List<OutputConfiguration> outputs,













            android.hardware.camera2.CameraCaptureSession.StateCallback callback, Handler handler)













                    throws CameraAccessException {













        if (DEBUG) {













            Log.d(TAG, "createReprocessableCaptureSessionWithConfigurations");













        }



























        if (inputConfig == null) {













            throw new IllegalArgumentException("inputConfig cannot be null when creating a " +













                    "reprocessable capture session");













        }



























        if (outputs == null) {













            throw new IllegalArgumentException("Output configurations cannot be null when " +













                    "creating a reprocessable capture session");













        }



























        // OutputConfiguration objects aren't immutable, make a copy before using.













        List<OutputConfiguration> currentOutputs = new ArrayList<OutputConfiguration>();













        for (OutputConfiguration output : outputs) {













            currentOutputs.add(new OutputConfiguration(output));













        }













        createCaptureSessionInternal(inputConfig, currentOutputs,













                callback, handler, /*isConstrainedHighSpeed*/false);













    }





























    @Override















    public void createConstrainedHighSpeedCaptureSession(List<Surface> outputs,















            android.hardware.camera2.CameraCaptureSession.StateCallback callback, Handler handler)