From patchwork Tue Dec 21 04:36:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 15180 X-Patchwork-Delegate: paul.elder@ideasonboard.com 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 DF0FBBE080 for ; Tue, 21 Dec 2021 04:36:25 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 588A460905; Tue, 21 Dec 2021 05:36:25 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="U+E6phbG"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id EB7756021D for ; Tue, 21 Dec 2021 05:36:21 +0100 (CET) Received: from pyrite.mediacom.info (unknown [IPv6:2604:2d80:ad90:fb00:96fd:8874:873:6c16]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 06489881; Tue, 21 Dec 2021 05:36:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1640061381; bh=fbY+QoPion+Cw2pf5Jk7DtTS9syhd/QPAWaXpuqpB/c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U+E6phbGRJg/FRulfG+kr9joN3TPbxToGeySvh7/zJpKkDx4u0up6M02AknNoBRfc bD4EtwPZGOGFr5sIzsBmrAxtsIXEmNqCBP285uBWKnd7+QDW7EFEmo/e+txcfvzd5a cv/65A8SIMf/10eH2XbIeLG3gA7LvMxTYuNlreSs= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Mon, 20 Dec 2021 22:36:04 -0600 Message-Id: <20211221043610.2512334-3-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20211221043610.2512334-1-paul.elder@ideasonboard.com> References: <20211221043610.2512334-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 2/8] libcamera: pipeline: uvcvideo: Support the new AE controls 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 support for the new AE controls in the uvcvideo pipeline handler. Bug: https://bugs.libcamera.org/show_bug.cgi?id=42 Bug: https://bugs.libcamera.org/show_bug.cgi?id=43 Signed-off-by: Paul Elder --- Changes in v3: - fix the construction of the ControlInfo of enum values - fix auto gain in processControl - improve auto exposure in processControl Changes in v2: - fix the rebase error where some uvc stuff was in rasberrypi --- src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 43 +++++++++++++++++--- 1 file changed, 38 insertions(+), 5 deletions(-) diff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp index 40654a0b..ee17add8 100644 --- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp +++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp @@ -268,8 +268,10 @@ int PipelineHandlerUVC::processControl(ControlList *controls, unsigned int id, cid = V4L2_CID_CONTRAST; else if (id == controls::Saturation) cid = V4L2_CID_SATURATION; - else if (id == controls::AeEnable) + else if (id == controls::ExposureTimeMode) cid = V4L2_CID_EXPOSURE_AUTO; + else if (id == controls::AnalogueGainMode) + cid = V4L2_CID_AUTOGAIN; else if (id == controls::ExposureTime) cid = V4L2_CID_EXPOSURE_ABSOLUTE; else if (id == controls::AnalogueGain) @@ -302,13 +304,44 @@ int PipelineHandlerUVC::processControl(ControlList *controls, unsigned int id, } case V4L2_CID_EXPOSURE_AUTO: { - int32_t ivalue = value.get() - ? V4L2_EXPOSURE_APERTURE_PRIORITY + bool autoGainSet = controls->contains(V4L2_CID_AUTOGAIN); + + int32_t ivalue; + if (autoGainSet) { + bool autoGain = controls->get(V4L2_CID_AUTOGAIN).get(); + ivalue = value.get() == controls::ExposureTimeModeAuto + ? (autoGain + /* Both exposure time and gain are auto */ + ? V4L2_EXPOSURE_AUTO + /* Exposure time is auto but gain is manual */ + : V4L2_EXPOSURE_APERTURE_PRIORITY) + : (autoGain + /* Exposure time is manual but gain is auto */ + ? V4L2_EXPOSURE_SHUTTER_PRIORITY + /* Both exposure time and gain are manual */ + : V4L2_EXPOSURE_MANUAL); + } else { + /* + * auto gain is not set, so simply set the auto exposure + * mode from what's set in the libcamera control. + * + * \todo Figure out how to properly handle priority + * when auto exposure is set before auto gain + */ + ivalue = value.get() == controls::ExposureTimeModeAuto + ? V4L2_EXPOSURE_AUTO : V4L2_EXPOSURE_MANUAL; + } + controls->set(V4L2_CID_EXPOSURE_AUTO, ivalue); + break; } + case V4L2_CID_AUTOGAIN: + controls->set(V4L2_CID_AUTOGAIN, value.get()); + break; + case V4L2_CID_EXPOSURE_ABSOLUTE: controls->set(cid, value.get() / 100); break; @@ -559,7 +592,7 @@ void UVCCameraData::addControl(uint32_t cid, const ControlInfo &v4l2Info, id = &controls::Saturation; break; case V4L2_CID_EXPOSURE_AUTO: - id = &controls::AeEnable; + id = &controls::ExposureTimeMode; break; case V4L2_CID_EXPOSURE_ABSOLUTE: id = &controls::ExposureTime; @@ -610,7 +643,7 @@ void UVCCameraData::addControl(uint32_t cid, const ControlInfo &v4l2Info, break; case V4L2_CID_EXPOSURE_AUTO: - info = ControlInfo{ false, true, true }; + info = ControlInfo(controls::ExposureTimeModeValues); break; case V4L2_CID_EXPOSURE_ABSOLUTE: