From patchwork Tue Aug 4 09:58:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 9172 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id E5DB4BD87B for ; Tue, 4 Aug 2020 09:59:05 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id B09A260547; Tue, 4 Aug 2020 11:59:05 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="TNAIreQY"; dkim-atps=neutral Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 9D96C6053B for ; Tue, 4 Aug 2020 11:59:03 +0200 (CEST) Received: by mail-wm1-x344.google.com with SMTP id g8so2104110wmk.3 for ; Tue, 04 Aug 2020 02:59:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4Ux2KzIjE78zos/U1JdkYUuRbOMWY4gvRVijLHAsfZQ=; b=TNAIreQY5W+iz/dHNsdlvsKxaiHGEqQz7PdO4T8uy2QGKvYyhwT8hEvGRLdTY6K5AX XrJ8iO4E2p8q2WaRznt2+vdJFb2nI2X37jdUllSn7/qpZwkFu0r7DdBQjo2+ilmMfmpM 6JeaB2LU+hcWb5T8fb/hTP/6i8RagbDNoffa9MkJ3YC7jV2+DSt8FQ4+++h01p3pNqqp eRDBqNHa6FP/7VpFXQz/CXoH686DfzrB0OpYEoQqU2vs4gNHx7v+USrXKjD5TbtxQQXc KpMr5Mj7RmrwAhOQGMV8aF0XtoiADQwWGNvWzkA1lM9idYO3ekPteHUh5SwsTt2HTFEK ln0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4Ux2KzIjE78zos/U1JdkYUuRbOMWY4gvRVijLHAsfZQ=; b=SYnFAw85zuAUpGY5lAQF2WlPojKRfDYFssQS05P2CRs+iYTyOR4iXLp5HnwVAqk/Q+ qVgsSGKF5eh0wow3jNPY7lsNd5HmRC9Kp5qPnIP9+EYpZclucqmgdRLSHmByVruPl3ol HwRhAY2/maC6SIp+BGMu73fkxt3ypKB6lJ77QaQ2ouKgC1MSkEKtCfQF2gpG2YlwY+DZ RI2Bpu0rqdsWaMTmncpbD+uZKVrLMSl3Gy2aj13pLOXHeFibmWNCt/d6FTxpHyx800ZI Tx/hxy+CPoTpTpkGvHDOGDRxURMCTlLzkfJr21BEzjCV0zdR12amf16kY8mgkEU11WmA LLvg== X-Gm-Message-State: AOAM531VObKLBMk4PYreigz8gEepeZ2sF1mPWNG2n2EBP2CvwLpAwphU En0Xm8MG7j+Ga6sI7BWOKMmYaN0smvqUSQ== X-Google-Smtp-Source: ABdhPJzlXQTPU/GjtpJWK/HzRPt/zZNOAApAI9yFAbsYFssbF0nFC4Z6JFZxLTkcyTcmhYeIPkNR2Q== X-Received: by 2002:a1c:9952:: with SMTP id b79mr3360022wme.68.1596535143102; Tue, 04 Aug 2020 02:59:03 -0700 (PDT) Received: from naushir-VirtualBox.patuck.local ([88.97.76.4]) by smtp.gmail.com with ESMTPSA id 32sm34047234wrh.18.2020.08.04.02.59.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Aug 2020 02:59:02 -0700 (PDT) From: Naushir Patuck To: libcamera-devel@lists.libcamera.org Date: Tue, 4 Aug 2020 10:58:45 +0100 Message-Id: <20200804095850.275499-8-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200804095850.275499-1-naush@raspberrypi.com> References: <20200804095850.275499-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v6 07/12] libcamera: pipeline: raspberrypi: Fix bug in passing configuration to IPA X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The counter was not incremented, so multiple streams would only pass the last stream config to the IPA. Signed-off-by: Naushir Patuck Reviewed-by: Niklas Söderlund Reviewed-by: Kieran Bingham Reviewed-by: Laurent Pinchart Tested-by: David Plowman --- src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp index d4791a16..0c8e352d 100644 --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp @@ -983,12 +983,13 @@ int RPiCameraData::configureIPA() unsigned int i = 0; for (auto const &stream : isp_) { if (stream.isExternal()) { - streamConfig[i] = { + streamConfig[i++] = { .pixelFormat = stream.configuration().pixelFormat, .size = stream.configuration().size }; } } + entityControls.emplace(0, unicam_[Unicam::Image].dev()->controls()); entityControls.emplace(1, isp_[Isp::Input].dev()->controls());