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

Commit 1e57e9c9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Camera: Handle single logical requests when notifying requests" into main

parents d3fe6055 cdaafb35

services/camera/libcameraservice/device3/Camera3Device.cpp

+4 −1
Original line number Diff line number Diff line
@@ -4014,8 +4014,11 @@ status_t Camera3Device::RequestThread::prepareHalRequests() { 
                sp<Camera3Device> parent = mParent.promote();

                if (parent != nullptr) {

                    const std::string& streamCameraId = outputStream->getPhysicalCameraId();

                    // Consider the case where clients are sending a single logical camera request

                    // to physical output/outputs

                    bool singleRequest = captureRequest->mSettingsList.size() == 1;

                    for (const auto& settings : captureRequest->mSettingsList) {

                        if ((streamCameraId.empty() &&

                        if (((streamCameraId.empty() || singleRequest) &&

                                parent->getId() == settings.cameraId) ||

                                streamCameraId == settings.cameraId) {

                            outputStream->fireBufferRequestForFrameNumber(