From patchwork Fri Jul 17 08:54: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: 8845 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 2C8ACC0109 for ; Fri, 17 Jul 2020 08:54:26 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id D098D6055F; Fri, 17 Jul 2020 10:54:25 +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="QMAJ3C3x"; dkim-atps=neutral Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 3032960542 for ; Fri, 17 Jul 2020 10:54:22 +0200 (CEST) Received: by mail-wr1-x432.google.com with SMTP id f2so10148771wrp.7 for ; Fri, 17 Jul 2020 01:54:22 -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=0C9ughX4Po/Z46568uNaJZlQ1VtlAbMaVTMSjxvcXjY=; b=QMAJ3C3xbhpgNJfcA5ykT/qKeCi39vyki5xDrs9T4meW5fKpRQBlcvZQvvEO8uUPeX fW+nbS/btFfQTBvbTvyaJKtqldlHe7B791+P3PMNGXMlW9CsoVZ1pEczSxsAitXW/2Dc DpJCq9NK9m9+l2Acqxel+w6utkNPuNHjrjWHtf3l0Fbc5B78BxawPAlPJ65GxTExhnte aHxQ8GA9Bm79OmG+jSPccjxIq/MmhKLSDH6EzYMSQwdx5h9Wd8u/QvhWKGVmAb9NtoS+ 0/aIPXyb0a7rwNjkUtUQMEnaL7GBC9+8D7+6K+iB5jI1gxwAIQ3krsj8lKgrDZinneqZ hnqw== 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=0C9ughX4Po/Z46568uNaJZlQ1VtlAbMaVTMSjxvcXjY=; b=P5S8zY3SKM+TsAHKxZ63HkLwDqqql/Bp4F4bq0YGlJmcsB9F0WUwqm42Scgdz09nr1 u3IC7TxocuqG7Ov3v1ajpHIw0pIUMW5B0ljQig2TsNjq3l4Wg4JBLjRjo2N1AjnYruSM yN0VOexFugAU4RiV+3Be3s/6JjLs1KGUQ18YRwKfGqLeKQ7JNM4MxMzaxcqvm+GwNL9x 5uKffCrxabZe8b1IRVmNFAlSBmulei9MrJMxOQMA1qI2vayZoAc/dkB/ReP2q3Ftw63W RcHVcmU86KIJj8SUNFR0gOUBFaZRGwWp2bz6nYsrpFWU/55IqUv4TwBLG2EpTcGN60Zp aAXg== X-Gm-Message-State: AOAM530uCUC6oDwYN4tBsBMHqU1FpDaXMXtiBWnhFVH9vk61LMAeql1f rx6UrhVIeWEYkN2FbCs5XJeOYJwa+pg= X-Google-Smtp-Source: ABdhPJxWjaRg3EUFZ3e+nzwz/nGDcSDzzXdGru+BeC5imVw8GHK6mjdGgcJN9J3tbhZH4AC/HZPbmg== X-Received: by 2002:adf:ec4e:: with SMTP id w14mr9703052wrn.280.1594976061676; Fri, 17 Jul 2020 01:54:21 -0700 (PDT) Received: from naushir-VirtualBox.patuck.local ([88.97.76.4]) by smtp.gmail.com with ESMTPSA id 92sm14582375wrr.96.2020.07.17.01.54.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2020 01:54:21 -0700 (PDT) From: Naushir Patuck To: libcamera-devel@lists.libcamera.org Date: Fri, 17 Jul 2020 09:54:07 +0100 Message-Id: <20200717085410.732308-8-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200717085410.732308-1-naush@raspberrypi.com> References: <20200717085410.732308-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 07/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 --- src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp index f63bf497..ce56ad1a 100644 --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp @@ -988,14 +988,14 @@ int RPiCameraData::configureIPA() unicam_[Unicam::Image].dev()->getFormat(&sensorFormat); /* Inform IPA of stream configuration and sensor controls. */ unsigned int i = 0; - for (auto const &stream : isp_) { + 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());