From patchwork Fri Jul 24 07:22:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 8952 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 776F8BD879 for ; Fri, 24 Jul 2020 07:23:00 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 4239D611AA; Fri, 24 Jul 2020 09:23:00 +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="hd4zU3RW"; dkim-atps=neutral Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id CFC9F6117D for ; Fri, 24 Jul 2020 09:22:56 +0200 (CEST) Received: by mail-wm1-x341.google.com with SMTP id f139so7313764wmf.5 for ; Fri, 24 Jul 2020 00:22:56 -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=Gq7UH/w1bcU53CsPsuv53AmTQEfkzGwhIAn8cztiBJY=; b=hd4zU3RWjABLuBa2xOCfuaKOljWf+1DfjjUbmzzxD/ALVbOhRSMBexoCWGbRPujveH BBdkVQoYo+NfJjrsFLTe/LCy02xCpWQsYtBz+Clq+YKw7Y/vqVlddGpbKVH66oHnD07q NPaROZH851gy8aaHaET7BsnHtsttoS0+34s5FQezKc5IZZJbTC8OMQeKGaT1wgzkrIxA pg+5yyZdz7mskS0nCrUYvC49QtMCHzkATuYHzllaEG4I0o9sfXHIj0ztrPtE47jZC4if e+iD8+vaKptBIpQy7zV3j9oQtFyYO82SlyuLcDklQEDyzJXI5Xa7t6iepAc+mSpa3oZA rNcQ== 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=Gq7UH/w1bcU53CsPsuv53AmTQEfkzGwhIAn8cztiBJY=; b=NaC1BzD7BRGmIFWAdjb3m93aV03vJbH3f2K6qLixMlCvyUmSRMAufQIIGvLCkbZCEw vRQ2B2oualO2au/U1xYFAO1brFYKj1fNVL5t3WQmpyHNrwLPDI0SP1qmkMZoUg38jtYm hl1e2NjtxQ5IoeENeVCzPEDdZ6HYPMV34bS4hZtK3iI/HU27x00rSsgxV31porQjdwHn Jbc64zjoOepjbPiUpwPNcLP13dhrLNzQs2OR9xqQkVE6P+W4WqSe+6b+lOc7vxP7VAYT mu8ahg/nzbhulSAg26JeB+aKxONIzi5PwDXnkTn57lQtbTF3On9pXtiDgw8wT0S0KyU+ 4ltQ== X-Gm-Message-State: AOAM531rQfhKblsjUCsEbMvSeKmFD48Lu8ifxTWm++deLrczvPpcJbb/ FnAy8Gnhn839+eGD//PdGHbCUTYyH4308A== X-Google-Smtp-Source: ABdhPJxQn1LaH0tJ3iP/ZMlZFLDprq9VLb0z0caUBSN5C782Hbd8DeEz3xRm3bF16zQfCndVU1icXA== X-Received: by 2002:a7b:cb92:: with SMTP id m18mr7176679wmi.94.1595575376197; Fri, 24 Jul 2020 00:22:56 -0700 (PDT) Received: from naushir-VirtualBox.patuck.local ([88.97.76.4]) by smtp.gmail.com with ESMTPSA id 32sm246595wrn.86.2020.07.24.00.22.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 00:22:55 -0700 (PDT) From: Naushir Patuck To: libcamera-devel@lists.libcamera.org Date: Fri, 24 Jul 2020 08:22:16 +0100 Message-Id: <20200724072218.943245-9-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200724072218.943245-1-naush@raspberrypi.com> References: <20200724072218.943245-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v5 08/10] 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 47941851..14c1a073 100644 --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp @@ -984,12 +984,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());