From 67b24d2c4e7853e16ac427059fa7666b8fd23c19 Mon Sep 17 00:00:00 2001 From: Umang Jain Date: Mon, 24 Jun 2024 19:18:56 +0530 Subject: converter: converter_v4l2_m2m: Rectify streams sanity check The streams sanity check tries to determine if all the stream indexes passed in outputs std::map<> are unique. However, since the data container is std::map<>, all its keys (stream indexes in this case), are already unique. Instead, rectify the sanity check to ensure all the framebuffers passed in the outputs std::map<> are unique to each index. Hence, no two stream indexes should have same framebuffer. Update the comment to reflect the change. Signed-off-by: Umang Jain Reviewed-by: Kieran Bingham Reviewed-by: Paul Elder --- src/libcamera/converter/converter_v4l2_m2m.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/libcamera/converter/converter_v4l2_m2m.cpp b/src/libcamera/converter/converter_v4l2_m2m.cpp index d8929fc5..27a50e34 100644 --- a/src/libcamera/converter/converter_v4l2_m2m.cpp +++ b/src/libcamera/converter/converter_v4l2_m2m.cpp @@ -403,13 +403,13 @@ void V4L2M2MConverter::stop() int V4L2M2MConverter::queueBuffers(FrameBuffer *input, const std::map &outputs) { - unsigned int mask = 0; + std::set outputBufs; int ret; /* * Validate the outputs as a sanity check: at least one output is * required, all outputs must reference a valid stream and no two - * outputs can reference the same stream. + * streams can reference same output framebuffers. */ if (outputs.empty()) return -EINVAL; @@ -419,12 +419,13 @@ int V4L2M2MConverter::queueBuffers(FrameBuffer *input, return -EINVAL; if (index >= streams_.size()) return -EINVAL; - if (mask & (1 << index)) - return -EINVAL; - mask |= 1 << index; + outputBufs.insert(buffer); } + if (outputBufs.size() != streams_.size()) + return -EINVAL; + /* Queue the input and output buffers to all the streams. */ for (auto [index, buffer] : outputs) { ret = streams_[index].queueBuffers(input, buffer); -- cgit v1.2.1