From f694da76bea11f47d21f41b396d901af2f165a2a Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Thu, 6 Oct 2022 14:17:38 +0100 Subject: ipa: raspberrypi: Remove initialized_ field from CamHelper 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 Reviewed-by: Laurent Pinchart Signed-off-by: Laurent Pinchart --- 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 fd3527b9..45214531 100644 --- a/src/ipa/raspberrypi/cam_helper.cpp +++ b/src/ipa/raspberrypi/cam_helper.cpp @@ -7,7 +7,6 @@ #include -#include #include #include @@ -41,8 +40,7 @@ CamHelper *CamHelper::create(std::string const &camName) } CamHelper::CamHelper(std::unique_ptr 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 9b5e6026..6771829a 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. -- cgit v1.2.1