PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pipeline: rkisp1: Replace error handling gotos with utils::exit_scope

Browse Source 
Use utils::exit_scope in PipelineHandlerRkISP1::allocateBuffers() to
avoid gotos for error handling.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
This commit is contained in:
Laurent Pinchart
2025-08-15 13:09:28 +03:00
parent 6498d3a94f
commit 34b9d31700
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/libcamera/pipeline/rkisp1/rkisp1.cpp
View File

@@ -1002,21 +1002,27 @@ int PipelineHandlerRkISP1::allocateBuffers(Camera *camera)
unsigned int ipaBufferId = 1;
int ret;
auto errorCleanup = utils::scope_exit{ [&]() {
paramBuffers_.clear();
statBuffers_.clear();
mainPathBuffers_.clear();
} };
if (!isRaw_) {
ret = param_->allocateBuffers(kRkISP1MinBufferCount, &paramBuffers_);
if (ret < 0)
goto error;
return ret;
ret = stat_->allocateBuffers(kRkISP1MinBufferCount, &statBuffers_);
if (ret < 0)
goto error;
return ret;
}
/* If the dewarper is being used, allocate internal buffers for ISP. */
if (useDewarper_) {
ret = mainPath_.exportBuffers(kRkISP1MinBufferCount, &mainPathBuffers_);
if (ret < 0)
goto error;
return ret;
for (std::unique_ptr<FrameBuffer> &buffer : mainPathBuffers_)
availableMainPathBuffers_.push(buffer.get());
@@ -1038,14 +1044,8 @@ int PipelineHandlerRkISP1::allocateBuffers(Camera *camera)
data->ipa_->mapBuffers(data->ipaBuffers_);
errorCleanup.release();
return 0;
error:
paramBuffers_.clear();
statBuffers_.clear();
mainPathBuffers_.clear();
return ret;
}
int PipelineHandlerRkISP1::freeBuffers(Camera *camera)