summaryrefslogtreecommitdiff
path: root/src/android
diff options
context:
space:
mode:
authorHarvey Yang <chenghaoyang@chromium.org>2023-09-13 15:20:50 +0000
committerJacopo Mondi <jacopo.mondi@ideasonboard.com>2023-09-21 12:44:09 +0200
commitdbe4e0e9457c349ea6a797b62d5f55e15c67f642 (patch)
tree3d084e7a2c72edf1d5e50c186c581c719137c4ae /src/android
parent9c5eb9237cf6ae170086f0d4d87a025aa052cc9f (diff)
android: camera_device: Fix requestedStream handling
The Android CameraDevice class adds a sourceStream for each Mapped stream requested by the framework. When mapping multiple framework streams to the same sourceStream, the implementation of CameraDevice::processCaptureRequest wrongly erases the just added sourceStream from the list of streams to request to libcamera. Fix this by adding the stream instead of erasing it. Fixes: 7ea83eba0df6 ("android: camera_device: Postpone mapped streams handling") Signed-off-by: Harvey Yang <chenghaoyang@chromium.org> Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Diffstat (limited to 'src/android')
-rw-r--r--src/android/camera_device.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
index 1f7ce440..25cedd44 100644
--- a/src/android/camera_device.cpp
+++ b/src/android/camera_device.cpp
@@ -1077,7 +1077,7 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques
descriptor->request_->addBuffer(sourceStream->stream(),
frameBuffer, nullptr);
- requestedStreams.erase(sourceStream);
+ requestedStreams.insert(sourceStream);
}
/*