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

Commit bb3497f0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Camera: Add a new tag for multi-resolution stream support" into sc-dev am: cb66da1b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/14177883

Change-Id: I285a0e1df6d08c94ae92874e48f547e472ffd499
parents 43d78670 cb66da1b

camera/metadata/3.6/types.hal

+14 −0
Original line number Diff line number Diff line
@@ -131,6 +131,12 @@ enum CameraMetadataTag : @3.5::CameraMetadataTag { 
     */

    ANDROID_SCALER_AVAILABLE_INPUT_OUTPUT_FORMATS_MAP_MAXIMUM_RESOLUTION,



    /** android.scaler.multiResolutionStreamSupported [static, enum, ndk_public]

     *

     * <p>Whether the camera device supports multi-resolution input or output streams</p>

     */

    ANDROID_SCALER_MULTI_RESOLUTION_STREAM_SUPPORTED,



    ANDROID_SCALER_END_3_6,



    /** android.sensor.opaqueRawSizeMaximumResolution [static, int32[], system]
@@ -334,6 +340,14 @@ enum CameraMetadataEnumAndroidScalerAvailableStreamConfigurationsMaximumResoluti 
    ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_MAXIMUM_RESOLUTION_INPUT,

};



/** android.scaler.multiResolutionStreamSupported enumeration values

 * @see ANDROID_SCALER_MULTI_RESOLUTION_STREAM_SUPPORTED

 */

enum CameraMetadataEnumAndroidScalerMultiResolutionStreamSupported : uint32_t {

    ANDROID_SCALER_MULTI_RESOLUTION_STREAM_SUPPORTED_FALSE,

    ANDROID_SCALER_MULTI_RESOLUTION_STREAM_SUPPORTED_TRUE,

};



/** android.sensor.pixelMode enumeration values

 * @see ANDROID_SENSOR_PIXEL_MODE

 */

camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp

+507 −127

File changed.

Preview size limit exceeded, changes collapsed.