Patch Detail
Show a patch.
GET /api/1.1/patches/17820/?format=api
{ "id": 17820, "url": "https://patchwork.libcamera.org/api/1.1/patches/17820/?format=api", "web_url": "https://patchwork.libcamera.org/patch/17820/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<CAPhyPA6Wm-kdAm8LVoO3Mz+88=P3-0FiAa0VZi9qLVmNei9KBQ@mail.gmail.com>", "date": "2022-11-21T14:21:05", "name": "[libcamera-devel,1/1] ipa/raspberrypi: Remove generic \"pause\" mechanism from Algorithm", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "87b271a48b1c9508d9ce7b2388ebac50c8aa5b42", "submitter": { "id": 130, "url": "https://patchwork.libcamera.org/api/1.1/people/130/?format=api", "name": "Nick Hollinghurst", "email": "nick.hollinghurst@raspberrypi.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/17820/mbox/", "series": [ { "id": 3623, "url": "https://patchwork.libcamera.org/api/1.1/series/3623/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3623", "date": "2022-11-21T14:18:11", "name": "ipa/raspberrypi: Remove generic \"pause\" mechanism from Algorithm", "version": 1, "mbox": "https://patchwork.libcamera.org/series/3623/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/17820/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/17820/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 8595BBD16B\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 21 Nov 2022 14:21:18 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E694B6331A;\n\tMon, 21 Nov 2022 15:21:17 +0100 (CET)", "from mail-yw1-x1129.google.com (mail-yw1-x1129.google.com\n\t[IPv6:2607:f8b0:4864:20::1129])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id F3C9163097\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 21 Nov 2022 15:21:16 +0100 (CET)", "by mail-yw1-x1129.google.com with SMTP id\n\t00721157ae682-39451671bdfso89369737b3.10\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 21 Nov 2022 06:21:16 -0800 (PST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1669040477;\n\tbh=dSjRfDL/m/ga6ggUf6MhvaECswpbR2mvuSl5IEaxsNM=;\n\th=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post:\n\tList-Help:List-Subscribe:From:Reply-To:From;\n\tb=UbRQh2UFvbGYOfK28j+BTTXgr00DNznGSnmthWYR8DMQlaRvr/nUrCe3Oiu5VovBg\n\tDa+89erEYaGE2pur1KncRl0Rm5ydd2wMi0c9IUcUzuTsCP/pjqvrjOABI0IGzpv8Jw\n\tGIvqPhKBkdsl6syDHb6OBM3e08Mxo9DuQmglf386GHwlhyw/ZSWUetgTK/5cGvj5if\n\tzjRy3lciOI4ho1eZYPmLTs3IDRRsQW6cI8H2TKQhUw8MtMXdKw90zlLLOPZumOFAR/\n\tzKdcoC9AVu5M5BL6O8kOdzmWxA2mkOLZBRUZBhAi9ITd0y3itS3U06VtUkz5POHWXu\n\tDAQRYhWS2H46Q==", "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google;\n\th=to:subject:message-id:date:from:mime-version:from:to:cc:subject\n\t:date:message-id:reply-to;\n\tbh=r143vMyPPWjPPnbCkJ/oUaR7R9KaHMHST0LijbepNRY=;\n\tb=n1X1x+eKTWI1+m7/bvaQNyXAqrMpQzs6tdvFPMRM0W6euPlejj9YU3FtTa6U4GAWqn\n\tcuSJOeGBjg7kjYPmCxBQsgzA9ArruOr6+65rKeUGk8AN5sDzmcd+FYp2ZlVSjP9USz8Q\n\t7meHvngzdeZZ8duI9UpAWqz5f7Pu2iJKAtRmTNnleqEBiLiJh3PJvx/WxTDB9oxAd11Q\n\tBKQK68yYmbmk/hSgC5ZstNRBY7DaI5hEYkiplRxo53KF1j5PP9z5YgTgW98cZMV7fpxm\n\tUn7Yo7ogsYliOC8YlQYVsDZkPqYkALava7knv1tqY3evR34csHkER1yDkYgFnQHWkIM8\n\tnwCg==" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected) header.d=raspberrypi.com\n\theader.i=@raspberrypi.com\n\theader.b=\"n1X1x+eK\"; dkim-atps=neutral", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=to:subject:message-id:date:from:mime-version:x-gm-message-state\n\t:from:to:cc:subject:date:message-id:reply-to;\n\tbh=r143vMyPPWjPPnbCkJ/oUaR7R9KaHMHST0LijbepNRY=;\n\tb=A8szQ7TULUBDVPKv8Y7AX4WJte1KfWVqKA8Swc2S16LRE3kAIu0vK5EiAmSetxSFs4\n\t70/aejPHLiHVH9nn/c0G710q/NHidGs2WdvSkmWs/IUTmHjBTts6GuZ2wRSif888ULZC\n\tWNzERZrcxkkU5b0Rhp2Hl4iCFb7aCRPjBOmuFlNEjMzk8/NkVSERWmoUAtPpGDOn6RJV\n\tZMpEffX+rvv619T8YJemD7sjsWdvDG9jssFzjDjAf5Sn3gOoWaDBGjy2rW1WkFUPJh7u\n\tJwbcVCf7I4pvRHUvw19i/CBWqKt0ZoO7kuCmNaw2yedFT+j+J/Q4hgbCTSFP+O3aKk09\n\tVXyQ==", "X-Gm-Message-State": "ANoB5plfWvmLE+IHwHLQwRpiI7cOluxMPw0HChh0cGmaKz3tHivmd9vy\n\tJNoaHSq2romklbxbTp3YEyfWfC4tCYsxiabnwgMAbTLFLL2xzQ==", "X-Google-Smtp-Source": "AA0mqf7xNZF/1czP+wa4H2SMARPcgHEiuZdYOWg1YmcxXfZ/AZLi7zjKxto44y4ZEgTwG5nhHR1K7BrVHmeW6F26+uA=", "X-Received": "by 2002:a05:690c:c14:b0:345:1d35:8884 with SMTP id\n\tcl20-20020a05690c0c1400b003451d358884mr352481ywb.405.1669040475736;\n\tMon, 21 Nov 2022 06:21:15 -0800 (PST)", "MIME-Version": "1.0", "Date": "Mon, 21 Nov 2022 14:21:05 +0000", "Message-ID": "<CAPhyPA6Wm-kdAm8LVoO3Mz+88=P3-0FiAa0VZi9qLVmNei9KBQ@mail.gmail.com>", "To": "libcamera-devel@lists.libcamera.org", "Content-Type": "text/plain; charset=\"UTF-8\"", "Subject": "[libcamera-devel] [PATCH 1/1] ipa/raspberrypi: Remove generic\n\t\"pause\" mechanism from Algorithm", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "From": "Nick Hollinghurst via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>", "Reply-To": "Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "No existing Algorithm used the base pause(), resume() functions\nor the paused_ flag, nor is there a need or a generic pause API.\nRemove these. The AGC and AWB algorithms now have methods named\ndisableAuto(), enableAuto() which better describe their functionality.\n\nSigned-off-by: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>\n---\n src/ipa/raspberrypi/controller/agc_algorithm.h | 2 ++\n src/ipa/raspberrypi/controller/algorithm.h | 6 +-----\n src/ipa/raspberrypi/controller/awb_algorithm.h | 2 ++\n src/ipa/raspberrypi/controller/controller.cpp | 6 ++----\n src/ipa/raspberrypi/controller/rpi/agc.cpp | 13 ++++---------\n src/ipa/raspberrypi/controller/rpi/agc.h | 6 ++----\n src/ipa/raspberrypi/controller/rpi/awb.cpp | 11 +++--------\n src/ipa/raspberrypi/controller/rpi/awb.h | 6 ++----\n src/ipa/raspberrypi/raspberrypi.cpp | 14 ++++++++------\n 9 files changed, 26 insertions(+), 40 deletions(-)\n\n << \"Could not set AE_ENABLE - no AGC algorithm\";\n@@ -714,9 +715,9 @@ void IPARPi::queueRequest(const ControlList &controls)\n }\n\n if (ctrl.second.get<bool>() == false)\n- agc->pause();\n+ agc->disableAuto();\n else\n- agc->resume();\n+ agc->enableAuto();\n\n libcameraMetadata_.set(controls::AeEnable, ctrl.second.get<bool>());\n break;\n@@ -835,7 +836,8 @@ void IPARPi::queueRequest(const ControlList &controls)\n }\n\n case controls::AWB_ENABLE: {\n- RPiController::Algorithm *awb = controller_.getAlgorithm(\"awb\");\n+ RPiController::AwbAlgorithm *awb =\ndynamic_cast<RPiController::AwbAlgorithm *>(\n+ controller_.getAlgorithm(\"awb\"));\n if (!awb) {\n LOG(IPARPI, Warning)\n << \"Could not set AWB_ENABLE - no AWB algorithm\";\n@@ -843,9 +845,9 @@ void IPARPi::queueRequest(const ControlList &controls)\n }\n\n if (ctrl.second.get<bool>() == false)\n- awb->pause();\n+ awb->disableAuto();\n else\n- awb->resume();\n+ awb->enableAuto();\n\n libcameraMetadata_.set(controls::AwbEnable,\n ctrl.second.get<bool>());", "diff": "diff --git a/src/ipa/raspberrypi/controller/agc_algorithm.h\nb/src/ipa/raspberrypi/controller/agc_algorithm.h\nindex 3a91444c..36e6c110 100644\n--- a/src/ipa/raspberrypi/controller/agc_algorithm.h\n+++ b/src/ipa/raspberrypi/controller/agc_algorithm.h\n@@ -26,6 +26,8 @@ public:\n virtual void setMeteringMode(std::string const &meteringModeName) = 0;\n virtual void setExposureMode(std::string const &exposureModeName) = 0;\n virtual void setConstraintMode(std::string const &contraintModeName) = 0;\n+ virtual void enableAuto() = 0;\n+ virtual void disableAuto() = 0;\n };\n\n } /* namespace RPiController */\ndiff --git a/src/ipa/raspberrypi/controller/algorithm.h\nb/src/ipa/raspberrypi/controller/algorithm.h\nindex cbbb13ba..4f327598 100644\n--- a/src/ipa/raspberrypi/controller/algorithm.h\n+++ b/src/ipa/raspberrypi/controller/algorithm.h\n@@ -27,14 +27,11 @@ class Algorithm\n {\n public:\n Algorithm(Controller *controller)\n- : controller_(controller), paused_(false)\n+ : controller_(controller)\n {\n }\n virtual ~Algorithm() = default;\n virtual char const *name() const = 0;\n- virtual bool isPaused() const { return paused_; }\n- virtual void pause() { paused_ = true; }\n- virtual void resume() { paused_ = false; }\n virtual int read(const libcamera::YamlObject ¶ms);\n virtual void initialise();\n virtual void switchMode(CameraMode const &cameraMode, Metadata *metadata);\n@@ -47,7 +44,6 @@ public:\n\n private:\n Controller *controller_;\n- bool paused_;\n };\n\n /*\ndiff --git a/src/ipa/raspberrypi/controller/awb_algorithm.h\nb/src/ipa/raspberrypi/controller/awb_algorithm.h\nindex 48e08b60..8462c4db 100644\n--- a/src/ipa/raspberrypi/controller/awb_algorithm.h\n+++ b/src/ipa/raspberrypi/controller/awb_algorithm.h\n@@ -18,6 +18,8 @@ public:\n virtual unsigned int getConvergenceFrames() const = 0;\n virtual void setMode(std::string const &modeName) = 0;\n virtual void setManualGains(double manualR, double manualB) = 0;\n+ virtual void enableAuto() = 0;\n+ virtual void disableAuto() = 0;\n };\n\n } /* namespace RPiController */\ndiff --git a/src/ipa/raspberrypi/controller/controller.cpp\nb/src/ipa/raspberrypi/controller/controller.cpp\nindex f4892786..e9156785 100644\n--- a/src/ipa/raspberrypi/controller/controller.cpp\n+++ b/src/ipa/raspberrypi/controller/controller.cpp\n@@ -108,16 +108,14 @@ void Controller::prepare(Metadata *imageMetadata)\n {\n assert(switchModeCalled_);\n for (auto &algo : algorithms_)\n- if (!algo->isPaused())\n- algo->prepare(imageMetadata);\n+ algo->prepare(imageMetadata);\n }\n\n void Controller::process(StatisticsPtr stats, Metadata *imageMetadata)\n {\n assert(switchModeCalled_);\n for (auto &algo : algorithms_)\n- if (!algo->isPaused())\n- algo->process(stats, imageMetadata);\n+ algo->process(stats, imageMetadata);\n }\n\n Metadata &Controller::getGlobalMetadata()\ndiff --git a/src/ipa/raspberrypi/controller/rpi/agc.cpp\nb/src/ipa/raspberrypi/controller/rpi/agc.cpp\nindex bd54a639..a30e50c1 100644\n--- a/src/ipa/raspberrypi/controller/rpi/agc.cpp\n+++ b/src/ipa/raspberrypi/controller/rpi/agc.cpp\n@@ -270,18 +270,13 @@ int Agc::read(const libcamera::YamlObject ¶ms)\n return 0;\n }\n\n-bool Agc::isPaused() const\n-{\n- return false;\n-}\n-\n-void Agc::pause()\n+void Agc::disableAuto()\n {\n fixedShutter_ = status_.shutterTime;\n fixedAnalogueGain_ = status_.analogueGain;\n }\n\n-void Agc::resume()\n+void Agc::enableAuto()\n {\n fixedShutter_ = 0s;\n fixedAnalogueGain_ = 0;\n@@ -317,14 +312,14 @@ void Agc::setMaxShutter(Duration maxShutter)\n void Agc::setFixedShutter(Duration fixedShutter)\n {\n fixedShutter_ = fixedShutter;\n- /* Set this in case someone calls Pause() straight after. */\n+ /* Set this in case someone calls disableAuto() straight after. */\n status_.shutterTime = clipShutter(fixedShutter_);\n }\n\n void Agc::setFixedAnalogueGain(double fixedAnalogueGain)\n {\n fixedAnalogueGain_ = fixedAnalogueGain;\n- /* Set this in case someone calls Pause() straight after. */\n+ /* Set this in case someone calls disableAuto() straight after. */\n status_.analogueGain = fixedAnalogueGain;\n }\n\ndiff --git a/src/ipa/raspberrypi/controller/rpi/agc.h\nb/src/ipa/raspberrypi/controller/rpi/agc.h\nindex 6d6b0e5a..cf04da19 100644\n--- a/src/ipa/raspberrypi/controller/rpi/agc.h\n+++ b/src/ipa/raspberrypi/controller/rpi/agc.h\n@@ -75,10 +75,6 @@ public:\n Agc(Controller *controller);\n char const *name() const override;\n int read(const libcamera::YamlObject ¶ms) override;\n- /* AGC handles \"pausing\" for itself. */\n- bool isPaused() const override;\n- void pause() override;\n- void resume() override;\n unsigned int getConvergenceFrames() const override;\n void setEv(double ev) override;\n void setFlickerPeriod(libcamera::utils::Duration flickerPeriod) override;\n@@ -88,6 +84,8 @@ public:\n void setMeteringMode(std::string const &meteringModeName) override;\n void setExposureMode(std::string const &exposureModeName) override;\n void setConstraintMode(std::string const &contraintModeName) override;\n+ void enableAuto() override;\n+ void disableAuto() override;\n void switchMode(CameraMode const &cameraMode, Metadata *metadata) override;\n void prepare(Metadata *imageMetadata) override;\n void process(StatisticsPtr &stats, Metadata *imageMetadata) override;\ndiff --git a/src/ipa/raspberrypi/controller/rpi/awb.cpp\nb/src/ipa/raspberrypi/controller/rpi/awb.cpp\nindex 8d8ddf09..4f6af4ba 100644\n--- a/src/ipa/raspberrypi/controller/rpi/awb.cpp\n+++ b/src/ipa/raspberrypi/controller/rpi/awb.cpp\n@@ -222,21 +222,16 @@ void Awb::initialise()\n asyncResults_ = syncResults_;\n }\n\n-bool Awb::isPaused() const\n+void Awb::disableAuto()\n {\n- return false;\n-}\n-\n-void Awb::pause()\n-{\n- /* \"Pause\" by fixing everything to the most recent values. */\n+ /* Freeze the most recent values, and treat them as manual gains */\n manualR_ = syncResults_.gainR = prevSyncResults_.gainR;\n manualB_ = syncResults_.gainB = prevSyncResults_.gainB;\n syncResults_.gainG = prevSyncResults_.gainG;\n syncResults_.temperatureK = prevSyncResults_.temperatureK;\n }\n\n-void Awb::resume()\n+void Awb::enableAuto()\n {\n manualR_ = 0.0;\n manualB_ = 0.0;\ndiff --git a/src/ipa/raspberrypi/controller/rpi/awb.h\nb/src/ipa/raspberrypi/controller/rpi/awb.h\nindex 30acd89d..2254c3ed 100644\n--- a/src/ipa/raspberrypi/controller/rpi/awb.h\n+++ b/src/ipa/raspberrypi/controller/rpi/awb.h\n@@ -93,13 +93,11 @@ public:\n char const *name() const override;\n void initialise() override;\n int read(const libcamera::YamlObject ¶ms) override;\n- /* AWB handles \"pausing\" for itself. */\n- bool isPaused() const override;\n- void pause() override;\n- void resume() override;\n unsigned int getConvergenceFrames() const override;\n void setMode(std::string const &name) override;\n void setManualGains(double manualR, double manualB) override;\n+ void enableAuto() override;\n+ void disableAuto() override;\n void switchMode(CameraMode const &cameraMode, Metadata *metadata) override;\n void prepare(Metadata *imageMetadata) override;\n void process(StatisticsPtr &stats, Metadata *imageMetadata) override;\ndiff --git a/src/ipa/raspberrypi/raspberrypi.cpp\nb/src/ipa/raspberrypi/raspberrypi.cpp\nindex b74f1ecf..beb076dc 100644\n--- a/src/ipa/raspberrypi/raspberrypi.cpp\n+++ b/src/ipa/raspberrypi/raspberrypi.cpp\n@@ -706,7 +706,8 @@ void IPARPi::queueRequest(const ControlList &controls)\n\n switch (ctrl.first) {\n case controls::AE_ENABLE: {\n- RPiController::Algorithm *agc = controller_.getAlgorithm(\"agc\");\n+ RPiController::AgcAlgorithm *agc =\ndynamic_cast<RPiController::AgcAlgorithm *>(\n+ controller_.getAlgorithm(\"agc\"));\n if (!agc) {\n LOG(IPARPI, Warning)\n", "prefixes": [ "libcamera-devel", "1/1" ] }