From patchwork Tue Sep 8 07:49:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 9523 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 EB8F2BDB1C for ; Tue, 8 Sep 2020 07:49:27 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 8133D62C11; Tue, 8 Sep 2020 09:49:27 +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="ak0IohM9"; dkim-atps=neutral Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 04FAC60534 for ; Tue, 8 Sep 2020 09:49:26 +0200 (CEST) Received: by mail-wr1-x441.google.com with SMTP id z4so18025383wrr.4 for ; Tue, 08 Sep 2020 00:49:26 -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=HY410+IGo+p0b3nplNTrR4E7HZ5Bkkrqd9Tftr8OvXc=; b=ak0IohM92t0pdyKbWRuv3xwnmC6CSCrYJTkHCGjDuWzxuXz6ehvlsObnfxS4dVKl1i O8qHwaQbIi5C0scgopOz47P94T8daHy6kKVeL5+foovcWv9iwcr8P0j9A8Q5oL6f/pPs WTMq4lT1D2mDAZNSzBmeE6Irv4stq8zJhCQMlAuy+gLlMYBrfsgI2TIY1AnjbnMyU7vH 6eKkmb4ifMauS1/yGTt+kpJCKM8EB/z4UOybVKBZNTofRuXRjIEdIBWPxFwWnJL07SX5 BSAKXGMcLnZKvdvlInyKNEUvnGnS1H8XHh/2vh/49sXmcUnJYyp+H8p0+NRlOEyqioNd SZfw== 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=HY410+IGo+p0b3nplNTrR4E7HZ5Bkkrqd9Tftr8OvXc=; b=Tli8vgF6ToOiSlkK1Af1Tv9zY1Vtk0iGo2o8mJ0Rrbz8HiXmjGVUQD2RLevWdCBTp6 YL5iMV013FYrThIenLv2qB4aQskdVxlv0EOkGWQFZ/N7AVnrvG6DW0SfQN29QkXNGuPA sEi8VPESkApnk9BVhRT3RS6FXZCAsKLtNNfe5Euang9TRy0z6O3dzOaiDpktr8gBU6aX bCYaEiMBXEf/2pZ+iwZ8DP9VYwidbqTQ+a9J+57neU8xwf3lDvbohpE35RMudwiwD09h AqIL8K0knQZWROSgWNkMKW+JZRSVdVeW1qYx5wkTmaWEFivyGrkV6EfjwltS9YIQjS42 /48A== X-Gm-Message-State: AOAM531SqAuHd9iLBWIchk4q4vf/2iM1z6Vdv3C1s/WryxHDv6nfXRg1 BnWVCC248Ka7nbiLrzVNUrjFMdsfzl9Y5Q== X-Google-Smtp-Source: ABdhPJxeXupKueWC12zhsxHP4BMPEg6SHIN6BtpOUkHnHby6YJ11vKx0HJKJdj1PpjpIsn+27shO/A== X-Received: by 2002:a5d:50c3:: with SMTP id f3mr24915254wrt.125.1599551365417; Tue, 08 Sep 2020 00:49:25 -0700 (PDT) Received: from naushir-VirtualBox.patuck.local ([88.97.76.4]) by smtp.gmail.com with ESMTPSA id q15sm32534502wrr.8.2020.09.08.00.49.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Sep 2020 00:49:24 -0700 (PDT) From: Naushir Patuck To: libcamera-devel@lists.libcamera.org Date: Tue, 8 Sep 2020 08:49:07 +0100 Message-Id: <20200908074913.109244-8-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200908074913.109244-1-naush@raspberrypi.com> References: <20200908074913.109244-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v7 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 ea61df27..2a876c3e 100644 --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp @@ -992,12 +992,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());