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

Commit 07b2dbc2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Camera: Remove individual streaming request limitation"

parents 4963ce8e f60f4fb0
Loading
Loading
Loading
Loading
+2 −6
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
     */
    @SuppressWarnings({"unchecked"})
    public List<CaptureRequest.Key<?>> getAvailablePhysicalCameraRequestKeys() {
        if (mAvailableSessionKeys == null) {
        if (mAvailablePhysicalRequestKeys == null) {
            Object crKey = CaptureRequest.Key.class;
            Class<CaptureRequest.Key<?>> crKeyTyped = (Class<CaptureRequest.Key<?>>)crKey;

@@ -1790,11 +1790,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
     * The respective value of such request key can be obtained by calling
     * {@link CaptureRequest.Builder#getPhysicalCameraKey }. Capture requests that contain
     * individual physical device requests must be built via
     * {@link android.hardware.camera2.CameraDevice#createCaptureRequest(int, Set)}.
     * Such extended capture requests can be passed only to
     * {@link CameraCaptureSession#capture } or {@link CameraCaptureSession#captureBurst } and
     * not to {@link CameraCaptureSession#setRepeatingRequest } or
     * {@link CameraCaptureSession#setRepeatingBurst }.</p>
     * {@link android.hardware.camera2.CameraDevice#createCaptureRequest(int, Set)}.</p>
     * <p><b>Optional</b> - This value may be {@code null} on some devices.</p>
     * <p><b>Limited capability</b> -
     * Present on all camera devices that report being at least {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED HARDWARE_LEVEL_LIMITED} devices in the
+4 −7
Original line number Diff line number Diff line
@@ -863,11 +863,8 @@ public abstract class CameraDevice implements AutoCloseable {
     * request for a specific physical camera. The settings are chosen
     * to be the best options for the specific logical camera device. If
     * additional physical camera ids are passed, then they will also use the
     * same settings template. Requests containing individual physical camera
     * settings can be passed only to {@link CameraCaptureSession#capture} or
     * {@link CameraCaptureSession#captureBurst} and not to
     * {@link CameraCaptureSession#setRepeatingRequest} or
     * {@link CameraCaptureSession#setRepeatingBurst}</p>
     * same settings template. Clients can further modify individual camera
     * 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
@@ -896,8 +893,8 @@ public abstract class CameraDevice implements AutoCloseable {
     * @see #TEMPLATE_STILL_CAPTURE
     * @see #TEMPLATE_VIDEO_SNAPSHOT
     * @see #TEMPLATE_MANUAL
     * @see CaptureRequest.Builder#setKey
     * @see CaptureRequest.Builder#getKey
     * @see CaptureRequest.Builder#setPhysicalCameraKey
     * @see CaptureRequest.Builder#getPhysicalCameraKey
     */
    @NonNull
    public CaptureRequest.Builder createCaptureRequest(@RequestTemplate int templateType,