From f1dbf97eed6988461303ce02269dd13c39e77390 Mon Sep 17 00:00:00 2001
From: Naushir Patuck <naush@raspberrypi.com>
Date: Mon, 14 Jun 2021 10:53:36 +0100
Subject: ipa: raspberrypi: Set default values for member variables of MdParser
Set some sensible default values for member variables of the MdParser
class.
Remove buffer_size_bytes_ along with some related asserts as this class
now uses libcamera::Span for buffer handling, and buffer_size_bytes_ is
unused.
Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Reviewed-by: David Plowman <david.plowman@raspberrypi.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
src/ipa/raspberrypi/cam_helper_imx219.cpp | 1 -
src/ipa/raspberrypi/cam_helper_imx477.cpp | 1 -
src/ipa/raspberrypi/md_parser.hpp | 4 ++--
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/ipa/raspberrypi/cam_helper_imx219.cpp b/src/ipa/raspberrypi/cam_helper_imx219.cpp
index e550fba6..ec218dce 100644
--- a/src/ipa/raspberrypi/cam_helper_imx219.cpp
+++ b/src/ipa/raspberrypi/cam_helper_imx219.cpp
@@ -128,7 +128,6 @@ MdParser::Status MdParserImx219::Parse(libcamera::Span<const uint8_t> buffer)
* registers.
*/
assert(bits_per_pixel_);
- assert(num_lines_ || buffer_size_bytes_);
/* Need to be ordered */
uint32_t regs[3] = { GAIN_REG, EXPHI_REG, EXPLO_REG };
reg_offsets_[0] = reg_offsets_[1] = reg_offsets_[2] = -1;
diff --git a/src/ipa/raspberrypi/cam_helper_imx477.cpp b/src/ipa/raspberrypi/cam_helper_imx477.cpp
index a4a58c15..25b36bce 100644
--- a/src/ipa/raspberrypi/cam_helper_imx477.cpp
+++ b/src/ipa/raspberrypi/cam_helper_imx477.cpp
@@ -117,7 +117,6 @@ MdParser::Status MdParserImx477::Parse(libcamera::Span<const uint8_t> buffer)
* registers.
*/
assert(bits_per_pixel_);
- assert(num_lines_ || buffer_size_bytes_);
/* Need to be ordered */
uint32_t regs[4] = {
EXPHI_REG,
diff --git a/src/ipa/raspberrypi/md_parser.hpp b/src/ipa/raspberrypi/md_parser.hpp
index ca31faa7..65aab02d 100644
--- a/src/ipa/raspberrypi/md_parser.hpp
+++ b/src/ipa/raspberrypi/md_parser.hpp
@@ -71,7 +71,8 @@ public:
ERROR = 2
};
- MdParser() : reset_(true)
+ MdParser()
+ : reset_(true), bits_per_pixel_(0), num_lines_(0), line_length_bytes_(0)
{
}
@@ -106,7 +107,6 @@ protected:
int bits_per_pixel_;
unsigned int num_lines_;
unsigned int line_length_bytes_;
- unsigned int buffer_size_bytes_;
};
/*
--
cgit v1.2.1