From patchwork Fri Mar 14 17:42:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= X-Patchwork-Id: 22958 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 512F7C32F9 for ; Fri, 14 Mar 2025 17:42:56 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id AB01368951; Fri, 14 Mar 2025 18:42:55 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="V0sRLGmL"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 4C6866893D for ; Fri, 14 Mar 2025 18:42:52 +0100 (CET) Received: from pb-laptop.local (185.221.143.221.nat.pool.zt.hu [185.221.143.221]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id E5CD1842 for ; Fri, 14 Mar 2025 18:41:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1741974073; bh=8eCneV/+CdU4vWjx2GhnPNxmZoqqI8kdB6VmcYyZu0w=; h=From:To:Subject:Date:In-Reply-To:References:From; b=V0sRLGmL6XqmQlpqAyL+CiHo1jUiTXJcPP7g9FbR+ZozIPCXlKYtdeu+bZcgpw9dv zsDpDa+u9olYj8QbHJM2kzm8v394A4m5PVGfK66rxJMEAYuAFKJiuHbWSQOhjNFrO6 j+6agw+l2EgcZDYnx7/VSv/mK+Y7IlM9X1OP7P/g= From: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= To: libcamera-devel@lists.libcamera.org Subject: [PATCH v3 3/4] libcamera: pipeline: uvcvideo: Retrieve current exposure mode on start Date: Fri, 14 Mar 2025 18:42:47 +0100 Message-ID: <20250314174248.1015718-4-barnabas.pocze@ideasonboard.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250314174248.1015718-1-barnabas.pocze@ideasonboard.com> References: <20250314174248.1015718-1-barnabas.pocze@ideasonboard.com> MIME-Version: 1.0 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" If `ExposureTimeMode` is supported, then retrieve the current value of `V4L2_CID_EXPOSURE_AUTO` in `PipelineHandlerUVC::start()`, and convert it to the appropriate `ExposureTimeModeEnum` value. If it is not supported or the conversion fails, then fall back to assuming that `ExposureTimeModeManual` is in effect. This is necessary to be able to properly handle the `ExposureTime` control as its value is required to be ignored if `ExposureTimeMode` is not manual. Signed-off-by: Barnabás Pőcze --- src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp index 4ff79c291..7d882ebe1 100644 --- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp +++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp @@ -62,6 +62,15 @@ public: std::optional autoExposureMode_; std::optional manualExposureMode_; + struct State { + std::optional exp; + + void reset() + { + exp.reset(); + } + } state_; + private: bool generateId(); @@ -303,6 +312,16 @@ int PipelineHandlerUVC::start(Camera *camera, [[maybe_unused]] const ControlList return ret; } + if (data->autoExposureMode_ || data->manualExposureMode_) { + const auto &ctrls = data->video_->getControls({ V4L2_CID_EXPOSURE_AUTO }); + const auto &value = ctrls.get(V4L2_CID_EXPOSURE_AUTO); + if (!value.isNone()) + data->state_.exp = v4l2ToExposureMode(value.get()); + } + + if (!data->state_.exp) + data->state_.exp = controls::ExposureTimeModeManual; + return 0; } @@ -311,6 +330,7 @@ void PipelineHandlerUVC::stopDevice(Camera *camera) UVCCameraData *data = cameraData(camera); data->video_->streamOff(); data->video_->releaseBuffers(); + data->state_.reset(); } int PipelineHandlerUVC::processControl(const UVCCameraData *data, ControlList *controls,