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

Commit 40b71eec authored by Emilian Peev's avatar Emilian Peev
Browse files

Camera: Remove R&C session parameter name shadowing 

Recent 'udc-dev' conflict resolution duplicates and as a
result shadows capture request parameters.
The overridden request value will get discarded and released
before it can be applied in the final filtered parameters.
This will trigger an extra and unnecessary stream configuration
during the first capture request.

Bug: 277310418
Test: Manual using camera application
Change-Id: I8b255dbc201a843ba528166eec8ca5cdf9c313a2
parent adf23c9a

services/camera/libcameraservice/device3/Camera3Device.cpp

+0 −5
Original line number Diff line number Diff line
@@ -1391,11 +1391,6 @@ status_t Camera3Device::filterParamsAndConfigureLocked(const CameraMetadata& ses 
            request->mSettingsList.push_back(settingsList);



            if (rotateAndCropSessionKey) {

                sp<CaptureRequest> request = new CaptureRequest();

                PhysicalCameraSettings settingsList;

                settingsList.metadata = filteredParams;

                request->mSettingsList.push_back(settingsList);



                auto rotateAndCropEntry = filteredParams.find(ANDROID_SCALER_ROTATE_AND_CROP);

                if (rotateAndCropEntry.count > 0 &&

                        rotateAndCropEntry.data.u8[0] == ANDROID_SCALER_ROTATE_AND_CROP_AUTO) {