From patchwork Fri Sep 18 09:42:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 9652 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 3F655C3B5B for ; Fri, 18 Sep 2020 09:44:04 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 044CC62FC7; Fri, 18 Sep 2020 11:44:04 +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="Tv1R8ciq"; dkim-atps=neutral Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id A955062FB9 for ; Fri, 18 Sep 2020 11:44:01 +0200 (CEST) Received: by mail-wr1-x442.google.com with SMTP id c18so4930986wrm.9 for ; Fri, 18 Sep 2020 02:44:01 -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=N8jhUK8hBWFefqL29hZIlulkNawiu+/q5f/uuUe0Gpk=; b=Tv1R8ciq9xfZYfw4VPgmcfudWhOXAzF3SwJHeczooTJq/P5pYZbbAutpvV2IL+u6lX gTg91ihlliTpHB0qMybupRXvrOZg+OROBFr8A602vacK+9q/X2wvHQ3W3mwqgtzq8p7z mCc+vCCHMNgKyhi/44yfB2cYoHvjxnld5CJODLxJZJYdpJhcYkObGuB11TJlu94cxeIe yu+uvQVh84qoWQsEQxWxLPFQ6C6BmyUm/ADt2dwk/zNNu9+E/a2DpOocwTsLVeaIzb47 NGq0cv0TYrtk/w8JqAL93biL++p3UDUJIC5jWZFI1zu5mv/p30OKOY/9uehLeAZ5pMQy S7wQ== 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=N8jhUK8hBWFefqL29hZIlulkNawiu+/q5f/uuUe0Gpk=; b=BubyjqmFURN6okik0LhxXiRZYlJLTzrzNct6ERfmcXgid8g7Vm1eG9sppCvKYcuFBK cp8XLhysEzAO1rqC7YkcJWgdxHAPAgHaLUU0u5BDKR9nL61DDs5f/vGs7GWcpVhkzLdr 5RdYfg06J02+DLadyEWPlHxDxRml+H0CkRn7b/ruuHPcCQUkV2SUOOZUtJHheNXv5siX yvvnnkCWjO3f47j6xXSFzBNioOWw6J6o3rq/LyyTHyvv8l27pK7SlBMqIfsI0IBfRRck +IU9Krd+rGfcjgwgJBnQ72EUBzRsqT9lYj+Av8124w0cnMUJlb8OR4Fqf+J84kFQv7Oz 9e+Q== X-Gm-Message-State: AOAM530F2LvJJwlM9uP7acaYE7DgefdLyfpJGy2Jp3I7/jk3qZq5sDcs ziQP5DdFbKst3fS5keFh4J8SDwnenV8DyA== X-Google-Smtp-Source: ABdhPJzMel5UH0bBaLkZgRYC1iBdn9vpcujhV6Wr/25ZclsVYSctca1WbG1i89nF/wmSfSul7CkbhA== X-Received: by 2002:adf:f843:: with SMTP id d3mr39601463wrq.226.1600422241064; Fri, 18 Sep 2020 02:44:01 -0700 (PDT) Received: from naushir-VirtualBox.pitowers.org ([2a00:1098:3142:14:a00:27ff:fe4d:f6a2]) by smtp.gmail.com with ESMTPSA id n2sm4792472wma.29.2020.09.18.02.44.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Sep 2020 02:44:00 -0700 (PDT) From: Naushir Patuck To: libcamera-devel@lists.libcamera.org Date: Fri, 18 Sep 2020 10:42:28 +0100 Message-Id: <20200918094233.5273-8-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200918094233.5273-1-naush@raspberrypi.com> References: <20200918094233.5273-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v8 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 9fbe5089..3caf3655 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());