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

Commit c067157b authored by Jayant Chowdhary's avatar Jayant Chowdhary Committed by Android (Google) Code Review
Browse files

Merge "cameraserver: Remove unused mSupportedOpaqueInputSizes from Camera3Device." into sc-dev

parents 2ba29909 ebffa9b4

services/camera/libcameraservice/device3/Camera3Device.cpp

+0 −11
Original line number Diff line number Diff line
@@ -330,17 +330,6 @@ status_t Camera3Device::initializeCommonLocked() { 
        mUsePartialResult = (mNumPartialResults > 1);

    }



    camera_metadata_entry configs =

            mDeviceInfo.find(ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS);

    for (uint32_t i = 0; i < configs.count; i += 4) {

        if (configs.data.i32[i] == HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED &&

                configs.data.i32[i + 3] ==

                ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_INPUT) {

            mSupportedOpaqueInputSizes.add(Size(configs.data.i32[i + 1],

                    configs.data.i32[i + 2]));

        }

    }



    bool usePrecorrectArray = DistortionMapper::isDistortionSupported(mDeviceInfo);

    if (usePrecorrectArray) {

        res = mDistortionMappers[mId.c_str()].setupStaticInfo(mDeviceInfo);

services/camera/libcameraservice/device3/Camera3Device.h

+0 −2
Original line number Diff line number Diff line
@@ -470,8 +470,6 @@ class Camera3Device : 
        uint32_t height;

        explicit Size(uint32_t w = 0, uint32_t h = 0) : width(w), height(h){}

    };

    // Map from format to size.

    Vector<Size>               mSupportedOpaqueInputSizes;



    enum Status {

        STATUS_ERROR,