{"id":13961,"url":"https://patchwork.libcamera.org/api/1.1/patches/13961/?format=json","web_url":"https://patchwork.libcamera.org/patch/13961/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20210928074959.3489544-3-paul.elder@ideasonboard.com>","date":"2021-09-28T07:49:57","name":"[libcamera-devel,RFC,2/4] libcamera: pipeline: raspberrypi: Support the new AE controls","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"753561a96cb388ad103b7935b0f716791c61852a","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/1.1/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/13961/mbox/","series":[{"id":2578,"url":"https://patchwork.libcamera.org/api/1.1/series/2578/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2578","date":"2021-09-28T07:49:55","name":"Fix pipelines for the new AE-related controls","version":1,"mbox":"https://patchwork.libcamera.org/series/2578/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/13961/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/13961/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 0723DBDC71\n\tfor ;\n\tTue, 28 Sep 2021 07:50:21 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B9C6869193;\n\tTue, 28 Sep 2021 09:50:20 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 006BC6918B\n\tfor ;\n\tTue, 28 Sep 2021 09:50:17 +0200 (CEST)","from pyrite.rasen.tech (unknown\n\t[IPv6:2400:4051:61:600:2c71:1b79:d06d:5032])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 8C6313F6;\n\tTue, 28 Sep 2021 09:50:16 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"BglQDsbl\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1632815417;\n\tbh=jmN6IIaNhDD+vaYXmVAhwXMLVZyuUaWQdDJb0Op7NPI=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=BglQDsblhWPLHQiCXu4Jos/Nv4h+SO6jGSDkfT/SHpM4qxBRRAEaRVWOISmLD71jb\n\td7nkJjZjPXir0Y1w9UsISGy0ZB0oVIWmX0xC4kjJ2zkaoYKzhhrX6sPaxwtKytUgZ5\n\tW4iLyOCIAmxbrblxMBuyFZPhMM6mKEuOqpB5ANYQ=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 28 Sep 2021 16:49:57 +0900","Message-Id":"<20210928074959.3489544-3-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","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [RFC PATCH 2/4] libcamera: pipeline: raspberrypi:\n\tSupport the new AE controls","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Add support for the new AE controls in the raspberrypi pipeline handler,\nand in the IPA.\n\nSigned-off-by: Paul Elder \n\n---\nThis is very hacky. I wasn't sure what the best way was to plumb it into\nthe raspberrypi IPA as it was a bit hairy...\n---\n include/libcamera/ipa/raspberrypi.h | 3 +-\n src/ipa/raspberrypi/controller/rpi/agc.cpp | 18 ++++++++-\n src/ipa/raspberrypi/controller/rpi/agc.hpp | 5 +++\n src/ipa/raspberrypi/raspberrypi.cpp | 42 ++++++++++++++++----\n src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 17 ++++----\n 5 files changed, 67 insertions(+), 18 deletions(-)","diff":"diff --git a/include/libcamera/ipa/raspberrypi.h b/include/libcamera/ipa/raspberrypi.h\nindex 521eaecd..363ea038 100644\n--- a/include/libcamera/ipa/raspberrypi.h\n+++ b/include/libcamera/ipa/raspberrypi.h\n@@ -28,8 +28,9 @@ namespace RPi {\n * unsupported control is encountered.\n */\n static const ControlInfoMap Controls({\n-\t\t{ &controls::AeEnable, ControlInfo(false, true) },\n+\t\t{ &controls::ExposureTimeMode, ControlInfo(controls::ExposureTimeModeValues) },\n \t\t{ &controls::ExposureTime, ControlInfo(0, 999999) },\n+\t\t{ &controls::AnalogueGainMode, ControlInfo(controls::AnalogueGainModeValues) },\n \t\t{ &controls::AnalogueGain, ControlInfo(1.0f, 32.0f) },\n \t\t{ &controls::AeMeteringMode, ControlInfo(controls::AeMeteringModeValues) },\n \t\t{ &controls::AeConstraintMode, ControlInfo(controls::AeConstraintModeValues) },\ndiff --git a/src/ipa/raspberrypi/controller/rpi/agc.cpp b/src/ipa/raspberrypi/controller/rpi/agc.cpp\nindex 289c1fce..b45ea454 100644\n--- a/src/ipa/raspberrypi/controller/rpi/agc.cpp\n+++ b/src/ipa/raspberrypi/controller/rpi/agc.cpp\n@@ -203,14 +203,30 @@ bool Agc::IsPaused() const\n }\n \n void Agc::Pause()\n+{\n+}\n+\n+void Agc::Resume()\n+{\n+}\n+\n+void Agc::PauseExposure()\n {\n \tfixed_shutter_ = status_.shutter_time;\n+}\n+\n+void Agc::PauseGain()\n+{\n \tfixed_analogue_gain_ = status_.analogue_gain;\n }\n \n-void Agc::Resume()\n+void Agc::ResumeExposure()\n {\n \tfixed_shutter_ = 0s;\n+}\n+\n+void Agc::ResumeGain()\n+{\n \tfixed_analogue_gain_ = 0;\n }\n \ndiff --git a/src/ipa/raspberrypi/controller/rpi/agc.hpp b/src/ipa/raspberrypi/controller/rpi/agc.hpp\nindex 82063636..7ca3ca2f 100644\n--- a/src/ipa/raspberrypi/controller/rpi/agc.hpp\n+++ b/src/ipa/raspberrypi/controller/rpi/agc.hpp\n@@ -92,6 +92,11 @@ public:\n \tvoid Prepare(Metadata *image_metadata) override;\n \tvoid Process(StatisticsPtr &stats, Metadata *image_metadata) override;\n \n+\tvoid PauseExposure();\n+\tvoid PauseGain();\n+\tvoid ResumeExposure();\n+\tvoid ResumeGain();\n+\n private:\n \tvoid updateLockStatus(DeviceStatus const &device_status);\n \tAgcConfig config_;\ndiff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp\nindex 047123ab..99935515 100644\n--- a/src/ipa/raspberrypi/raspberrypi.cpp\n+++ b/src/ipa/raspberrypi/raspberrypi.cpp\n@@ -53,6 +53,8 @@\n #include \"sharpen_algorithm.hpp\"\n #include \"sharpen_status.h\"\n \n+#include \"controller/rpi/agc.hpp\"\n+\n namespace libcamera {\n \n using namespace std::literals::chrono_literals;\n@@ -478,7 +480,10 @@ void IPARPi::reportMetadata()\n \n \tAgcStatus *agcStatus = rpiMetadata_.GetLocked(\"agc.status\");\n \tif (agcStatus) {\n-\t\tlibcameraMetadata_.set(controls::AeLocked, agcStatus->locked);\n+\t\tlibcameraMetadata_.set(controls::AeState,\n+\t\t\t\t agcStatus->locked ?\n+\t\t\t\t controls::AeStateConverged :\n+\t\t\t\t controls::AeStateSearching);\n \t\tlibcameraMetadata_.set(controls::DigitalGain, agcStatus->digital_gain);\n \t}\n \n@@ -623,20 +628,22 @@ void IPARPi::queueRequest(const ControlList &controls)\n \t\t\t\t << \" = \" << ctrl.second.toString();\n \n \t\tswitch (ctrl.first) {\n-\t\tcase controls::AE_ENABLE: {\n-\t\t\tRPiController::Algorithm *agc = controller_.GetAlgorithm(\"agc\");\n+\t\tcase controls::EXPOSURE_TIME_MODE: {\n+\t\t\tRPiController::Algorithm *algo = controller_.GetAlgorithm(\"agc\");\n+\t\t\tRPiController::Agc *agc = reinterpret_cast(algo);\n \t\t\tif (!agc) {\n \t\t\t\tLOG(IPARPI, Warning)\n-\t\t\t\t\t<< \"Could not set AE_ENABLE - no AGC algorithm\";\n+\t\t\t\t\t<< \"Could not set EXPOSURE_TIME_MODE - no AGC algorithm\";\n \t\t\t\tbreak;\n \t\t\t}\n \n-\t\t\tif (ctrl.second.get() == false)\n-\t\t\t\tagc->Pause();\n+\t\t\tif (ctrl.second.get() == controls::ExposureTimeModeDisabled)\n+\t\t\t\tagc->PauseExposure();\n \t\t\telse\n-\t\t\t\tagc->Resume();\n+\t\t\t\tagc->ResumeExposure();\n \n-\t\t\tlibcameraMetadata_.set(controls::AeEnable, ctrl.second.get());\n+\t\t\tlibcameraMetadata_.set(controls::ExposureTimeMode,\n+\t\t\t\t\t ctrl.second.get());\n \t\t\tbreak;\n \t\t}\n \n@@ -656,6 +663,25 @@ void IPARPi::queueRequest(const ControlList &controls)\n \t\t\tbreak;\n \t\t}\n \n+\t\tcase controls::ANALOGUE_GAIN_MODE: {\n+\t\t\tRPiController::Algorithm *algo = controller_.GetAlgorithm(\"agc\");\n+\t\t\tRPiController::Agc *agc = reinterpret_cast(algo);\n+\t\t\tif (!agc) {\n+\t\t\t\tLOG(IPARPI, Warning)\n+\t\t\t\t\t<< \"Could not set ANALOGUE_GAIN_MODE - no AGC algorithm\";\n+\t\t\t\tbreak;\n+\t\t\t}\n+\n+\t\t\tif (ctrl.second.get() == controls::AnalogueGainModeDisabled)\n+\t\t\t\tagc->PauseGain();\n+\t\t\telse\n+\t\t\t\tagc->ResumeGain();\n+\n+\t\t\tlibcameraMetadata_.set(controls::AnalogueGainMode,\n+\t\t\t\t\t ctrl.second.get());\n+\t\t\tbreak;\n+\t\t}\n+\n \t\tcase controls::ANALOGUE_GAIN: {\n \t\t\tRPiController::AgcAlgorithm *agc = dynamic_cast(\n \t\t\t\tcontroller_.GetAlgorithm(\"agc\"));\ndiff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\nindex c227d885..3a9c3b8d 100644\n--- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n+++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n@@ -309,25 +309,25 @@ int PipelineHandlerUVC::processControl(ControlList *controls, unsigned int id,\n \t\t/* \\todo Make this nicer. */\n \t\tint32_t ivalue;\n \t\tif (id == controls::ExposureTimeMode && exposureSet) {\n-\t\t\tint32_t exposureMode = controls->get(V4L2_CID_EXPOSURE_AUTO);\n-\t\t\tivalue = value.get() == ExposureTimeModeAuto\n+\t\t\tint32_t exposureMode = controls->get(V4L2_CID_EXPOSURE_AUTO).get();\n+\t\t\tivalue = value.get() == controls::ExposureTimeModeAuto\n \t\t\t ? (exposureMode == V4L2_EXPOSURE_SHUTTER_PRIORITY\n \t\t\t\t ? V4L2_EXPOSURE_AUTO\n \t\t\t\t : V4L2_EXPOSURE_APERTURE_PRIORITY)\n \t\t\t : V4L2_EXPOSURE_MANUAL;\n \t\t} else if (id == controls::ExposureTimeMode && !exposureSet) {\n-\t\t\tivalue = value.get() == ExposureTimeModeAuto\n+\t\t\tivalue = value.get() == controls::ExposureTimeModeAuto\n \t\t\t ? V4L2_EXPOSURE_APERTURE_PRIORITY\n \t\t\t : V4L2_EXPOSURE_MANUAL;\n \t\t} else if (id == controls::AnalogueGainMode && exposureSet) {\n-\t\t\tint32_t exposureMode = controls->get(V4L2_CID_EXPOSURE_AUTO);\n-\t\t\tivalue = value.get() == AnalogueGainModeAuto\n+\t\t\tint32_t exposureMode = controls->get(V4L2_CID_EXPOSURE_AUTO).get();\n+\t\t\tivalue = value.get() == controls::AnalogueGainModeAuto\n \t\t\t ? (exposureMode == V4L2_EXPOSURE_APERTURE_PRIORITY\n \t\t\t\t ? V4L2_EXPOSURE_AUTO\n \t\t\t\t : V4L2_EXPOSURE_SHUTTER_PRIORITY)\n \t\t\t : V4L2_EXPOSURE_MANUAL;\n \t\t} else if (id == controls::AnalogueGainMode && !exposureSet) {\n-\t\t\tivalue = value.get() == AnalogueGainModeAuto\n+\t\t\tivalue = value.get() == controls::AnalogueGainModeAuto\n \t\t\t ? V4L2_EXPOSURE_SHUTTER_PRIORITY\n \t\t\t : V4L2_EXPOSURE_MANUAL;\n \t\t}\n@@ -636,8 +636,9 @@ void UVCCameraData::addControl(uint32_t cid, const ControlInfo &v4l2Info,\n \t\tbreak;\n \n \tcase V4L2_CID_EXPOSURE_AUTO:\n-\t\tinfo = ControlInfo{ { ExposureTimeModeAuto, ExposureTimeModeDisabled },\n-\t\t\t\t ExposureTimeModeDisabled };\n+\t\tinfo = ControlInfo{ { controls::ExposureTimeModeAuto,\n+\t\t\t\t controls::ExposureTimeModeDisabled },\n+\t\t\t\t controls::ExposureTimeModeDisabled };\n \t\tbreak;\n \n \tcase V4L2_CID_EXPOSURE_ABSOLUTE:\n","prefixes":["libcamera-devel","RFC","2/4"]}