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

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

Merge "Camera: Add a 3-stream combination for feature combination query" into main

parents f746c4dd 8a379a9d

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

+21 −3
Original line number Diff line number Diff line
@@ -5256,9 +5256,6 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * <p>DYNAMIC_RANGE_PROFILE: {STANDARD, HLG10}</p>

     * </li>

     * </ul>

     * <p>All of the above configurations can be set up with a SessionConfiguration. The list of

     * OutputConfiguration contains the stream configurations and DYNAMIC_RANGE_PROFILE, and

     * the AE_TARGET_FPS_RANGE and VIDEO_STABILIZATION_MODE are set as session parameters.</p>

     * <p>When set to BAKLAVA, the additional stream combinations below are verified

     * by the compliance tests:</p>

     * <table>
@@ -5268,6 +5265,8 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * <th style="text-align: center;">Size</th>

     * <th style="text-align: center;">Target 2</th>

     * <th style="text-align: center;">Size</th>

     * <th style="text-align: center;">Target 3</th>

     * <th style="text-align: center;">Size</th>

     * </tr>

     * </thead>

     * <tbody>
@@ -5276,15 +5275,34 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * <td style="text-align: center;">S1080P</td>

     * <td style="text-align: center;">PRIV</td>

     * <td style="text-align: center;">S1080P</td>

     * <td style="text-align: center;"></td>

     * <td style="text-align: center;"></td>

     * </tr>

     * <tr>

     * <td style="text-align: center;">PRIV</td>

     * <td style="text-align: center;">S1080P</td>

     * <td style="text-align: center;">PRIV</td>

     * <td style="text-align: center;">S1440P</td>

     * <td style="text-align: center;"></td>

     * <td style="text-align: center;"></td>

     * </tr>

     * <tr>

     * <td style="text-align: center;">PRIV</td>

     * <td style="text-align: center;">S1080P</td>

     * <td style="text-align: center;">YUV</td>

     * <td style="text-align: center;">S1080P</td>

     * <td style="text-align: center;">S1080P</td>

     * <td style="text-align: center;">PRIV</td>

     * </tr>

     * </tbody>

     * </table>

     * <ul>

     * <li>VIDEO_STABILIZATION_MODE: {OFF, ON} for the newly added stream combinations given the

     * presence of dedicated video stream</li>

     * </ul>

     * <p>All of the above configurations can be set up with a SessionConfiguration. The list of

     * OutputConfiguration contains the stream configurations and DYNAMIC_RANGE_PROFILE, and

     * the AE_TARGET_FPS_RANGE and VIDEO_STABILIZATION_MODE are set as session parameters.</p>

     * <p>This key is available on all devices.</p>

     */

    @PublicKey