From patchwork Wed Feb 17 10:08:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 11320 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 46474BD1F1 for ; Wed, 17 Feb 2021 10:09:02 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 1222A6381F; Wed, 17 Feb 2021 11:09:02 +0100 (CET) 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="Uvly5XPo"; dkim-atps=neutral Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 7DA56637F7 for ; Wed, 17 Feb 2021 11:08:58 +0100 (CET) Received: by mail-wr1-x42a.google.com with SMTP id b3so16732187wrj.5 for ; Wed, 17 Feb 2021 02:08:58 -0800 (PST) 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=uuvSWvyj8WmCxY0N0GaNH8uEM5tK2g6h+wMnfKyKZG8=; b=Uvly5XPo7gjMch0Tr+071EJMcORWBXvhEs4UeHzLWKxijdmBxXgVNZ+Y0lv/icrYNp xnyO3e/xS5I792JeV0toQ7OGGxJxgJojtgUDprdB0IZi87bcek8BkL+uHbgfWn0VT5af vEfKuqihn4N0VdK4g7NAsE0E/cFhZn6aXLnJzc3SUDUvQgsRMlPpSBtaSrehZk45NvnE kSG2GNCWHIh5CzNZTNjmD5YfvHF57rR30I84RO6ttPUbHqt9GBXujojyXbWxYw30vVTP F5WlYXYlS47eF95zz5AizXMTUHBE72SCFdUZEgMAgTqWSOEMq1rJsjo29wd2ZrsKx+9g GL/Q== 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=uuvSWvyj8WmCxY0N0GaNH8uEM5tK2g6h+wMnfKyKZG8=; b=Sjb2k5kkl4K6GHhUiB1SkTnbp3F0Bx9c7Atv5Jy/1pc3L68Bc2mgMbBIBpVgAhiiwl aNPUJWgvN6QddIu1z6TtVTW3bmiDmrVivHGs1JFYCHRzYmwlNYxoyMsZDZCBe4JvJCFt JLNrJNd3Bi3W77l420Y1SXfZsO8UXVPDcWeubytG35R/smAc6C20fQvPsUdc2EYjPFlS vquWA+zUlw1XwzQCbvvqcJ38rw0J+Qo1j1vmdBV6D3RKi/2LjaSIw8XWTHLkKcoscbZ+ ZEOOeOS9ctn3WLrYpTOdXLgOpdwsX0KQ8M3SCtEruSBoYCS5/IP8PXFtuMEDh03X34/f 5EDQ== X-Gm-Message-State: AOAM5315Uqeu8ccbCybgQrSrzpAHaerbUqbo2PzEoPNxeqc7FFmEuqdc MK0e1VW2tYKLHBj0ZuMLZ41pwqQx5BYctnzS X-Google-Smtp-Source: ABdhPJzUoQurMOkW1jiXstGtzDckfZCMwt5B0yLCSZ+VwKvlUuLcAIAA2wy4FZrhXICHTpu2SZTjNg== X-Received: by 2002:adf:b18e:: with SMTP id q14mr29143160wra.396.1613556537948; Wed, 17 Feb 2021 02:08:57 -0800 (PST) Received: from naush-laptop.patuck.local ([88.97.76.4]) by smtp.gmail.com with ESMTPSA id l38sm2132481wmp.19.2021.02.17.02.08.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Feb 2021 02:08:57 -0800 (PST) From: Naushir Patuck To: libcamera-devel@lists.libcamera.org Date: Wed, 17 Feb 2021 10:08:52 +0000 Message-Id: <20210217100852.1542397-3-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210217100852.1542397-1-naush@raspberrypi.com> References: <20210217100852.1542397-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 3/3] pipeline: raspberrypi: Update lens shading control in-place 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" Add the dmabuf file descriptor to the lens shading control in-place rather than taking a copy. Signed-off-by: Naushir Patuck --- src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp index 9dd4d112a907..a60415d93705 100644 --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp @@ -1338,13 +1338,14 @@ void RPiCameraData::embeddedComplete(uint32_t bufferId) void RPiCameraData::setIspControls(const ControlList &controls) { - ControlList ctrls = controls; + ControlList ctrls = std::move(controls); if (ctrls.contains(V4L2_CID_USER_BCM2835_ISP_LENS_SHADING)) { - Span s = - ctrls.get(V4L2_CID_USER_BCM2835_ISP_LENS_SHADING).data(); - const bcm2835_isp_lens_shading *ls = - reinterpret_cast(s.data()); + ControlValue &value = + const_cast(ctrls.get(V4L2_CID_USER_BCM2835_ISP_LENS_SHADING)); + Span s = value.data(); + bcm2835_isp_lens_shading *ls = + reinterpret_cast(s.data()); ls->dmabuf = lsTable_.fd(); }