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

Commit ca0d787f authored by Chien-Yu Chen's avatar Chien-Yu Chen Committed by Android Git Automerger
Browse files

am 3b7bc569: Merge "Camera2: Fix reprocessing API naming and docs" into mnc-dev 

* commit '3b7bc569':
  Camera2: Fix reprocessing API naming and docs
parents 993a0f70 3b7bc569

api/current.txt

+3 −3
Original line number Diff line number Diff line
@@ -13165,7 +13165,7 @@ package android.hardware.camera2 { 
    method public abstract void close();

    method public abstract android.hardware.camera2.CameraDevice getDevice();

    method public abstract android.view.Surface getInputSurface();

    method public abstract boolean isReprocessible();

    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 abstract int setRepeatingRequest(android.hardware.camera2.CaptureRequest, android.hardware.camera2.CameraCaptureSession.CaptureCallback, android.os.Handler) throws android.hardware.camera2.CameraAccessException;
@@ -13286,7 +13286,7 @@ package android.hardware.camera2 { 
    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 android.hardware.camera2.CaptureRequest.Builder createReprocessCaptureRequest(android.hardware.camera2.TotalCaptureResult) throws android.hardware.camera2.CameraAccessException;

    method public abstract void createReprocessibleCaptureSession(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 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 java.lang.String getId();

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

    field public static final int TEMPLATE_PREVIEW = 1; // 0x1
@@ -13465,7 +13465,7 @@ package android.hardware.camera2 { 
    field public static final int REQUEST_AVAILABLE_CAPABILITIES_DEPTH_OUTPUT = 8; // 0x8

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

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

    field public static final int REQUEST_AVAILABLE_CAPABILITIES_OPAQUE_REPROCESSING = 4; // 0x4

    field public static final int REQUEST_AVAILABLE_CAPABILITIES_PRIVATE_REPROCESSING = 4; // 0x4

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

    field public static final int REQUEST_AVAILABLE_CAPABILITIES_READ_SENSOR_SETTINGS = 5; // 0x5

    field public static final int REQUEST_AVAILABLE_CAPABILITIES_YUV_REPROCESSING = 7; // 0x7

api/system-current.txt

+3 −3
Original line number Diff line number Diff line
@@ -13479,7 +13479,7 @@ package android.hardware.camera2 { 
    method public abstract void close();

    method public abstract android.hardware.camera2.CameraDevice getDevice();

    method public abstract android.view.Surface getInputSurface();

    method public abstract boolean isReprocessible();

    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 abstract int setRepeatingRequest(android.hardware.camera2.CaptureRequest, android.hardware.camera2.CameraCaptureSession.CaptureCallback, android.os.Handler) throws android.hardware.camera2.CameraAccessException;
@@ -13600,7 +13600,7 @@ package android.hardware.camera2 { 
    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 android.hardware.camera2.CaptureRequest.Builder createReprocessCaptureRequest(android.hardware.camera2.TotalCaptureResult) throws android.hardware.camera2.CameraAccessException;

    method public abstract void createReprocessibleCaptureSession(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 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 java.lang.String getId();

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

    field public static final int TEMPLATE_PREVIEW = 1; // 0x1
@@ -13779,7 +13779,7 @@ package android.hardware.camera2 { 
    field public static final int REQUEST_AVAILABLE_CAPABILITIES_DEPTH_OUTPUT = 8; // 0x8

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

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

    field public static final int REQUEST_AVAILABLE_CAPABILITIES_OPAQUE_REPROCESSING = 4; // 0x4

    field public static final int REQUEST_AVAILABLE_CAPABILITIES_PRIVATE_REPROCESSING = 4; // 0x4

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

    field public static final int REQUEST_AVAILABLE_CAPABILITIES_READ_SENSOR_SETTINGS = 5; // 0x5

    field public static final int REQUEST_AVAILABLE_CAPABILITIES_YUV_REPROCESSING = 7; // 0x7

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

+18 −18
Original line number Diff line number Diff line
@@ -29,11 +29,11 @@ import java.util.List; 
 * <p>A CameraCaptureSession is created by providing a set of target output surfaces to

 * {@link CameraDevice#createCaptureSession createCaptureSession}, or by providing an

 * {@link android.hardware.camera2.params.InputConfiguration} and a set of target output surfaces to

 * {@link CameraDevice#createReprocessibleCaptureSession createReprocessibleCaptureSession} for a

 * reprocessible capture session. Once created, the session is active until a new session is

 * {@link CameraDevice#createReprocessableCaptureSession createReprocessableCaptureSession} for a

 * reprocessable capture session. Once created, the session is active until a new session is

 * created by the camera device, or the camera device is closed.</p>

 *

 * <p>All capture sessions can be used for capturing images from the camera but only reprocessible

 * <p>All capture sessions can be used for capturing images from the camera but only reprocessable

 * capture sessions can reprocess images captured from the camera in the same session previously.

 * </p>

 *
@@ -41,7 +41,7 @@ import java.util.List; 
 * it requires configuring the camera device's internal pipelines and allocating memory buffers for

 * sending images to the desired targets. Therefore the setup is done asynchronously, and

 * {@link CameraDevice#createCaptureSession createCaptureSession} and

 * {@link CameraDevice#createReprocessibleCaptureSession createReprocessibleCaptureSession} will

 * {@link CameraDevice#createReprocessableCaptureSession createReprocessableCaptureSession} will

 * send the ready-to-use CameraCaptureSession to the provided listener's

 * {@link CameraCaptureSession.StateCallback#onConfigured onConfigured} callback. If configuration

 * cannot be completed, then the
@@ -156,7 +156,7 @@ public abstract class CameraCaptureSession implements AutoCloseable { 
     *

     * <p>All capture sessions can be used for capturing images from the camera but only capture

     * sessions created by

     * {@link CameraDevice#createReprocessibleCaptureSession createReprocessibleCaptureSession}

     * {@link CameraDevice#createReprocessableCaptureSession createReprocessableCaptureSession}

     * can submit reprocess capture requests. Submitting a reprocess request to a regular capture

     * session will result in an {@link IllegalArgumentException}.</p>

     *
@@ -179,9 +179,9 @@ public abstract class CameraCaptureSession implements AutoCloseable { 
     * @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 reprocessible capture session; or a

     *                                  simultaneously in a reprocessable capture session; or a

     *                                  reprocess capture request is submitted in a

     *                                  non-reprocessible capture session; or the reprocess capture

     *                                  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
@@ -192,7 +192,7 @@ public abstract class CameraCaptureSession implements AutoCloseable { 
     * @see #setRepeatingRequest

     * @see #setRepeatingBurst

     * @see #abortCaptures

     * @see CameraDevice#createReprocessibleCaptureSession

     * @see CameraDevice#createReprocessableCaptureSession

     */

    public abstract int capture(CaptureRequest request, CaptureCallback listener, Handler handler)

            throws CameraAccessException;
@@ -214,7 +214,7 @@ public abstract class CameraCaptureSession implements AutoCloseable { 
     *

     * <p>All capture sessions can be used for capturing images from the camera but only capture

     * sessions created by

     * {@link CameraDevice#createReprocessibleCaptureSession createReprocessibleCaptureSession}

     * {@link CameraDevice#createReprocessableCaptureSession createReprocessableCaptureSession}

     * can submit reprocess capture requests. Submitting a reprocess request to a regular

     * capture session will result in an {@link IllegalArgumentException}.</p>

     *
@@ -238,9 +238,9 @@ public abstract class CameraCaptureSession implements AutoCloseable { 
     * @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 reprocessible capture session; or a

     *                                  simultaneously in a reprocessable capture session; or a

     *                                  reprocess capture request is submitted in a

     *                                  non-reprocessible capture session; or one of the reprocess

     *                                  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
@@ -425,7 +425,7 @@ public abstract class CameraCaptureSession implements AutoCloseable { 
     *

     * <p>This method is the fastest way to switch the camera device to a new session with

     * {@link CameraDevice#createCaptureSession} or

     * {@link CameraDevice#createReprocessibleCaptureSession}, at the cost of discarding in-progress

     * {@link CameraDevice#createReprocessableCaptureSession}, at the cost of discarding in-progress

     * work. It must be called before the new session is created. Once all pending requests are

     * either completed or thrown away, the {@link StateCallback#onReady} callback will be called,

     * if the session has not been closed. Otherwise, the {@link StateCallback#onClosed}
@@ -448,7 +448,7 @@ public abstract class CameraCaptureSession implements AutoCloseable { 
     * @see #setRepeatingRequest

     * @see #setRepeatingBurst

     * @see CameraDevice#createCaptureSession

     * @see CameraDevice#createReprocessibleCaptureSession

     * @see CameraDevice#createReprocessableCaptureSession

     */

    public abstract void abortCaptures() throws CameraAccessException;
@@ -459,14 +459,14 @@ public abstract class CameraCaptureSession implements AutoCloseable { 
     * @return {@code true} if the application can submit reprocess capture requests with this

     *         camera capture session. {@code false} otherwise.

     *

     * @see CameraDevice#createReprocessibleCaptureSession

     * @see CameraDevice#createReprocessableCaptureSession

     */

    public abstract boolean isReprocessible();

    public abstract boolean isReprocessable();



    /**

     * Get the input Surface associated with a reprocessible capture session.

     * Get the input Surface associated with a reprocessable capture session.

     *

     * <p>Each reprocessible capture session has an input {@link Surface} where the reprocess

     * <p>Each reprocessable capture session has an input {@link Surface} where the reprocess

     * capture requests get the input images from, rather than the camera device. The application

     * can create a {@link android.media.ImageWriter} with this input {@link Surface} and use it to

     * provide input images for reprocess capture requests.</p>
@@ -474,7 +474,7 @@ public abstract class CameraCaptureSession implements AutoCloseable { 
     * @return The {@link Surface} where reprocessing capture requests get the input images from. If

     *         this is not a reprocess capture session, {@code null} will be returned.

     *

     * @see CameraDevice#createReprocessibleCaptureSession

     * @see CameraDevice#createReprocessableCaptureSession

     * @see android.media.ImageWriter

     * @see android.media.ImageReader

     */

core/java/android/hardware/camera2/CameraCharacteristics.java

+10 −9
Original line number Diff line number Diff line
@@ -1239,7 +1239,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * only the input buffer will be used to produce these output stream buffers, and a

     * new sensor image will not be captured.</p>

     * <p>For example, for Zero Shutter Lag (ZSL) still capture use case, the input

     * stream image format will be OPAQUE, the associated output stream image format

     * stream image format will be PRIVATE, the associated output stream image format

     * should be JPEG.</p>

     * <p><b>Range of valid values:</b><br></p>

     * <p>0 or 1.</p>
@@ -1326,7 +1326,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     *   <li>{@link #REQUEST_AVAILABLE_CAPABILITIES_MANUAL_SENSOR MANUAL_SENSOR}</li>

     *   <li>{@link #REQUEST_AVAILABLE_CAPABILITIES_MANUAL_POST_PROCESSING MANUAL_POST_PROCESSING}</li>

     *   <li>{@link #REQUEST_AVAILABLE_CAPABILITIES_RAW RAW}</li>

     *   <li>{@link #REQUEST_AVAILABLE_CAPABILITIES_OPAQUE_REPROCESSING OPAQUE_REPROCESSING}</li>

     *   <li>{@link #REQUEST_AVAILABLE_CAPABILITIES_PRIVATE_REPROCESSING PRIVATE_REPROCESSING}</li>

     *   <li>{@link #REQUEST_AVAILABLE_CAPABILITIES_READ_SENSOR_SETTINGS READ_SENSOR_SETTINGS}</li>

     *   <li>{@link #REQUEST_AVAILABLE_CAPABILITIES_BURST_CAPTURE BURST_CAPTURE}</li>

     *   <li>{@link #REQUEST_AVAILABLE_CAPABILITIES_YUV_REPROCESSING YUV_REPROCESSING}</li>
@@ -1339,7 +1339,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * @see #REQUEST_AVAILABLE_CAPABILITIES_MANUAL_SENSOR

     * @see #REQUEST_AVAILABLE_CAPABILITIES_MANUAL_POST_PROCESSING

     * @see #REQUEST_AVAILABLE_CAPABILITIES_RAW

     * @see #REQUEST_AVAILABLE_CAPABILITIES_OPAQUE_REPROCESSING

     * @see #REQUEST_AVAILABLE_CAPABILITIES_PRIVATE_REPROCESSING

     * @see #REQUEST_AVAILABLE_CAPABILITIES_READ_SENSOR_SETTINGS

     * @see #REQUEST_AVAILABLE_CAPABILITIES_BURST_CAPTURE

     * @see #REQUEST_AVAILABLE_CAPABILITIES_YUV_REPROCESSING
@@ -1536,12 +1536,12 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * <tr>

     * <td align="left">{@link android.graphics.ImageFormat#PRIVATE }</td>

     * <td align="left">{@link android.graphics.ImageFormat#JPEG }</td>

     * <td align="left">OPAQUE_REPROCESSING</td>

     * <td align="left">PRIVATE_REPROCESSING</td>

     * </tr>

     * <tr>

     * <td align="left">{@link android.graphics.ImageFormat#PRIVATE }</td>

     * <td align="left">{@link android.graphics.ImageFormat#YUV_420_888 }</td>

     * <td align="left">OPAQUE_REPROCESSING</td>

     * <td align="left">PRIVATE_REPROCESSING</td>

     * </tr>

     * <tr>

     * <td align="left">{@link android.graphics.ImageFormat#YUV_420_888 }</td>
@@ -1556,8 +1556,9 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * </tbody>

     * </table>

     * <p>PRIVATE refers to a device-internal format that is not directly application-visible.  A

     * PRIVATE input surface can be acquired by {@link android.media.ImageReader#newOpaqueInstance }.</p>

     * <p>For a OPAQUE_REPROCESSING-capable camera device, using the PRIVATE format as either input

     * PRIVATE input surface can be acquired by {@link android.media.ImageReader#newInstance }

     * with {@link android.graphics.ImageFormat#PRIVATE } as the format.</p>

     * <p>For a PRIVATE_REPROCESSING-capable camera device, using the PRIVATE format as either input

     * or output will never hurt maximum frame rate (i.e.  {@link android.hardware.camera2.params.StreamConfigurationMap#getOutputStallDuration getOutputStallDuration(ImageFormat.PRIVATE, size)} is always 0),</p>

     * <p>Attempting to configure an input stream with output streams not

     * listed as available in this map is not valid.</p>
@@ -2647,8 +2648,8 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * formats/sizes combination.</p>

     * <p>If this key reports 0, it means a reprocess request doesn't introduce any glitch to the

     * ongoing camera repeating request outputs, as if this reprocess request is never issued.</p>

     * <p>This key is supported if the camera device supports OPAQUE or YUV reprocessing (

     * i.e. {@link CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES android.request.availableCapabilities} contains OPAQUE_REPROCESSING or

     * <p>This key is supported if the camera device supports PRIVATE or YUV reprocessing (

     * i.e. {@link CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES android.request.availableCapabilities} contains PRIVATE_REPROCESSING or

     * YUV_REPROCESSING).</p>

     * <p><b>Units</b>: Number of frames.</p>

     * <p><b>Range of valid values:</b><br>

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

+27 −28

File changed.

Preview size limit exceeded, changes collapsed.