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

Commit 366a003e authored by Shuzhen Wang's avatar Shuzhen Wang Committed by Android (Google) Code Review
Browse files

Merge "Camera: cosmetic, fix typos" into udc-dev

parents c327762d 6ffa2ec6

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

+3 −3
Original line number Diff line number Diff line
@@ -661,7 +661,7 @@ public abstract class CameraCaptureSession implements AutoCloseable { 
     *

     * <p>Repeating burst requests are a simple way for an application to

     * maintain a preview or other continuous stream of frames where each

     * request is different in a predicatable way, without having to continually

     * request is different in a predictable way, without having to continually

     * submit requests through {@link #captureBurst}.</p>

     *

     * <p>To stop the repeating capture, call {@link #stopRepeating}. Any
@@ -902,7 +902,7 @@ public abstract class CameraCaptureSession implements AutoCloseable { 
     * {@link CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_OFFLINE_PROCESSING OFFLINE_PROCESSING}

     * capability in {@link CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES}. When this method

     * is supported, applications can use it to improve the latency of closing camera or recreating

     * capture session without losing the in progresss capture request outputs.</p>

     * capture session without losing the in progress capture request outputs.</p>

     *

     * <p>Offline processing mode and the corresponding {@link CameraOfflineSession} differ from

     * a regular online camera capture session in several ways. Successful offline switches will
@@ -1001,7 +1001,7 @@ public abstract class CameraCaptureSession implements AutoCloseable { 
     *

     * <p>Note that for common usage scenarios like creating a new session or closing the camera

     * device, it is faster to call respective APIs directly (see below for more details) without

     * calling into this method. This API is only useful when application wants to uncofigure the

     * calling into this method. This API is only useful when application wants to unconfigure the

     * camera but keep the device open for later use.</p>

     *

     * <p>Creating a new capture session with {@link CameraDevice#createCaptureSession}

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

+1 −1
Original line number Diff line number Diff line
@@ -651,7 +651,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * @param metadataClass The subclass of CameraMetadata that you want to get the keys for.

     * @param keyClass The class of the metadata key, e.g. CaptureRequest.Key.class

     * @param filterTags An array of tags to be used for filtering

     * @param includeSynthetic Include public syntethic tag by default.

     * @param includeSynthetic Include public synthetic tag by default.

     *

     * @return List of keys supported by this CameraDevice for metadataClass.

     *

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

+5 −5
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ public abstract class CameraDevice implements AutoCloseable { 
     * parameters. All automatic control is disabled (auto-exposure, auto-white

     * balance, auto-focus), and post-processing parameters are set to preview

     * quality. The manual capture parameters (exposure, sensitivity, and so on)

     * are set to reasonable defaults, but should be overriden by the

     * are set to reasonable defaults, but should be overridden by the

     * application depending on the intended use case.

     * This template is guaranteed to be supported on camera devices that support the

     * {@link CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_MANUAL_SENSOR MANUAL_SENSOR}
@@ -680,7 +680,7 @@ public abstract class CameraDevice implements AutoCloseable { 
     * <tr><th>Type</th><th id="rb">Max size</th><th>Type</th><th id="rb">Max size</th><th>Type</th><th id="rb">Max size</th> </tr>

     * <tr> <td>{@code PRIV}</td><td id="rb">{@code PREVIEW}</td> <td>{@code PRIV}</td><td id="rb">{@code MAXIMUM}</td> <td colspan="2" id="rb"></td> <td>Maximum-resolution GPU processing with preview.</td> </tr>

     * <tr> <td>{@code PRIV}</td><td id="rb">{@code PREVIEW}</td> <td>{@code YUV }</td><td id="rb">{@code MAXIMUM}</td> <td colspan="2" id="rb"></td> <td>Maximum-resolution in-app processing with preview.</td> </tr>

     * <tr> <td>{@code YUV }</td><td id="rb">{@code PREVIEW}</td> <td>{@code YUV }</td><td id="rb">{@code MAXIMUM}</td> <td colspan="2" id="rb"></td> <td>Maximum-resolution two-input in-app processsing.</td> </tr>

     * <tr> <td>{@code YUV }</td><td id="rb">{@code PREVIEW}</td> <td>{@code YUV }</td><td id="rb">{@code MAXIMUM}</td> <td colspan="2" id="rb"></td> <td>Maximum-resolution two-input in-app processing.</td> </tr>

     * <tr> <td>{@code PRIV}</td><td id="rb">{@code PREVIEW}</td> <td>{@code PRIV}</td><td id="rb">{@code PREVIEW}</td> <td>{@code JPEG}</td><td id="rb">{@code MAXIMUM}</td> <td>Video recording with maximum-size video snapshot</td> </tr>

     * <tr> <td>{@code YUV }</td><td id="rb">{@code 640x480}</td> <td>{@code PRIV}</td><td id="rb">{@code PREVIEW}</td> <td>{@code YUV }</td><td id="rb">{@code MAXIMUM}</td> <td>Standard video recording plus maximum-resolution in-app processing.</td> </tr>

     * <tr> <td>{@code YUV }</td><td id="rb">{@code 640x480}</td> <td>{@code YUV }</td><td id="rb">{@code PREVIEW}</td> <td>{@code YUV }</td><td id="rb">{@code MAXIMUM}</td> <td>Preview plus two-input maximum-resolution in-app processing.</td> </tr>
@@ -722,7 +722,7 @@ public abstract class CameraDevice implements AutoCloseable { 
     * <tr><th>Type</th><th id="rb">Max size</th><th>Type</th><th id="rb">Max size</th> </tr>

     * <tr> <td>{@code PRIV}</td><td id="rb">{@code PREVIEW}</td> <td>{@code PRIV}</td><td id="rb">{@code MAXIMUM}</td> <td>Maximum-resolution GPU processing with preview.</td> </tr>

     * <tr> <td>{@code PRIV}</td><td id="rb">{@code PREVIEW}</td> <td>{@code YUV }</td><td id="rb">{@code MAXIMUM}</td> <td>Maximum-resolution in-app processing with preview.</td> </tr>

     * <tr> <td>{@code YUV }</td><td id="rb">{@code PREVIEW}</td> <td>{@code YUV }</td><td id="rb">{@code MAXIMUM}</td> <td>Maximum-resolution two-input in-app processsing.</td> </tr>

     * <tr> <td>{@code YUV }</td><td id="rb">{@code PREVIEW}</td> <td>{@code YUV }</td><td id="rb">{@code MAXIMUM}</td> <td>Maximum-resolution two-input in-app processing.</td> </tr>

     * </table><br>

     * </p>

     *
@@ -1137,7 +1137,7 @@ public abstract class CameraDevice implements AutoCloseable { 
     * <tr><th colspan="13">Additional guaranteed combinations for ULTRA_HIGH_RESOLUTION sensors (YUV / PRIV inputs are guaranteed only if YUV / PRIVATE reprocessing are supported)</th></tr>

     * <tr> <th colspan="3" id="rb">Input</th> <th colspan="3" id="rb">Target 1</th> <th colspan="3" id="rb">Target 2</th>  <th colspan="3" id="rb">Target 3</th> <th rowspan="2">Sample use case(s)</th> </tr>

     * <tr> <th>Type</th><th id="rb"> SC Map</th><th id="rb">Max size</th><th>Type</th><th id="rb"> SC Map</th><th id="rb">Max size</th> <th>Type</th><th id="rb"> SC Map</th><th id="rb">Max size</th> <th>Type</th><th id="rb"> SC Map</th><th id="rb">Max size</th></tr>

     * <tr> <td>{@code RAW}</td><td id="rb">{@code MAX_RES}</td><td id="rb">{@code MAX}</td><td>{@code RAW}</td><td id="rb">{@code MAX_RES}</td><td id="rb">{@code MAX}</td><td id="rb">{@code PRIV / YUV}</td><td id="rb">{@code DEFAULT}</td><td id="rb">{@code PREVIEW}</td><td colspan="3" id="rb"></td> <td>RAW remosaic reprocessing with seperate preview</td> </tr>

     * <tr> <td>{@code RAW}</td><td id="rb">{@code MAX_RES}</td><td id="rb">{@code MAX}</td><td>{@code RAW}</td><td id="rb">{@code MAX_RES}</td><td id="rb">{@code MAX}</td><td id="rb">{@code PRIV / YUV}</td><td id="rb">{@code DEFAULT}</td><td id="rb">{@code PREVIEW}</td><td colspan="3" id="rb"></td> <td>RAW remosaic reprocessing with separate preview</td> </tr>

     * <tr> <td>{@code RAW}</td><td id="rb">{@code MAX_RES}</td><td id="rb">{@code MAX}</td><td>{@code RAW}</td><td id="rb">{@code MAX_RES}</td><td id="rb">{@code MAX}</td><td id="rb">{@code PRIV / YUV}</td><td id="rb">{@code DEFAULT}</td><td id="rb">{@code PREVIEW}</td><td id="rb">{@code JPEG / YUV}</td><td id="rb">{@code MAX_RES}</td><td id="rb">{@code MAX}</td> <td>Ultra high res RAW -> JPEG / YUV with seperate preview</td> </tr>

     * <tr> <td>{@code YUV / PRIV}</td><td id="rb">{@code MAX_RES}</td><td id="rb">{@code MAX}</td> <td>{@code YUV / PRIV}</td><td id="rb">{@code MAX_RES}</td><td id="rb">{@code MAX}</td><td id="rb">{@code YUV / PRIV}</td><td id="rb">{@code DEFAULT}</td><td id="rb">{@code PREVIEW}</td><td id="rb">{@code JPEG }</td><td id="rb">{@code MAX_RES}</td><td id="rb">{@code MAX}</td> <td> Ultra high res PRIV / YUV -> YUV / JPEG reprocessing with seperate preview</td> </tr>

     * </table><br>
@@ -1260,7 +1260,7 @@ public abstract class CameraDevice implements AutoCloseable { 
     * settings by calling {@link CaptureRequest.Builder#setPhysicalCameraKey}.</p>

     *

     * <p>Individual physical camera settings will only be honored for camera session

     * that was initialiazed with corresponding physical camera id output configuration

     * that was initialized with corresponding physical camera id output configuration

     * {@link OutputConfiguration#setPhysicalCameraId} and the same output targets are

     * also attached in the request by {@link CaptureRequest.Builder#addTarget}.</p>

     *

core/java/android/hardware/camera2/CameraManager.java

+5 −5
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ public final class CameraManager { 


    /**

     * Similar to getCameraIdList(). However, getCamerIdListNoLazy() necessarily communicates with

     * cameraserver in order to get the list of camera ids. This is to faciliate testing since some

     * cameraserver in order to get the list of camera ids. This is to facilitate testing since some

     * camera ids may go 'offline' without callbacks from cameraserver because of changes in

     * SYSTEM_CAMERA permissions (though this is not a changeable permission, tests may call

     * adopt(drop)ShellPermissionIdentity() and effectively change their permissions). This call
@@ -560,7 +560,7 @@ public final class CameraManager { 
        }



        // Query the characteristics of all physical sub-cameras, and combine the multi-resolution

        // stream configurations. Alternatively, for ultra-high resolution camera, direclty use

        // stream configurations. Alternatively, for ultra-high resolution camera, directly use

        // its multi-resolution stream configurations. Note that framework derived formats such as

        // HEIC and DEPTH_JPEG aren't supported as multi-resolution input or output formats.

        Set<String> physicalCameraIds = info.getPhysicalCameraIds();
@@ -835,7 +835,7 @@ public final class CameraManager { 
     * Opening the same camera ID twice in the same application will similarly cause the

     * {@link android.hardware.camera2.CameraDevice.StateCallback#onDisconnected} callback

     * being fired for the {@link CameraDevice} from the first open call and all ongoing tasks

     * being droppped.</p>

     * being dropped.</p>

     *

     * <p>Once the camera is successfully opened, {@link CameraDevice.StateCallback#onOpened} will

     * be invoked with the newly opened {@link CameraDevice}. The camera device can then be set up
@@ -1759,7 +1759,7 @@ public final class CameraManager { 
        private final Set<Set<String>> mConcurrentCameraIdCombinations =

                new ArraySet<Set<String>>();



        // Registered availablility callbacks and their executors

        // Registered availability callbacks and their executors

        private final ArrayMap<AvailabilityCallback, Executor> mCallbackMap =

            new ArrayMap<AvailabilityCallback, Executor>();
@@ -2846,7 +2846,7 @@ public final class CameraManager { 
                // Tell listeners that the cameras and torch modes are unavailable and schedule a

                // reconnection to camera service. When camera service is reconnected, the camera

                // and torch statuses will be updated.

                // Iterate from the end to the beginning befcause onStatusChangedLocked removes

                // Iterate from the end to the beginning because onStatusChangedLocked removes

                // entries from the ArrayMap.

                for (int i = mDeviceStatus.size() - 1; i >= 0; i--) {

                    String cameraId = mDeviceStatus.keyAt(i);

core/java/android/hardware/camera2/CameraMetadata.java

+2 −2
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ public abstract class CameraMetadata<TKey> { 
     * Optionally, if {@code filterTags} is not {@code null}, then filter out any keys

     * whose native {@code tag} is not in {@code filterTags}. The {@code filterTags} array will be

     * sorted as a side effect.

     * {@code includeSynthetic} Includes public syntenthic fields by default.

     * {@code includeSynthetic} Includes public synthetic fields by default.

     * </p>

     */

     /*package*/ @SuppressWarnings("unchecked")
@@ -2308,7 +2308,7 @@ public abstract class CameraMetadata<TKey> { 
    /**

     * <p>An external flash has been turned on.</p>

     * <p>It informs the camera device that an external flash has been turned on, and that

     * metering (and continuous focus if active) should be quickly recaculated to account

     * metering (and continuous focus if active) should be quickly recalculated to account

     * for the external flash. Otherwise, this mode acts like ON.</p>

     * <p>When the external flash is turned off, AE mode should be changed to one of the

     * other available AE modes.</p>