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

Commit 00f5ccae authored by Jayant Chowdhary's avatar Jayant Chowdhary Committed by android-build-merger
Browse files

Merge "camera2 ndk: Move check for ndk support for capabilities from a... 

Merge "camera2 ndk: Move check for ndk support for capabilities from a white-list to a black-list." into qt-dev
am: bbe759d4

Change-Id: I47266b1622558a881754f79a85eea2e2d406ea35
parents f3139932 bbe759d4

camera/ndk/impl/ACameraMetadata.cpp

+3 −13
Original line number Diff line number Diff line
@@ -47,24 +47,14 @@ ACameraMetadata::ACameraMetadata(camera_metadata_t* buffer, ACAMERA_METADATA_TYP 
bool

ACameraMetadata::isNdkSupportedCapability(int32_t capability) {

    switch (capability) {

        case ANDROID_REQUEST_AVAILABLE_CAPABILITIES_BACKWARD_COMPATIBLE:

        case ANDROID_REQUEST_AVAILABLE_CAPABILITIES_MANUAL_SENSOR:

        case ANDROID_REQUEST_AVAILABLE_CAPABILITIES_MANUAL_POST_PROCESSING:

        case ANDROID_REQUEST_AVAILABLE_CAPABILITIES_RAW:

        case ANDROID_REQUEST_AVAILABLE_CAPABILITIES_READ_SENSOR_SETTINGS:

        case ANDROID_REQUEST_AVAILABLE_CAPABILITIES_BURST_CAPTURE:

        case ANDROID_REQUEST_AVAILABLE_CAPABILITIES_DEPTH_OUTPUT:

        case ANDROID_REQUEST_AVAILABLE_CAPABILITIES_LOGICAL_MULTI_CAMERA:

            return true;

        case ANDROID_REQUEST_AVAILABLE_CAPABILITIES_YUV_REPROCESSING:

        case ANDROID_REQUEST_AVAILABLE_CAPABILITIES_PRIVATE_REPROCESSING:

        case ANDROID_REQUEST_AVAILABLE_CAPABILITIES_CONSTRAINED_HIGH_SPEED_VIDEO:

            return false;

        default:

            // Newly defined capabilities will be unsupported by default (blacklist)

            // TODO: Should we do whitelist or blacklist here?

            ALOGE("%s: Unknonwn capability %d", __FUNCTION__, capability);

            return false;

            // Assuming every capability passed to this function is actually a

            // valid capability.

            return true;

    }

}

camera/ndk/impl/ACameraMetadata.h

+2 −0
Original line number Diff line number Diff line
@@ -70,6 +70,8 @@ struct ACameraMetadata : public RefBase { 


  private:



    // This function does not check whether the capability passed to it is valid.

    // The caller must make sure that it is.

    bool isNdkSupportedCapability(const int32_t capability);

    static inline bool isVendorTag(const uint32_t tag);

    static bool isCaptureRequestTag(const uint32_t tag);