summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNaushir Patuck <naush@raspberrypi.com>2022-03-25 09:08:58 +0000
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2022-03-28 02:16:35 +0300
commit6ab7d87ff2e63b6eb70a006944cd5096f9f4a6f0 (patch)
tree4b01b570589534d6620f52e6459fdbbc9f4878ab /src
parent73c07bf2895e2cb3a40a4d80d6572d3bd4ae6969 (diff)
pipeline: raspberrypi: Free buffers in the RPiCamera destructor and re-configure
Currently, all framebuffer allocations get freed and cleared on a stop in PipelineHandlerRPi::stopDevice(). If PipelineHandlerRPi::start() is then called without an intermediate PipelineHandlerRPi::configure(), it will re-allocate and prepare all the buffers again, which is unnecessary. Fix this by not freeing the buffer in PipelineHandlerRPi::stopDevice(), but insted doing it in PipelineHandlerRPi::configure(), as the buffers might have to be resized. Add a flag to indicate that buffer allocations need to be done on the next call to PipelineHandlerRPi::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> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'src')
-rw-r--r--src/libcamera/pipeline/raspberrypi/raspberrypi.cpp33
1 files changed, 23 insertions, 10 deletions
diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
index 2281b43f..92043962 100644
--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
@@ -185,10 +185,15 @@ public:
RPiCameraData(PipelineHandler *pipe)
: Camera::Private(pipe), state_(State::Stopped),
supportsFlips_(false), flipsAlterBayerOrder_(false),
- dropFrameCount_(0), ispOutputCount_(0)
+ dropFrameCount_(0), buffersAllocated_(false), ispOutputCount_(0)
{
}
+ ~RPiCameraData()
+ {
+ freeBuffers();
+ }
+
void freeBuffers();
void frameStarted(uint32_t sequence);
@@ -280,6 +285,9 @@ public:
*/
std::optional<int32_t> notifyGainsUnity_;
+ /* Have internal buffers been allocated? */
+ bool buffersAllocated_;
+
private:
void checkRequestCompleted();
void fillRequestMetadata(const ControlList &bufferControls,
@@ -682,7 +690,8 @@ int PipelineHandlerRPi::configure(Camera *camera, CameraConfiguration *config)
RPiCameraData *data = cameraData(camera);
int ret;
- /* Start by resetting the Unicam and ISP stream states. */
+ /* Start by freeing all buffers and reset the Unicam and ISP stream states. */
+ data->freeBuffers();
for (auto const stream : data->streams_)
stream->reset();
@@ -982,12 +991,16 @@ int PipelineHandlerRPi::start(Camera *camera, const ControlList *controls)
RPiCameraData *data = cameraData(camera);
int ret;
- /* Allocate buffers for internal pipeline usage. */
- ret = prepareBuffers(camera);
- if (ret) {
- LOG(RPI, Error) << "Failed to allocate buffers";
- stop(camera);
- return ret;
+ if (!data->buffersAllocated_) {
+ /* Allocate buffers for internal pipeline usage. */
+ ret = prepareBuffers(camera);
+ if (ret) {
+ LOG(RPI, Error) << "Failed to allocate buffers";
+ data->freeBuffers();
+ stop(camera);
+ return ret;
+ }
+ data->buffersAllocated_ = true;
}
/* Check if a ScalerCrop control was specified. */
@@ -1055,8 +1068,6 @@ void PipelineHandlerRPi::stopDevice(Camera *camera)
/* Stop the IPA. */
data->ipa_->stop();
-
- data->freeBuffers();
}
int PipelineHandlerRPi::queueRequestDevice(Camera *camera, Request *request)
@@ -1461,6 +1472,8 @@ void RPiCameraData::freeBuffers()
for (auto const stream : streams_)
stream->releaseBuffers();
+
+ buffersAllocated_ = false;
}
void RPiCameraData::frameStarted(uint32_t sequence)