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

Commit 435eba42 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Camera: Handle single logical requests when notifying requests" into udc-qpr-dev am: 6791d129

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/24215197



Change-Id: I2f4d51089e969371f664d731f07216e32dcbb742
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c8e5745f 6791d129

services/camera/libcameraservice/device3/Camera3Device.cpp

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

                if (parent != nullptr) {

                    const String8& 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.isEmpty() &&

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

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

                                streamCameraId == settings.cameraId.c_str()) {

                            outputStream->fireBufferRequestForFrameNumber(