From e1d45a17f76d5d125d44409b259114b087a4bfe3 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Mon, 28 Oct 2024 10:32:00 +0100 Subject: libcamera: rkisp1: Create main buffer pool out of if(!isRaw) The "useDewarper_" class variable is set to true during configure only if the configuration is !isRaw. The main path buffer pool creation can thus be moved out of the if (!isRaw) block at allocateBuffers() time. Cosmetic change that will make it easier to create a buffer pool for the main and self paths unconditionally in future. Signed-off-by: Jacopo Mondi Reviewed-by: Umang Jain --- src/libcamera/pipeline/rkisp1/rkisp1.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index 870ddf8a..d70b46e5 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp @@ -927,16 +927,16 @@ int PipelineHandlerRkISP1::allocateBuffers(Camera *camera) ret = stat_->allocateBuffers(maxCount, &statBuffers_); if (ret < 0) goto error; + } - /* If the dewarper is being used, allocate internal buffers for ISP. */ - if (useDewarper_) { - ret = mainPath_.exportBuffers(maxCount, &mainPathBuffers_); - if (ret < 0) - goto error; + /* If the dewarper is being used, allocate internal buffers for ISP. */ + if (useDewarper_) { + ret = mainPath_.exportBuffers(maxCount, &mainPathBuffers_); + if (ret < 0) + goto error; - for (std::unique_ptr &buffer : mainPathBuffers_) - availableMainPathBuffers_.push(buffer.get()); - } + for (std::unique_ptr &buffer : mainPathBuffers_) + availableMainPathBuffers_.push(buffer.get()); } for (std::unique_ptr &buffer : paramBuffers_) { -- cgit v1.2.1