From patchwork Wed Jul 15 14:07:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 8830 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 11CA9BDB1C for ; Wed, 15 Jul 2020 14:07:24 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id CD01460C50; Wed, 15 Jul 2020 16:07:23 +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="jCUHMPex"; dkim-atps=neutral Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 61E6F60487 for ; Wed, 15 Jul 2020 16:07:22 +0200 (CEST) Received: by mail-wr1-x444.google.com with SMTP id k6so2879560wrn.3 for ; Wed, 15 Jul 2020 07:07: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=ygtNeMxA39WHsaHOmt9Zi7Yr2keJJ8hfWsz1Zzbb8Qs=; b=jCUHMPex3LXWugepHSNLCymkCKIAGljCpBjOEI3s7PFI5VJkhgCtnlHXRvApTXqVS/ hM6vZdAF7VzDTY2ymGGLz5tzTZQHtM1S+wDTX/7wd6Wx9ZNY0pRhFneS6GvA3QyhuST2 ijTjpQZTstKePOs25dOngqyAT+U+F1W7dPP2N26aXXDN+SYOomsoV9dxAkbZd8kwon9m ife5tsvvIvQMQ+dzE8XwnM52+fMLEphj/PLOmYqmX8Rc7deS2gibslKiqGYEskvA231n dH3SDIQv0yunUeD2Sq+ZUPJwaX+amtbX9dR8pZdATm/04MUW56YunyAl1HoHT7icQeVA wbuw== 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=ygtNeMxA39WHsaHOmt9Zi7Yr2keJJ8hfWsz1Zzbb8Qs=; b=NKy5pDh2tK1gFLocW1ha8f4dSQIRsSqwPAgF1ZqaEqk4VbXqJ8CUeMF1zYBjj+0Cff MyF5+y9MSDeFkU8N1ItOREVWMbSs9exzcOKsi8LLgJtc6+doQqVuIOrXURWAah+ZxvkN NJTGdZ9wi6KpNdkheN4UeewImclgCDfFC5UsGZjxNZalB67gRW4Qp84qqGrkJXSn17io mXBaNd01zKsmtMIzyb85EDQk/SewYWeU+ThveV4vjuceknHquTJ3UDLjnG2nJhUvpYf7 Cao09kCU2dU874JCb0kkek/W6HZHAhTvnfuXR7nV+bSeMBqwDsZ4/kepGQ/cRRsGsd9l xBqQ== X-Gm-Message-State: AOAM532BBnIN/CJJdRu6EwUWy8PAgLgg5I7duii3/VzKUVoQBjmT3lfs 1hzibeV56JteFPBQsfq3QRnW8OcXAjY= X-Google-Smtp-Source: ABdhPJwZW42VnIJC9Y7LG8qdvsgQTWym2taewSCJzf3BtBOZk/iMUbtacWzVlFOtNMCDsadzaPmlfQ== X-Received: by 2002:a5d:6990:: with SMTP id g16mr11369540wru.131.1594822041732; Wed, 15 Jul 2020 07:07:21 -0700 (PDT) Received: from naushir-VirtualBox.patuck.local ([88.97.76.4]) by smtp.gmail.com with ESMTPSA id l67sm4195339wml.13.2020.07.15.07.07.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2020 07:07:20 -0700 (PDT) From: Naushir Patuck To: libcamera-devel@lists.libcamera.org Date: Wed, 15 Jul 2020 15:07:00 +0100 Message-Id: <20200715140703.566298-8-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200715140703.566298-1-naush@raspberrypi.com> References: <20200715140703.566298-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 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 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp index cd635eb3..b91f031c 100644 --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp @@ -856,12 +856,11 @@ int PipelineHandlerRPi::configureIPA(Camera *camera) /* Inform IPA of stream configuration and sensor controls. */ unsigned int i = 0; for (auto const &stream : data->isp_) { - if (stream.isExternal()) { - streamConfig[i] = { + if (stream.isExternal()) + streamConfig[i++] = { .pixelFormat = stream.configuration().pixelFormat, .size = stream.configuration().size }; - } } entityControls.emplace(0, data->unicam_[Unicam::Image].dev()->controls()); entityControls.emplace(1, data->isp_[Isp::Input].dev()->controls());