diff options
author | Naushir Patuck <naush@raspberrypi.com> | 2023-07-25 09:55:38 +0100 |
---|---|---|
committer | Naushir Patuck <naush@raspberrypi.com> | 2023-09-04 10:45:22 +0100 |
commit | e8582ee42eff1ec8dc75aa4e233ebb3dcda292ee (patch) | |
tree | 12b1c49d1a7b966c3d56079335e9394e84fccc15 /src/libcamera/pipeline/rpi/common/rpi_stream.cpp | |
parent | 1107999f7143dbbf6f0122778ee9b49b4bb13432 (diff) |
pipeline: rpi: Remove additional external dma buf handling logic
There is no need to distinguish between dma bufs allocated outside of
libcamera and internally allocated buffers. As such, remove all the
special case handling of such buffers.
Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Diffstat (limited to 'src/libcamera/pipeline/rpi/common/rpi_stream.cpp')
-rw-r--r-- | src/libcamera/pipeline/rpi/common/rpi_stream.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/libcamera/pipeline/rpi/common/rpi_stream.cpp b/src/libcamera/pipeline/rpi/common/rpi_stream.cpp index 4b20ac3f..14dd6351 100644 --- a/src/libcamera/pipeline/rpi/common/rpi_stream.cpp +++ b/src/libcamera/pipeline/rpi/common/rpi_stream.cpp @@ -81,16 +81,7 @@ unsigned int Stream::getBufferId(FrameBuffer *buffer) const void Stream::setExternalBuffer(FrameBuffer *buffer) { - bufferMap_.emplace(BufferMask::MaskExternalBuffer | id_.get(), buffer); -} - -void Stream::removeExternalBuffer(FrameBuffer *buffer) -{ - unsigned int id = getBufferId(buffer); - - /* Ensure we have this buffer in the stream, and it is marked external. */ - ASSERT(id & BufferMask::MaskExternalBuffer); - bufferMap_.erase(id); + bufferMap_.emplace(id_.get(), buffer); } int Stream::prepareBuffers(unsigned int count) |