{"id":17404,"url":"https://patchwork.libcamera.org/api/patches/17404/?format=json","web_url":"https://patchwork.libcamera.org/patch/17404/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20220926095737.30506-8-naush@raspberrypi.com>","date":"2022-09-26T09:57:37","name":"[libcamera-devel,v3,7/7] ipa: raspberrypi: agc: Fix digital gain calculation for manual mode","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"a788fb6f5712ca46ca629897c275607579ad195b","submitter":{"id":34,"url":"https://patchwork.libcamera.org/api/people/34/?format=json","name":"Naushir Patuck","email":"naush@raspberrypi.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/17404/mbox/","series":[{"id":3503,"url":"https://patchwork.libcamera.org/api/series/3503/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3503","date":"2022-09-26T09:57:30","name":"Raspberry Pi AGC digital gain fixes","version":3,"mbox":"https://patchwork.libcamera.org/series/3503/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/17404/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/17404/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 1582EBD16B\n\tfor ;\n\tMon, 26 Sep 2022 09:58:17 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B74F562264;\n\tMon, 26 Sep 2022 11:58:16 +0200 (CEST)","from mail-wm1-x336.google.com (mail-wm1-x336.google.com\n\t[IPv6:2a00:1450:4864:20::336])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id F0B0B62260\n\tfor ;\n\tMon, 26 Sep 2022 11:58:14 +0200 (CEST)","by mail-wm1-x336.google.com with SMTP id o5so4120291wms.1\n\tfor ;\n\tMon, 26 Sep 2022 02:58:14 -0700 (PDT)","from naush-laptop.localdomain ([93.93.133.154])\n\tby smtp.gmail.com with ESMTPSA id\n\tp22-20020a05600c419600b003a4efb794d7sm10160671wmh.36.2022.09.26.02.58.12\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 26 Sep 2022 02:58:13 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1664186296;\n\tbh=lWX/rkuLsVjrzcRtKwbMiibWwShPlxC4AofWEXu6Um8=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=ROYdOxa6DQ1Qz/Vl+F/DolGwvBY307ZeIJa2yJKQMKHd33u//5omx4TTRAhjTJCUE\n\tZz5k6yV4wOjRHEMaJ4eVpY3I6l+jjp5JRfCAKyLARmJ3z3COiKOzNtX4mhRXmAY+CD\n\t3POqDBr1zlCSitWtwhQDNxcnnn5i7nM6CODhFnbiMFKBGZvZksgAUmWiQdoG4Jr4p1\n\tzvWf9hPSrpzCorj1uZyBiSMZO4Z8Cl4dpkTJk/ffF3z9W8wO2lFh5fsUCsbuX33iUO\n\tSQJDPSMzs7fdRY+PhkHr81Kjtn20Y+vci/kRXqg3oKdwI6s9T2RS3aC/j6CGrDSjE9\n\tI3ZtM3rAeefmA==","v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:from:to:cc:subject:date;\n\tbh=tnUgZJUKUkP6fVcpYTtvEJuRHxAYGbHl5Vo84ysJuZ0=;\n\tb=LkvvOlavcUaz5TBUmbgk9ugD0KrkhgERaHS0RABX9TiPq8O3Fhg1c7EitCONhdtzVN\n\t+aDKHT1WS7+O5q/Ovv6qdh8WjnaXVuv6FTtewFn715MEIUyNu4CZlwhDqstqQtlcPfxp\n\tILkYcj5DOwJKJ4++k+ueoxnZcBPypKJ5KGwU5kEBblRAWnN5reWpdZftqCYUrhwyySVc\n\tJl5Z+FZ8QdrDj40LYRNHPgEa+PpYyaI6RMYWfdsaYF8g4A6R4xPEqnwywK4I+y4hoiXf\n\ty95dKoCutTeSuiIR6noLzE9/1YWUI8UE9SY9EOwv7dpe0fTHmTBvbdBaWdvrsgpJryo8\n\tOO3Q=="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected) header.d=raspberrypi.com\n\theader.i=@raspberrypi.com\n\theader.b=\"LkvvOlav\"; dkim-atps=neutral","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n\t:subject:date;\n\tbh=tnUgZJUKUkP6fVcpYTtvEJuRHxAYGbHl5Vo84ysJuZ0=;\n\tb=RupjxvxRWv1WpQE3k51TzLBgg9QGRPJjSbioh+hXucS7ocLcZzJ3ffQSbGWSBCJoDU\n\tlmav/M0eXbtt0KfIUekrB/v1QyuKeAsgzdHA/TQaqOFKOgFVYmS4SGGuXJb2Ie69nmVy\n\tjgPsny3foBoXRL5rAIXxJGu1TxuubFRsrrx8Hhz0g4C66Xb5IwlCUI2AHBN0Ay89Yxbe\n\t7NlY5DoqyMNNFa6rgXf21hcrTvCKabKhKZY8usBdZXedlXEgiGDI2sI6zQpA25Eu93QW\n\tMyI3pR++AeYxmQCQzunXbzD+c0Bewo2fBUPiOJxeAHPpnUSOz7LR/C8Txw6YRFtP8bBf\n\tYBNg==","X-Gm-Message-State":"ACrzQf2JasWxJBOHjZ1wtLKKcw5idLdcVeevM75zB1x2bJSAFBqTRjmQ\n\tINi6FIJr8pVCAXbscT6IdTWKe/4BDDDp5AoY","X-Google-Smtp-Source":"AMsMyM4+3yet6Bj+D9suthFGcX1HkjdmmE1SRwF/ndrIDy21hrsw+JsTp4G0/qfVb4qOCqJubb+ufA==","X-Received":"by 2002:a7b:c392:0:b0:3b4:acef:3523 with SMTP id\n\ts18-20020a7bc392000000b003b4acef3523mr14843407wmj.37.1664186294440; \n\tMon, 26 Sep 2022 02:58:14 -0700 (PDT)","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 26 Sep 2022 10:57:37 +0100","Message-Id":"<20220926095737.30506-8-naush@raspberrypi.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20220926095737.30506-1-naush@raspberrypi.com>","References":"<20220926095737.30506-1-naush@raspberrypi.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 7/7] ipa: raspberrypi: agc: Fix digital\n\tgain calculation for manual mode","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","From":"Naushir Patuck via libcamera-devel\n\t","Reply-To":"Naushir Patuck ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The digital gain calculation uses a total exposure value computed with the\ncurrent AGC state. However, this is wrong in the case of manual shutter/gain\ncontrols, as the total exposure value used must be the value computed when the\nAGC sent the manual shutter/gain controls to the pipeline handler to action.\n\nTo fix this, the IPA now adds the historical AgcStatus structure to the metadata\n(tagged with \"agc.delayed_status\"). This historical AgcStatus structure contains\nthe total exposure value calculated when the AGC sent the manual shutter/gain\ncontrols to the pipeline handler.\n\nSigned-off-by: Naushir Patuck \nReviewed-by: David Plowman \nTested-by: David Plowman \n---\n src/ipa/raspberrypi/controller/rpi/agc.cpp | 10 ++++++++--\n src/ipa/raspberrypi/raspberrypi.cpp | 11 +++++++++++\n 2 files changed, 19 insertions(+), 2 deletions(-)","diff":"diff --git a/src/ipa/raspberrypi/controller/rpi/agc.cpp b/src/ipa/raspberrypi/controller/rpi/agc.cpp\nindex bd54a639d637..b18bd7b5b19e 100644\n--- a/src/ipa/raspberrypi/controller/rpi/agc.cpp\n+++ b/src/ipa/raspberrypi/controller/rpi/agc.cpp\n@@ -408,6 +408,12 @@ void Agc::switchMode(CameraMode const &cameraMode,\n \n void Agc::prepare(Metadata *imageMetadata)\n {\n+\tDuration totalExposureValue = status_.totalExposureValue;\n+\tAgcStatus delayedStatus;\n+\n+\tif (!imageMetadata->get(\"agc.delayed_status\", delayedStatus))\n+\t\ttotalExposureValue = delayedStatus.totalExposureValue;\n+\n \tstatus_.digitalGain = 1.0;\n \tfetchAwbStatus(imageMetadata); /* always fetch it so that Process knows it's been done */\n \n@@ -418,8 +424,8 @@ void Agc::prepare(Metadata *imageMetadata)\n \t\t\tDuration actualExposure = deviceStatus.shutterSpeed *\n \t\t\t\t\t\t deviceStatus.analogueGain;\n \t\t\tif (actualExposure) {\n-\t\t\t\tstatus_.digitalGain = status_.totalExposureValue / actualExposure;\n-\t\t\t\tLOG(RPiAgc, Debug) << \"Want total exposure \" << status_.totalExposureValue;\n+\t\t\t\tstatus_.digitalGain = totalExposureValue / actualExposure;\n+\t\t\t\tLOG(RPiAgc, Debug) << \"Want total exposure \" << totalExposureValue;\n \t\t\t\t/*\n \t\t\t\t * Never ask for a gain < 1.0, and also impose\n \t\t\t\t * some upper limit. Make it customisable?\ndiff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp\nindex 0e80ef9c7b95..bc438e99eff6 100644\n--- a/src/ipa/raspberrypi/raspberrypi.cpp\n+++ b/src/ipa/raspberrypi/raspberrypi.cpp\n@@ -1025,6 +1025,17 @@ void IPARPi::prepareISP(const ISPConfig &data)\n \t\tembeddedBuffer = it->second.planes()[0];\n \t}\n \n+\t/*\n+\t * AGC wants to know the algorithm status from the time it actioned the\n+\t * sensor exposure/gain changes. So fetch it from the metadata list\n+\t * indexed by the IPA cookie returned, and put it in the current frame\n+\t * metadata.\n+\t */\n+\tAgcStatus agcStatus;\n+\tRPiController::Metadata &delayedMetadata = rpiMetadata_[data.ipaCookie];\n+\tif (!delayedMetadata.get(\"agc.status\", agcStatus))\n+\t\trpiMetadata.set(\"agc.delayed_status\", agcStatus);\n+\n \t/*\n \t * This may overwrite the DeviceStatus using values from the sensor\n \t * metadata, and may also do additional custom processing.\n","prefixes":["libcamera-devel","v3","7/7"]}