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

Commit b0ab1b8f authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Android (Google) Code Review
Browse files

Merge "Camera: Add android.scaler.rotateAndCrop control"

parents 67af03cb de45c295
Loading
Loading
Loading
Loading
+28 −0
Original line number Diff line number Diff line
@@ -72,6 +72,23 @@ enum CameraMetadataTag : @3.4::CameraMetadataTag {

    ANDROID_CONTROL_END_3_5,

    /** android.scaler.availableRotateAndCropModes [static, byte[], public]
     *
     * <p>List of rotate-and-crop modes for ANDROID_SCALER_ROTATE_AND_CROP that are supported by this camera device.</p>
     *
     * @see ANDROID_SCALER_ROTATE_AND_CROP
     */
    ANDROID_SCALER_AVAILABLE_ROTATE_AND_CROP_MODES = android.hardware.camera.metadata@3.4::CameraMetadataTag:ANDROID_SCALER_END_3_4,

    /** android.scaler.rotateAndCrop [dynamic, enum, public]
     *
     * <p>Whether a rotation-and-crop operation is applied to processed
     * outputs from the camera.</p>
     */
    ANDROID_SCALER_ROTATE_AND_CROP,

    ANDROID_SCALER_END_3_5,

};

/*
@@ -103,3 +120,14 @@ enum CameraMetadataEnumAndroidRequestAvailableCapabilities :
    ANDROID_REQUEST_AVAILABLE_CAPABILITIES_SYSTEM_CAMERA,
    ANDROID_REQUEST_AVAILABLE_CAPABILITIES_OFFLINE_PROCESSING,
};

/** android.scaler.rotateAndCrop enumeration values
 * @see ANDROID_SCALER_ROTATE_AND_CROP
 */
enum CameraMetadataEnumAndroidScalerRotateAndCrop : uint32_t {
    ANDROID_SCALER_ROTATE_AND_CROP_NONE,
    ANDROID_SCALER_ROTATE_AND_CROP_90,
    ANDROID_SCALER_ROTATE_AND_CROP_180,
    ANDROID_SCALER_ROTATE_AND_CROP_270,
    ANDROID_SCALER_ROTATE_AND_CROP_AUTO,
};