From patchwork Mon Jul 20 09:13:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 8869 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 A5503BD792 for ; Mon, 20 Jul 2020 09:13:36 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 591CB60724; Mon, 20 Jul 2020 11:13:36 +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="QhLoulLM"; dkim-atps=neutral Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 2E33E60732 for ; Mon, 20 Jul 2020 11:13:34 +0200 (CEST) Received: by mail-wr1-x42c.google.com with SMTP id f7so17068602wrw.1 for ; Mon, 20 Jul 2020 02:13:34 -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=0ZvNILQsT/lrTa1SsqTTVdBjGKFPz1KeBl7JphindJQ=; b=QhLoulLMa2cNuszm97/RgrOnersc41RquF1jSChsns6+WaiPYOaxcuxAV0mjyI5LDJ 1pc+YKBx+jGszvaAEOTn7QbENySyIrrsvTh3odRIjDpkZfcL4B+7KMzXRYBDm3g85/SQ sfI9bxdk/aJ7AGVyiWajX2C7o8vOjvFgzQKSJr9mA9lwaQEDlrpiAkBFkKPSelKOkdHJ YzawiyXI0/ZLR/zd1q0VpOw9N2e238tlG9eJdAiV8mXy3zikbQeMFkC4MrJIJ5gMr9rI kWQA+U9eKMwlzMwRxRmQ8T3VyM27C7xEgWMkqhLFx4ANhTro179ThMg1EemWBx7niEEm fn+g== 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=0ZvNILQsT/lrTa1SsqTTVdBjGKFPz1KeBl7JphindJQ=; b=XIGm1xhthNXI5XpbuRAIt83s1/CAIJJ2P4RkaXw5YOCambzxSZPY+T0KbO09PUiwDy ozP9KYqt5u7aeU87/laLJFH7IutRywlsF68dlQ4psF1P6EJIN7tV0qIWvRaOK4RZDXF5 u/XxF6r8WW19+b+eIs55O431dHxrsCntt2VJOMeh6NslcQgyVleU0gWftIAc+B9EcgJv cHf+WiHLlTXUiNCcxXqTQlIXOKwvVGXrZVG63HuDe+RR4koJTjenGL4f4qYJfLQBrZGC bBDwaHLC/laQPktejDZU1RjZ6djh+1XycXUoAtbIUhj59qkxXJGXEv6ZvkOqg9chPWl/ vOEA== X-Gm-Message-State: AOAM532avDF5Bj7xqX3ByZnoswJo69VgGkMploBuuwaOhraJvXGCwsRn QlbsttCpSO0vaGVCW6jRqH1QYDH3fa1XNw== X-Google-Smtp-Source: ABdhPJzYkngW4Mq30toJwbQzFbs+7+h7Y9SVRvCJ/F7G+mqvmAr8LLrVwKsV8cbGtYv2DLi6S/Molw== X-Received: by 2002:a05:6000:124c:: with SMTP id j12mr4455843wrx.83.1595236413431; Mon, 20 Jul 2020 02:13:33 -0700 (PDT) Received: from naushir-VirtualBox.patuck.local ([88.97.76.4]) by smtp.gmail.com with ESMTPSA id u1sm38137185wrb.78.2020.07.20.02.13.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2020 02:13:32 -0700 (PDT) From: Naushir Patuck To: libcamera-devel@lists.libcamera.org Date: Mon, 20 Jul 2020 10:13:09 +0100 Message-Id: <20200720091311.805092-8-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200720091311.805092-1-naush@raspberrypi.com> References: <20200720091311.805092-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v4 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 Reviewed-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- 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 dbc22521..c28fe997 100644 --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp @@ -976,14 +976,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());