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

Commit d2712967 authored by Shuzhen Wang's avatar Shuzhen Wang Committed by Automerger Merge Worker
Browse files

Merge "Camera: Fix up STREAM_CONFIGURATION_MAP doc" into tm-dev am: 945f5b88 am: 27279394 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20536797



Change-Id: I7202d208300ab8511b88cf7cd1d1d448c0f3baab
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 88068450 27279394

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

+61 −11
Original line number Diff line number Diff line
@@ -3083,17 +3083,67 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * check if it limits the maximum size for image data.</p>

     * <p>For applications targeting SDK version older than 31, the following table

     * describes the minimum required output stream configurations based on the

     * hardware level ({@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL android.info.supportedHardwareLevel}):

     * Format                                             | Size                                         | Hardware Level | Notes

     * :-------------------------------------------------:|:--------------------------------------------:|:--------------:|:--------------:

     * {@link android.graphics.ImageFormat#JPEG }          | {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize} (*1)     | Any            |

     * {@link android.graphics.ImageFormat#JPEG }          | 1920x1080 (1080p)                            | Any            | if 1080p &lt;= activeArraySize

     * {@link android.graphics.ImageFormat#JPEG }          | 1280x720 (720p)                               | Any            | if 720p &lt;= activeArraySize

     * {@link android.graphics.ImageFormat#JPEG }          | 640x480 (480p)                               | Any            | if 480p &lt;= activeArraySize

     * {@link android.graphics.ImageFormat#JPEG }          | 320x240 (240p)                               | Any            | if 240p &lt;= activeArraySize

     * {@link android.graphics.ImageFormat#YUV_420_888 }   | all output sizes available for JPEG          | FULL           |

     * {@link android.graphics.ImageFormat#YUV_420_888 }   | all output sizes available for JPEG, up to the maximum video size | LIMITED        |

     * {@link android.graphics.ImageFormat#PRIVATE }       | same as YUV_420_888                          | Any            |</p>

     * hardware level ({@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL android.info.supportedHardwareLevel}):</p>

     * <table>

     * <thead>

     * <tr>

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

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

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

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

     * </tr>

     * </thead>

     * <tbody>

     * <tr>

     * <td style="text-align: center;">{@link android.graphics.ImageFormat#JPEG }</td>

     * <td style="text-align: center;">{@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize} (*1)</td>

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

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

     * </tr>

     * <tr>

     * <td style="text-align: center;">{@link android.graphics.ImageFormat#JPEG }</td>

     * <td style="text-align: center;">1920x1080 (1080p)</td>

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

     * <td style="text-align: center;">if 1080p &lt;= activeArraySize</td>

     * </tr>

     * <tr>

     * <td style="text-align: center;">{@link android.graphics.ImageFormat#JPEG }</td>

     * <td style="text-align: center;">1280x720 (720p)</td>

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

     * <td style="text-align: center;">if 720p &lt;= activeArraySize</td>

     * </tr>

     * <tr>

     * <td style="text-align: center;">{@link android.graphics.ImageFormat#JPEG }</td>

     * <td style="text-align: center;">640x480 (480p)</td>

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

     * <td style="text-align: center;">if 480p &lt;= activeArraySize</td>

     * </tr>

     * <tr>

     * <td style="text-align: center;">{@link android.graphics.ImageFormat#JPEG }</td>

     * <td style="text-align: center;">320x240 (240p)</td>

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

     * <td style="text-align: center;">if 240p &lt;= activeArraySize</td>

     * </tr>

     * <tr>

     * <td style="text-align: center;">{@link android.graphics.ImageFormat#YUV_420_888 }</td>

     * <td style="text-align: center;">all output sizes available for JPEG</td>

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

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

     * </tr>

     * <tr>

     * <td style="text-align: center;">{@link android.graphics.ImageFormat#YUV_420_888 }</td>

     * <td style="text-align: center;">all output sizes available for JPEG, up to the maximum video size</td>

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

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

     * </tr>

     * <tr>

     * <td style="text-align: center;">{@link android.graphics.ImageFormat#PRIVATE }</td>

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

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

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

     * </tr>

     * </tbody>

     * </table>

     * <p>For applications targeting SDK version 31 or newer, if the mobile device declares to be

     * media performance class 12 or higher by setting

     * {@link android.os.Build.VERSION#MEDIA_PERFORMANCE_CLASS } to be 31 or larger,