From patchwork Tue Sep 28 07:49:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 13960 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 76164BDC71 for ; Tue, 28 Sep 2021 07:50:18 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 3457F69191; Tue, 28 Sep 2021 09:50:18 +0200 (CEST) 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="Szw4GfhU"; 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 451E96918C for ; Tue, 28 Sep 2021 09:50:16 +0200 (CEST) Received: from pyrite.rasen.tech (unknown [IPv6:2400:4051:61:600:2c71:1b79:d06d:5032]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id B12233F1; Tue, 28 Sep 2021 09:50:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1632815415; bh=QzGM2k8AjSMrdfc0gNzEgdnJXXFC8yzw1gJYu+nieYM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Szw4GfhUMoa3V20UVSNSCFr1sZWrk/2jczkKnpZAOqhkHYRvwpA72DONvwSIqMVi5 lzaw2Dxw2RvV/DCeoYNHv0TgvCg9Q8ldJk8jzOlY9YjBG1jkafNgJaYR6EZnVzvhww hFkMWxQ1xWTcDKEqt+4QX8hj7YW4h6jmVoMBB60g= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Tue, 28 Sep 2021 16:49:56 +0900 Message-Id: <20210928074959.3489544-2-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210928074959.3489544-1-paul.elder@ideasonboard.com> References: <20210928074959.3489544-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [RFC PATCH 1/4] 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. Signed-off-by: Paul Elder --- src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 35 +++++++++++++++++--- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp index 264f5370..c227d885 100644 --- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp +++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp @@ -268,7 +268,9 @@ 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_EXPOSURE_AUTO; else if (id == controls::ExposureTime) cid = V4L2_CID_EXPOSURE_ABSOLUTE; @@ -302,9 +304,33 @@ int PipelineHandlerUVC::processControl(ControlList *controls, unsigned int id, } case V4L2_CID_EXPOSURE_AUTO: { - int32_t ivalue = value.get() + bool exposureSet = controls->contains(V4L2_CID_EXPOSURE_AUTO); + + /* \todo Make this nicer. */ + int32_t ivalue; + if (id == controls::ExposureTimeMode && exposureSet) { + int32_t exposureMode = controls->get(V4L2_CID_EXPOSURE_AUTO); + ivalue = value.get() == ExposureTimeModeAuto + ? (exposureMode == V4L2_EXPOSURE_SHUTTER_PRIORITY + ? V4L2_EXPOSURE_AUTO + : V4L2_EXPOSURE_APERTURE_PRIORITY) + : V4L2_EXPOSURE_MANUAL; + } else if (id == controls::ExposureTimeMode && !exposureSet) { + ivalue = value.get() == ExposureTimeModeAuto ? V4L2_EXPOSURE_APERTURE_PRIORITY : V4L2_EXPOSURE_MANUAL; + } else if (id == controls::AnalogueGainMode && exposureSet) { + int32_t exposureMode = controls->get(V4L2_CID_EXPOSURE_AUTO); + ivalue = value.get() == AnalogueGainModeAuto + ? (exposureMode == V4L2_EXPOSURE_APERTURE_PRIORITY + ? V4L2_EXPOSURE_AUTO + : V4L2_EXPOSURE_SHUTTER_PRIORITY) + : V4L2_EXPOSURE_MANUAL; + } else if (id == controls::AnalogueGainMode && !exposureSet) { + ivalue = value.get() == AnalogueGainModeAuto + ? V4L2_EXPOSURE_SHUTTER_PRIORITY + : V4L2_EXPOSURE_MANUAL; + } controls->set(V4L2_CID_EXPOSURE_AUTO, ivalue); break; } @@ -559,7 +585,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 +636,8 @@ void UVCCameraData::addControl(uint32_t cid, const ControlInfo &v4l2Info, break; case V4L2_CID_EXPOSURE_AUTO: - info = ControlInfo{ false, true, true }; + info = ControlInfo{ { ExposureTimeModeAuto, ExposureTimeModeDisabled }, + ExposureTimeModeDisabled }; break; case V4L2_CID_EXPOSURE_ABSOLUTE: