@@ -107,6 +107,8 @@ int SoftwareIspInstanceGpu::configure(const StreamConfiguration &inputCfg,
[[maybe_unused]] bool ccmEnabled,
bool lscEnabled)
{
+ Rectangle window;
+
if (getInputConfig(inputCfg.pixelFormat, inputConfig_) != 0) {
LOG(SoftwareIspInstance, Error)
<< "Unsupported input format " << inputCfg.pixelFormat;
@@ -156,24 +158,24 @@ int SoftwareIspInstanceGpu::configure(const StreamConfiguration &inputCfg,
outputSize_ = outputCfg.size;
nativeOutputSize_ = outSizeRange.max;
- window_.x = ((inputCfg.size.width - outputCfg.size.width) / 2) &
+ window.x = ((inputCfg.size.width - outputCfg.size.width) / 2) &
~(inputConfig_.patternSize.width - 1);
- window_.y = ((inputCfg.size.height - outputCfg.size.height) / 2) &
+ window.y = ((inputCfg.size.height - outputCfg.size.height) / 2) &
~(inputConfig_.patternSize.height - 1);
- window_.width = outputCfg.size.width;
- window_.height = outputCfg.size.height;
+ window.width = outputCfg.size.width;
+ window.height = outputCfg.size.height;
/*
- * Don't pass x,y from window_ since process() already adjusts for it.
+ * Don't pass x,y from window since process() already adjusts for it.
* But crop the window to 2/3 of its width and height for speedup.
*/
- stats_->setWindow(Rectangle(window_.size()));
+ stats_->setWindow(Rectangle(window.size()));
inputBufferCount_ = inputCfg.bufferCount;
outputBufferCount_ = outputCfg.bufferCount;
/* Configure for one pass */
- PassConfig rawSensorIn = { inputCfg.size, inputConfig_.stride, inputPixelFormat_, window_ };
+ PassConfig rawSensorIn = { inputCfg.size, inputConfig_.stride, inputPixelFormat_, window };
PassConfig rgbaOut = { outputCfg.size, outputConfig_.stride, outputPixelFormat_, Rectangle(nativeOutputSize_) };
gpuIspShaderPassDemosiac_.configure(rawSensorIn, rgbaOut);
@@ -79,7 +79,6 @@ private:
unsigned int outputBufferCount_;
Size nativeOutputSize_;
- Rectangle window_;
std::unique_ptr<SwStatsCpu> stats_;
eGL egl_;
uint32_t width_;
Class member window_ is only used in one method now so make it a local to that method instead. Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> --- .../software_isp/software_isp_instance_gpu.cpp | 16 +++++++++------- .../software_isp/software_isp_instance_gpu.h | 1 - 2 files changed, 9 insertions(+), 8 deletions(-)