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

Commit 2a53da43 authored by Emilian Peev's avatar Emilian Peev
Browse files

Camera: Remove RAW boost value override logic 

RAW boost value will be inserted by HIDL wrapper. The logic
needs to move there.

Bug: 34392075
Test: runtest -x
cts/tests/camera/src/android/hardware/camera2/cts/DngCreatorTest.java
Change-Id: I7d4321d728eba11b5ec1345536bb669d70f3cffc
parent 7e25e5e2

services/camera/libcameraservice/device3/Camera3Device.cpp

+0 −25
Original line number Diff line number Diff line
@@ -271,13 +271,6 @@ status_t Camera3Device::initializeCommonLocked() { 


    mPreparerThread = new PreparerThread();



    // Determine whether we need to derive sensitivity boost values for older devices.

    // If post-RAW sensitivity boost range is listed, so should post-raw sensitivity control

    // be listed (as the default value 100)

    if (mDeviceInfo.exists(ANDROID_CONTROL_POST_RAW_SENSITIVITY_BOOST_RANGE)) {

        mDerivePostRawSensKey = true;

    }



    internalUpdateStatusLocked(STATUS_UNCONFIGURED);

    mNextStreamId = 0;

    mDummyStreamId = NO_STREAM;
@@ -1574,15 +1567,6 @@ status_t Camera3Device::createDefaultRequest(int templateId, 
    set_camera_metadata_vendor_id(rawRequest, mVendorTagId);

    mRequestTemplateCache[templateId].acquire(rawRequest);



    // Derive some new keys for backward compatibility

    if (mDerivePostRawSensKey && !mRequestTemplateCache[templateId].exists(

            ANDROID_CONTROL_POST_RAW_SENSITIVITY_BOOST)) {

        int32_t defaultBoost[1] = {100};

        mRequestTemplateCache[templateId].update(

                ANDROID_CONTROL_POST_RAW_SENSITIVITY_BOOST,

                defaultBoost, 1);

    }



    *request = mRequestTemplateCache[templateId];

    return OK;

}
@@ -2578,15 +2562,6 @@ void Camera3Device::sendCaptureResult(CameraMetadata &pendingMetadata, 
        captureResult.mMetadata.append(collectedPartialResult);

    }



    // Derive some new keys for backward compaibility

    if (mDerivePostRawSensKey && !captureResult.mMetadata.exists(

            ANDROID_CONTROL_POST_RAW_SENSITIVITY_BOOST)) {

        int32_t defaultBoost[1] = {100};

        captureResult.mMetadata.update(

                ANDROID_CONTROL_POST_RAW_SENSITIVITY_BOOST,

                defaultBoost, 1);

    }



    captureResult.mMetadata.sort();



    // Check that there's a timestamp in the result metadata

services/camera/libcameraservice/device3/Camera3Device.h

+0 −4
Original line number Diff line number Diff line
@@ -340,10 +340,6 @@ class Camera3Device : 


    CameraMetadata             mRequestTemplateCache[CAMERA3_TEMPLATE_COUNT];



    // whether Camera3Device should derive ANDROID_CONTROL_POST_RAW_SENSITIVITY_BOOST for

    // backward compatibility. Should not be changed after initialization.

    bool                       mDerivePostRawSensKey = false;



    struct Size {

        uint32_t width;

        uint32_t height;