[libcamera-devel,v2,07/10] libcamera: pipeline: raspberrypi: Fix bug in passing configuration to IPA

Message ID 20200715140703.566298-8-naush@raspberrypi.com
State Superseded
Headers show
Series
  • Zero-copy RAW stream work
Related show

Commit Message

Naushir Patuck July 15, 2020, 2:07 p.m. UTC
The counter was not incremented, so multiple streams would only pass the
last stream config to the IPA.

Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
---
 src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Patch

diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
index cd635eb3..b91f031c 100644
--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
@@ -856,12 +856,11 @@  int PipelineHandlerRPi::configureIPA(Camera *camera)
 	/* Inform IPA of stream configuration and sensor controls. */
 	unsigned int i = 0;
 	for (auto const &stream : data->isp_) {
-		if (stream.isExternal()) {
-			streamConfig[i] = {
+		if (stream.isExternal())
+			streamConfig[i++] = {
 				.pixelFormat = stream.configuration().pixelFormat,
 				.size = stream.configuration().size
 			};
-		}
 	}
 	entityControls.emplace(0, data->unicam_[Unicam::Image].dev()->controls());
 	entityControls.emplace(1, data->isp_[Isp::Input].dev()->controls());