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

Commit 0f1649f3 authored by Arian's avatar Arian Committed by Jan Altensen
Browse files

Camera: Skip stream size check for whitelisted apps 

This is a squash of the following CLO commits:

commit 84b2ea267f2b5a5b8925758ab8f9e9f0db4f6d53
Author: Pavan Kumar Mc <quic_pmc@quicinc.com>
Date:   Fri Nov 12 21:21:46 2021 +0530

    Camera: Avoid roundBufferDimensionsNearest for AIDE2 YUV streams

    - AIDE2 is vendor enhanced feature which needs special resolutions
      for full and downscaled YUV streams.Those resolutions are not
      populated in static capabilities. So avoid roundBufferDimensionsNearest
      for YUV streams in privileged client case.

    CRs-Fixed: 3012886

    Change-Id: Ia1d134edd1fac2ffd454137aa2a4aa5b9d40c7a7

commit 35df5effc321d630e711161fba02614f0c61abdd
Author: Pavan Kumar Mc <pmc@codeaurora.org>
Date:   Tue Aug 17 10:28:21 2021 +0530

    Camera: Support raw stream creation for priviledged APPs

    - Raw stream creation failing as priviledged APP check set to FALSE
      for new set of call flow to roundBufferDimensionNearest. Setting
      the condition to TRUE.

    CRs-Fixed: 3011444

    Change-Id: Ia3d5e4744a78b06c00e99fb5be856b24acbff599

commit 573cb73a1c6c4a8bf13791b98c5d539ebffa2d0f
Author: Pavan Kumar Mc <pmc@codeaurora.org>
Date:   Thu Jun 24 11:19:35 2021 +0530

    Camera: Master callback mode support for MCX raw

    - Raw stream creation failing for size greater than logical
      camera resolution as size cannot exceed max raw stream size
      in available stream configuration.

    - Allow creating raw streams of greater size for logical camera

    CRs-Fixed: 2968932

    Change-Id: Ibacc3c72e34b2f137546288f67bcdb4e0a38aa23

commit 15de50a2fe471e7d3cc498286f0de31282303fb0
Author: Pavan Kumar Mc <pmc@codeaurora.org>
Date:   Wed Apr 21 17:59:46 2021 +0530

    Camera: Master callback mode support for MCX raw

    - Raw stream creation failing for size greater than logical
      camera resolution as size cannot exceed max raw stream size
      in available stream configuration.

    - Allow creating raw streams of greater size for logical camera

    CRs-Fixed: 2860300

    Change-Id: Ic0f99e55b1519596e49ff2af14895cea1a19c752

commit cee145eaaf32faf0b99f46f957a9fb6ad66abccf
Author: Gaoxiang Chen <gaochen@codeaurora.org>
Date:   Wed Jun 21 12:57:08 2017 +0530

    Camera: Skip stream size check for whitelisted apps.

    Issue:
    For quadracfa capture, Blob/YUV output streams need to be
    configured with custom dimensions which will not be available
    in advertised stream configurations map.

    Fix:
    Skip the stream size check for whitelisted apps to allow
    configuration of streams with custom dimensions.

    Setprop to be used:
    adb shell setprop persist.vendor.camera.privapp.list <pack1,pack2>

    Change-Id: Id94b40c94f42bf4579dc6d8bb6273003312ea669

Change-Id: If12f9696fbc78edbd5fb4345a48818fa5d74752f
parent 56107d15

services/camera/libcameraservice/api2/CameraDeviceClient.cpp

+12 −4
Original line number Diff line number Diff line
@@ -100,8 +100,16 @@ CameraDeviceClient::CameraDeviceClient(const sp<CameraService>& cameraService, 
    mInputStream(),

    mStreamingRequestId(REQUEST_ID_NONE),

    mRequestIdCounter(0),

    mPrivilegedClient(false),

    mOverrideForPerfClass(overrideForPerfClass) {



    char value[PROPERTY_VALUE_MAX];

    property_get("persist.vendor.camera.privapp.list", value, "");

    String16 packagelist(value);

    if (packagelist.contains(clientPackageName.string())) {

        mPrivilegedClient = true;

    }



    ATRACE_CALL();

    ALOGI("CameraDeviceClient %s: Opened", cameraId.string());

}
@@ -646,7 +654,7 @@ binder::Status CameraDeviceClient::isSessionConfigurationSupported( 
    mProviderManager->isLogicalCamera(mCameraIdStr.string(), &physicalCameraIds);

    res = SessionConfigurationUtils::convertToHALStreamCombination(sessionConfiguration,

            mCameraIdStr, mDevice->info(), getMetadata, physicalCameraIds, streamConfiguration,

            mOverrideForPerfClass, &earlyExit);

            mOverrideForPerfClass, &earlyExit, mPrivilegedClient);

    if (!res.isOk()) {

        return res;

    }
@@ -844,7 +852,7 @@ binder::Status CameraDeviceClient::createStream( 
        sp<Surface> surface;

        res = SessionConfigurationUtils::createSurfaceFromGbp(streamInfo,

                isStreamInfoValid, surface, bufferProducer, mCameraIdStr,

                mDevice->infoPhysical(physicalCameraId), sensorPixelModesUsed);

                mDevice->infoPhysical(physicalCameraId), sensorPixelModesUsed, mPrivilegedClient);



        if (!res.isOk())

            return res;
@@ -1189,7 +1197,7 @@ binder::Status CameraDeviceClient::updateOutputConfiguration(int streamId, 
        sp<Surface> surface;

        res = SessionConfigurationUtils::createSurfaceFromGbp(outInfo,

                /*isStreamInfoValid*/ false, surface, newOutputsMap.valueAt(i), mCameraIdStr,

                mDevice->infoPhysical(physicalCameraId), sensorPixelModesUsed);

                mDevice->infoPhysical(physicalCameraId), sensorPixelModesUsed, mPrivilegedClient);

        if (!res.isOk())

            return res;
@@ -1558,7 +1566,7 @@ binder::Status CameraDeviceClient::finalizeOutputConfigurations(int32_t streamId 
        sp<Surface> surface;

        res = SessionConfigurationUtils::createSurfaceFromGbp(mStreamInfoMap[streamId],

                true /*isStreamInfoValid*/, surface, bufferProducer, mCameraIdStr,

                mDevice->infoPhysical(physicalId), sensorPixelModesUsed);

                mDevice->infoPhysical(physicalId), sensorPixelModesUsed, mPrivilegedClient);



        if (!res.isOk())

            return res;

services/camera/libcameraservice/api2/CameraDeviceClient.h

+1 −0
Original line number Diff line number Diff line
@@ -313,6 +313,7 @@ private: 
    static const int32_t REQUEST_ID_NONE = -1;



    int32_t mRequestIdCounter;

    bool mPrivilegedClient;



    std::vector<std::string> mPhysicalCameraIds;

services/camera/libcameraservice/device3/Camera3Device.cpp

+0 −5
Original line number Diff line number Diff line
@@ -654,11 +654,6 @@ ssize_t Camera3Device::getJpegBufferSize(const CameraMetadata &info, uint32_t wi 
            (chosenMaxJpegResolution.width * chosenMaxJpegResolution.height);

    ssize_t jpegBufferSize = scaleFactor * (maxJpegBufferSize - kMinJpegBufferSize) +

            kMinJpegBufferSize;

    if (jpegBufferSize > maxJpegBufferSize) {

        ALOGI("%s: jpeg buffer size calculated is > maxJpeg bufferSize(%zd), clamping",

                  __FUNCTION__, maxJpegBufferSize);

        jpegBufferSize = maxJpegBufferSize;

    }

    return jpegBufferSize;

}

services/camera/libcameraservice/utils/SessionConfigurationUtils.cpp

+37 −5
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ int64_t SessionConfigurationUtils::euclidDistSquare(int32_t x0, int32_t y0, int3 
bool SessionConfigurationUtils::roundBufferDimensionNearest(int32_t width, int32_t height,

        int32_t format, android_dataspace dataSpace,

        const CameraMetadata& info, bool maxResolution, /*out*/int32_t* outWidth,

        /*out*/int32_t* outHeight) {

        /*out*/int32_t* outHeight, bool isPriviledgedClient) {

    const int32_t depthSizesTag =

            getAppropriateModeTag(ANDROID_DEPTH_AVAILABLE_DEPTH_STREAM_CONFIGURATIONS,

                    maxResolution);
@@ -243,6 +243,37 @@ bool SessionConfigurationUtils::roundBufferDimensionNearest(int32_t width, int32 
        }

    }



    if (isPriviledgedClient == true && bestWidth == -1 &&

        (format == HAL_PIXEL_FORMAT_RAW10 || format == HAL_PIXEL_FORMAT_RAW12 ||

         format == HAL_PIXEL_FORMAT_RAW16 || format == HAL_PIXEL_FORMAT_RAW_OPAQUE)) {

        bool isLogicalCamera = false;

        auto entry = info.find(ANDROID_REQUEST_AVAILABLE_CAPABILITIES);

        for (size_t i = 0; i < entry.count; ++i) {

            uint8_t capability = entry.data.u8[i];

            if (capability == ANDROID_REQUEST_AVAILABLE_CAPABILITIES_LOGICAL_MULTI_CAMERA) {

                isLogicalCamera = true;

                break;

            }

        }



        if (isLogicalCamera == true) {

            bestWidth = width;

            bestHeight = height;

        }

    }



    // Avoid roundBufferDimensionsNearest for privileged client YUV streams to meet the AIDE2

    // requirement. AIDE2 is vendor enhanced feature which requires special resolutions and

    // those are not populated in static capabilities.

    if (isPriviledgedClient == true && format == HAL_PIXEL_FORMAT_YCbCr_420_888) {

        ALOGI("Bypass roundBufferDimensionNearest for privilegedClient YUV streams "

              "width %d height %d",

              width, height);



        bestWidth  = width;

        bestHeight = height;

    }



    if (bestWidth == -1) {

        // Return false if no configurations for this format were listed

        return false;
@@ -291,7 +322,8 @@ binder::Status SessionConfigurationUtils::createSurfaceFromGbp( 
        OutputStreamInfo& streamInfo, bool isStreamInfoValid,

        sp<Surface>& surface, const sp<IGraphicBufferProducer>& gbp,

        const String8 &logicalCameraId, const CameraMetadata &physicalCameraMetadata,

        const std::vector<int32_t> &sensorPixelModesUsed){

        const std::vector<int32_t> &sensorPixelModesUsed,

        bool isPriviledgedClient){

    // bufferProducer must be non-null

    if (gbp == nullptr) {

        String8 msg = String8::format("Camera %s: Surface is NULL", logicalCameraId.string());
@@ -382,7 +414,7 @@ binder::Status SessionConfigurationUtils::createSurfaceFromGbp( 
    if (flexibleConsumer && isPublicFormat(format) &&

            !SessionConfigurationUtils::roundBufferDimensionNearest(width, height,

            format, dataSpace, physicalCameraMetadata, foundInMaxRes, /*out*/&width,

            /*out*/&height)) {

            /*out*/&height, isPriviledgedClient)) {

        String8 msg = String8::format("Camera %s: No supported stream configurations with "

                "format %#x defined, failed to create output stream",

                logicalCameraId.string(), format);
@@ -543,7 +575,7 @@ SessionConfigurationUtils::convertToHALStreamCombination( 
        const String8 &logicalCameraId, const CameraMetadata &deviceInfo,

        metadataGetter getMetadata, const std::vector<std::string> &physicalCameraIds,

        hardware::camera::device::V3_7::StreamConfiguration &streamConfiguration,

        bool overrideForPerfClass, bool *earlyExit) {

        bool overrideForPerfClass, bool *earlyExit, bool isPriviledgedClient) {



    auto operatingMode = sessionConfiguration.getOperatingMode();

    binder::Status res = checkOperatingMode(operatingMode, deviceInfo, logicalCameraId);
@@ -653,7 +685,7 @@ SessionConfigurationUtils::convertToHALStreamCombination( 
        for (auto& bufferProducer : bufferProducers) {

            sp<Surface> surface;

            res = createSurfaceFromGbp(streamInfo, isStreamInfoValid, surface, bufferProducer,

                    logicalCameraId, metadataChosen, sensorPixelModesUsed);

                    logicalCameraId, metadataChosen, sensorPixelModesUsed, isPriviledgedClient);



            if (!res.isOk())

                return res;

services/camera/libcameraservice/utils/SessionConfigurationUtils.h

+3 −3
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ public: 
    // a width <= ROUNDING_WIDTH_CAP

    static bool roundBufferDimensionNearest(int32_t width, int32_t height, int32_t format,

            android_dataspace dataSpace, const CameraMetadata& info, bool maxResolution,

            /*out*/int32_t* outWidth, /*out*/int32_t* outHeight);

            /*out*/int32_t* outWidth, /*out*/int32_t* outHeight, bool isPriviledgedClient);



    static bool getArrayWidthAndHeight(const CameraMetadata *deviceInfo, int32_t arrayTag,

            int32_t *width, int32_t *height);
@@ -97,7 +97,7 @@ public: 
        camera3::OutputStreamInfo& streamInfo, bool isStreamInfoValid,

        sp<Surface>& surface, const sp<IGraphicBufferProducer>& gbp,

        const String8 &logicalCameraId, const CameraMetadata &physicalCameraMetadata,

        const std::vector<int32_t> &sensorPixelModesUsed);

        const std::vector<int32_t> &sensorPixelModesUsed, bool isPriviledgedClient=false);



    static void mapStreamInfo(const camera3::OutputStreamInfo &streamInfo,

            camera3::camera_stream_rotation_t rotation, String8 physicalId, int32_t groupId,
@@ -124,7 +124,7 @@ public: 
            const String8 &cameraId, const CameraMetadata &deviceInfo,

            metadataGetter getMetadata, const std::vector<std::string> &physicalCameraIds,

            hardware::camera::device::V3_7::StreamConfiguration &streamConfiguration,

            bool overrideForPerfClass, bool *earlyExit);

            bool overrideForPerfClass, bool *earlyExit, bool isPriviledgedClient = false);



    // Utility function to convert a V3_7::StreamConfiguration to

    // V3_4::StreamConfiguration. Return false if the original V3_7 configuration cannot