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

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

Merge "Camera2: Add distortion correction support" into pi-dev

parents 1641a23a 7b5fd70c

camera/metadata/3.3/types.hal

+30 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ enum CameraMetadataSection : @3.2::CameraMetadataSection { 
    ANDROID_LOGICAL_MULTI_CAMERA =

        android.hardware.camera.metadata@3.2::CameraMetadataSection:ANDROID_SECTION_COUNT,



    ANDROID_DISTORTION_CORRECTION,



    ANDROID_SECTION_COUNT_3_3,



    VENDOR_SECTION_3_3 = 0x8000,
@@ -46,6 +48,8 @@ enum CameraMetadataSection : @3.2::CameraMetadataSection { 
enum CameraMetadataSectionStart : android.hardware.camera.metadata@3.2::CameraMetadataSectionStart {

    ANDROID_LOGICAL_MULTI_CAMERA_START = CameraMetadataSection:ANDROID_LOGICAL_MULTI_CAMERA << 16,



    ANDROID_DISTORTION_CORRECTION_START = CameraMetadataSection:ANDROID_DISTORTION_CORRECTION << 16,



    VENDOR_SECTION_START_3_3 = CameraMetadataSection:VENDOR_SECTION_3_3 << 16,



};
@@ -164,6 +168,23 @@ enum CameraMetadataTag : @3.2::CameraMetadataTag { 


    ANDROID_LOGICAL_MULTI_CAMERA_END_3_3,



    /** android.distortionCorrection.mode [dynamic, enum, public]

     *

     * <p>Mode of operation for the lens distortion correction block.</p>

     */

    ANDROID_DISTORTION_CORRECTION_MODE = CameraMetadataSectionStart:ANDROID_DISTORTION_CORRECTION_START,



    /** android.distortionCorrection.availableModes [static, byte[], public]

     *

     * <p>List of distortion correction modes for ANDROID_DISTORTION_CORRECTION_MODE that are

     * supported by this camera device.</p>

     *

     * @see ANDROID_DISTORTION_CORRECTION_MODE

     */

    ANDROID_DISTORTION_CORRECTION_AVAILABLE_MODES,



    ANDROID_DISTORTION_CORRECTION_END_3_3,



};



/*
@@ -234,3 +255,12 @@ enum CameraMetadataEnumAndroidLogicalMultiCameraSensorSyncType : uint32_t { 
    ANDROID_LOGICAL_MULTI_CAMERA_SENSOR_SYNC_TYPE_APPROXIMATE,

    ANDROID_LOGICAL_MULTI_CAMERA_SENSOR_SYNC_TYPE_CALIBRATED,

};



/** android.distortionCorrection.mode enumeration values

 * @see ANDROID_DISTORTION_CORRECTION_MODE

 */

enum CameraMetadataEnumAndroidDistortionCorrectionMode : uint32_t {

    ANDROID_DISTORTION_CORRECTION_MODE_OFF,

    ANDROID_DISTORTION_CORRECTION_MODE_FAST,

    ANDROID_DISTORTION_CORRECTION_MODE_HIGH_QUALITY,

};

current.txt

+1 −1
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ eacf4e7491fc52c4db90898faddf25ec7bc72501b07ae8737434c47cb845128c android.hardwar 
4fb0725c36ed4f77a42b42e3f18d8b5f7919cb62b90098b23143a555aa7dd96d android.hardware.camera.device@3.4::ICameraDeviceCallback

812fa66aa10ba0cba27cfddc2fd7f0ee27a8ab65a1f15aa79fdad97d403e6a14 android.hardware.camera.device@3.4::ICameraDeviceSession

cc288f1f78d1e643eb3d3dbc16e1401d44033d8e6856761f5156814a29986ec7 android.hardware.camera.device@3.4::types

26462f5a29bef30485f9264115e79e5f5eb6234951dfeb47424709a1b8936030 android.hardware.camera.metadata@3.3::types

71ee1f46dac4df417d2950e4de760e4145038ae363fc11aeea487350bf603897 android.hardware.camera.metadata@3.3::types

1a46aeae45b7a0e47f79b7207300532986f9d9cd7060779afc7a529f54d712ab android.hardware.confirmationui@1.0::IConfirmationResultCallback

6d8347ff3cd7de471065ac3e8e68385073630cdeebe9f8fa58cb91cf44436c95 android.hardware.confirmationui@1.0::IConfirmationUI

a3ff916784dce87a56c757ab5c86433f0cdf562280999a5f978a6e8a0f3f19e7 android.hardware.confirmationui@1.0::types