[libcamera-devel] [PATCH v2 04/10] ipa: raspberrypi: Remove initialized_ field from CamHelper

Naushir Patuck naush at raspberrypi.com
Thu Oct 6 15:17:38 CEST 2022


Given that the single user of the CamHelper is the Raspberry Pi IPA, the
initialized_ field check is unnecessary. Remove the check and the field.

Signed-off-by: Naushir Patuck <naush at raspberrypi.com>
---
 src/ipa/raspberrypi/cam_helper.cpp | 9 +--------
 src/ipa/raspberrypi/cam_helper.h   | 1 -
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/ipa/raspberrypi/cam_helper.cpp b/src/ipa/raspberrypi/cam_helper.cpp
index fd3527b94501..45214531626e 100644
--- a/src/ipa/raspberrypi/cam_helper.cpp
+++ b/src/ipa/raspberrypi/cam_helper.cpp
@@ -7,7 +7,6 @@
 
 #include <linux/videodev2.h>
 
-#include <assert.h>
 #include <map>
 #include <string.h>
 
@@ -41,8 +40,7 @@ CamHelper *CamHelper::create(std::string const &camName)
 }
 
 CamHelper::CamHelper(std::unique_ptr<MdParser> parser, unsigned int frameIntegrationDiff)
-	: parser_(std::move(parser)), initialized_(false),
-	  frameIntegrationDiff_(frameIntegrationDiff)
+	: parser_(std::move(parser)), frameIntegrationDiff_(frameIntegrationDiff)
 {
 }
 
@@ -63,13 +61,11 @@ void CamHelper::process([[maybe_unused]] StatisticsPtr &stats,
 
 uint32_t CamHelper::exposureLines(const Duration exposure, const Duration lineLength) const
 {
-	assert(initialized_);
 	return exposure / lineLength;
 }
 
 Duration CamHelper::exposure(uint32_t exposureLines, const Duration lineLength) const
 {
-	assert(initialized_);
 	return exposureLines * lineLength;
 }
 
@@ -80,8 +76,6 @@ uint32_t CamHelper::getVBlanking(Duration &exposure,
 	uint32_t frameLengthMin, frameLengthMax, vblank;
 	uint32_t exposureLines = CamHelper::exposureLines(exposure, mode_.minLineLength);
 
-	assert(initialized_);
-
 	/*
 	 * minFrameDuration and maxFrameDuration are clamped by the caller
 	 * based on the limits for the active sensor mode.
@@ -110,7 +104,6 @@ void CamHelper::setCameraMode(const CameraMode &mode)
 		parser_->setBitsPerPixel(mode.bitdepth);
 		parser_->setLineLengthBytes(0); /* We use SetBufferSize. */
 	}
-	initialized_ = true;
 }
 
 void CamHelper::getDelays(int &exposureDelay, int &gainDelay,
diff --git a/src/ipa/raspberrypi/cam_helper.h b/src/ipa/raspberrypi/cam_helper.h
index 9b5e602689f3..6771829a56da 100644
--- a/src/ipa/raspberrypi/cam_helper.h
+++ b/src/ipa/raspberrypi/cam_helper.h
@@ -106,7 +106,6 @@ protected:
 	CameraMode mode_;
 
 private:
-	bool initialized_;
 	/*
 	 * Smallest difference between the frame length and integration time,
 	 * in units of lines.
-- 
2.25.1



More information about the libcamera-devel mailing list