From patchwork Mon Jul 13 08:47:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 8757 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 C920CBD790 for ; Mon, 13 Jul 2020 08:48:06 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 8B97C605C1; Mon, 13 Jul 2020 10:48:06 +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="o+mLV7RT"; dkim-atps=neutral Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 167F46055F for ; Mon, 13 Jul 2020 10:48:05 +0200 (CEST) Received: by mail-wm1-x343.google.com with SMTP id q15so12483443wmj.2 for ; Mon, 13 Jul 2020 01:48:05 -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=uvNMA7md3GEsF7CgFbQDovALSUX1eX1X5TxmnWVUmYg=; b=o+mLV7RTU+w1vO00nHATSv2+cMmlc85bZccjRARF+D/qu5buVEtLrF8nu2iS6n9+Mu X4CLzITU2PMXUw6LX8hgjXE67yySzSeil2YLIFoTQ0QnN1EYzhIdDX2BG3TyhZS8ed2g MFNWI05Z9o8bwGLTWe+bX/HnEQgCnc+UprC0fyesKiLwF5sM9KsK4o5IaG9/UyuWtGJ7 oSBx52+KswEaUEdpDZTBim7ncHK8UWrVSVSYxvoHV1HaRgEU22Niaz4vvxijBejdJJik BaAaYaCplpf6ibu89Dc1hczMXuSc3qArr8FudZUWC4pd/7iTV5LWYpm++4fJRNUloZUA TTgQ== 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=uvNMA7md3GEsF7CgFbQDovALSUX1eX1X5TxmnWVUmYg=; b=f5Mw9ynFrRS+xezE6j0ETPEpy33OmVvubOmqWlX/hLTKVJdWihgVuJipooto4gKyxX PKe+NfHXqKY/AyF7bSWk1TnaNZLGLzUDPrclgi9/iS2lIR9m7ssgzC59sf1zgvtIns7i 9Vl2WMwvsOaHLAVIFPIzYgsEAr5GRDXT1AoA5020vR4F4J+zWvyxdc9iC+myLejxN8BW WBGdJzFRSK/i//a7fMdh4XAYq2qQ4YmV8Ikauu6wc6nB3b0rSvIcHWtF/pGhSgqZ6B8n LTV+FtbmZMcMngqBAF518zXKs6mtpNoOeAYKPjt/yFKC+FKJOJbEFfQ3rGFSQ4QSlKJF FwfQ== X-Gm-Message-State: AOAM532ZUF1h+WGdT5/cvaHVJAbSSLkbr6hzwWUklX8b02ohPo4y11AA /VMxuebVe+gOAstRfdFRfQgfkV4a5I8= X-Google-Smtp-Source: ABdhPJyEXf2Bjcrygmrss6VyD4sq9SiduIMUBXvrh13+6Sfbl4BKH1jhmrrsEjfdOx2HwmqwpB5qKw== X-Received: by 2002:a7b:c14a:: with SMTP id z10mr17215192wmi.19.1594630084436; Mon, 13 Jul 2020 01:48:04 -0700 (PDT) Received: from naushir-VirtualBox.patuck.local ([88.97.76.4]) by smtp.gmail.com with ESMTPSA id g14sm23203357wrm.93.2020.07.13.01.48.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 01:48:03 -0700 (PDT) From: Naushir Patuck To: libcamera-devel@lists.libcamera.org Date: Mon, 13 Jul 2020 09:47:26 +0100 Message-Id: <20200713084727.232422-8-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200713084727.232422-1-naush@raspberrypi.com> References: <20200713084727.232422-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 7/9] 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 f7e16a6c..e1a74d89 100644 --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp @@ -848,12 +848,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());