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

Commit 747be7e6 authored by Emilian Peev's avatar Emilian Peev
Browse files

Camera: Override transform of all inflight requests 

Depending on timing capture results that include the
active physical id may arrive after the processed
buffers have returned to the registered output.
It is not possible to override transform for these
buffers in the current request but we can still
override the transform for any future inflight
requests.

Bug: 262327461
Test: Manual using camera application
Change-Id: I74aeba2004bde944f2b855e4f8a8823d1dca94ba
parent 2490b2d2

services/camera/libcameraservice/device3/Camera3OutputUtils.cpp

+17 −2
Original line number Diff line number Diff line
@@ -537,9 +537,24 @@ void processCaptureResult(CaptureOutputStates& states, const camera_capture_resu 
                    if (deviceInfo != states.physicalDeviceInfoMap.end()) {

                        auto orientation = deviceInfo->second.find(ANDROID_SENSOR_ORIENTATION);

                        if (orientation.count > 0) {

                            int32_t transform;

                            ret = CameraUtils::getRotationTransform(deviceInfo->second,

                                    OutputConfiguration::MIRROR_MODE_AUTO, &request.transform);

                            if (ret != OK) {

                                    OutputConfiguration::MIRROR_MODE_AUTO, &transform);

                            if (ret == OK) {

                                // It is possible for camera providers to return the capture

                                // results after the processed frames. In such scenario, we will

                                // not be able to set the output transformation before the frames

                                // return back to the consumer for the current capture request

                                // but we could still try and configure it for any future requests

                                // that are still in flight. The assumption is that the physical

                                // device id remains the same for the duration of the pending queue.

                                for (size_t i = 0; i < states.inflightMap.size(); i++) {

                                    auto &r = states.inflightMap.editValueAt(i);

                                    if (r.requestTimeNs >= request.requestTimeNs) {

                                        r.transform = transform;

                                    }

                                }

                            } else {

                                ALOGE("%s: Failed to calculate current stream transformation: %s "

                                        "(%d)", __FUNCTION__, strerror(-ret), ret);

                            }