commit df6d0502a2aadd17a0dc39439ac9108e21d349c0
author Emilian Peev <epeev@google.com> Wed Jul 26 22:39:33 2023 +0000
committer Emilian Peev <epeev@google.com> Thu Jul 27 22:30:51 2023 +0000
tree c96ad4a335349889fd52a076cc37ac7f954e36be
parent cbf1eb34b18d70b1581e036446150a6233fd75d1

Camera: Handle single logical requests when notifying requests

Consider cases where clients pass single logical capture requests
to physical outputs and notify request frame number listeners
accordingly.

Bug: 292144312
Test: Camera CTS
Change-Id: I3a44cc9a7eaa5b2107f494bddb5e80706eec2bfd
Merged-In: I3a44cc9a7eaa5b2107f494bddb5e80706eec2bfd

services/camera/libcameraservice/device3/Camera3Device.cpp

diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp
index 61c3298..e5228d3 100644
--- a/services/camera/libcameraservice/device3/Camera3Device.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
@@ -4010,8 +4010,11 @@
                 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(