summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaushir Patuck <naush@raspberrypi.com>2022-03-25 09:08:59 +0000
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2022-03-28 02:16:38 +0300
commitec173ef5d31b98890bacf3e9f3d912c8a8748ec7 (patch)
treee6319d98e5e405cdeee0c0204b3a52aaf080572e
parent6ab7d87ff2e63b6eb70a006944cd5096f9f4a6f0 (diff)
pipeline: raspberrypi: Repurpose RPi::Stream::reset()
The original use of RPi::Stream::reset() was to clear the external flag state and free/clear out the framebuffers for the stream. However, the latter is now done through PipelineHandlerRPi::configure(). Rework PipelineHandlerRPi::configure() to call RPi::Stream::setExternal() instead of RPi::Stream::reset() to achieve the same thing. Repurpose RPi::Stream::reset() to instead reset the state of the buffer handling logic, where all internally allocated buffers are put back into the queue of available buffers. As such, rename the function to RPi::Stream::resetbuffers(). This resetbuffers() is now called from PipelineHandlerRPi::start(), allowing the pipeline handler to correctly deal with start()/stop()/start() sequences and reusing the buffers allocated on the first start(). Signed-off-by: Naushir Patuck <naush@raspberrypi.com> Reviewed-by: David Plowman <david.plowman@raspberrypi.com> Tested-by: David Plowman <david.plowman@raspberrypi.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-rw-r--r--src/libcamera/pipeline/raspberrypi/raspberrypi.cpp5
-rw-r--r--src/libcamera/pipeline/raspberrypi/rpi_stream.cpp13
-rw-r--r--src/libcamera/pipeline/raspberrypi/rpi_stream.h2
3 files changed, 11 insertions, 9 deletions
diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
index 92043962..8fd79be6 100644
--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
@@ -693,7 +693,7 @@ int PipelineHandlerRPi::configure(Camera *camera, CameraConfiguration *config)
/* Start by freeing all buffers and reset the Unicam and ISP stream states. */
data->freeBuffers();
for (auto const stream : data->streams_)
- stream->reset();
+ stream->setExternal(false);
BayerFormat::Packing packing = BayerFormat::Packing::CSI2;
Size maxSize, sensorSize;
@@ -991,6 +991,9 @@ int PipelineHandlerRPi::start(Camera *camera, const ControlList *controls)
RPiCameraData *data = cameraData(camera);
int ret;
+ for (auto const stream : data->streams_)
+ stream->resetBuffers();
+
if (!data->buffersAllocated_) {
/* Allocate buffers for internal pipeline usage. */
ret = prepareBuffers(camera);
diff --git a/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp b/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp
index f446e1ce..7a93efaa 100644
--- a/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp
+++ b/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp
@@ -26,10 +26,12 @@ std::string Stream::name() const
return name_;
}
-void Stream::reset()
+void Stream::resetBuffers()
{
- external_ = false;
- clearBuffers();
+ /* Add all internal buffers to the queue of usable buffers. */
+ availableBuffers_ = {};
+ for (auto const &buffer : internalBuffers_)
+ availableBuffers_.push(buffer.get());
}
void Stream::setExternal(bool external)
@@ -97,10 +99,7 @@ int Stream::prepareBuffers(unsigned int count)
/* Add these exported buffers to the internal/external buffer list. */
setExportedBuffers(&internalBuffers_);
-
- /* Add these buffers to the queue of internal usable buffers. */
- for (auto const &buffer : internalBuffers_)
- availableBuffers_.push(buffer.get());
+ resetBuffers();
}
/* We must import all internal/external exported buffers. */
diff --git a/src/libcamera/pipeline/raspberrypi/rpi_stream.h b/src/libcamera/pipeline/raspberrypi/rpi_stream.h
index d6f49d34..c37f7e82 100644
--- a/src/libcamera/pipeline/raspberrypi/rpi_stream.h
+++ b/src/libcamera/pipeline/raspberrypi/rpi_stream.h
@@ -45,7 +45,7 @@ public:
V4L2VideoDevice *dev() const;
std::string name() const;
bool isImporter() const;
- void reset();
+ void resetBuffers();
void setExternal(bool external);
bool isExternal() const;