summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaushir Patuck <naush@raspberrypi.com>2022-10-06 14:17:38 +0100
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2022-10-18 03:09:48 +0300
commitf694da76bea11f47d21f41b396d901af2f165a2a (patch)
treea06b41900a24737168966b247a2d3f035187fed1
parentf9c490ab25f38dcaf62da27980dcd8e9f1e53897 (diff)
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 <naush@raspberrypi.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-rw-r--r--src/ipa/raspberrypi/cam_helper.cpp9
-rw-r--r--src/ipa/raspberrypi/cam_helper.h1
2 files changed, 1 insertions, 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 <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 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.