{"id":17800,"url":"https://patchwork.libcamera.org/api/1.1/patches/17800/?format=json","web_url":"https://patchwork.libcamera.org/patch/17800/","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":"<20221115090755.2921-9-naush@raspberrypi.com>","date":"2022-11-15T09:07:55","name":"[libcamera-devel,v6,8/8] ipa: raspberrypi: agc: Fix digital gain calculation for manual mode","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"342ab35de37e6524fef1b8522fbe63a33b83cae0","submitter":{"id":34,"url":"https://patchwork.libcamera.org/api/1.1/people/34/?format=json","name":"Naushir Patuck","email":"naush@raspberrypi.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/17800/mbox/","series":[{"id":3609,"url":"https://patchwork.libcamera.org/api/1.1/series/3609/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3609","date":"2022-11-15T09:07:47","name":"Raspberry Pi AGC digital gain fixes","version":6,"mbox":"https://patchwork.libcamera.org/series/3609/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/17800/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/17800/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 4982DBE08B\n\tfor ;\n\tTue, 15 Nov 2022 09:08:12 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D50ED63095;\n\tTue, 15 Nov 2022 10:08:11 +0100 (CET)","from mail-wr1-x434.google.com (mail-wr1-x434.google.com\n\t[IPv6:2a00:1450:4864:20::434])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5742B63089\n\tfor ;\n\tTue, 15 Nov 2022 10:08:07 +0100 (CET)","by mail-wr1-x434.google.com with SMTP id v1so23055638wrt.11\n\tfor ;\n\tTue, 15 Nov 2022 01:08:07 -0800 (PST)","from naush-laptop.localdomain ([93.93.133.154])\n\tby smtp.gmail.com with ESMTPSA id\n\tp25-20020a05600c1d9900b003c64c186206sm15143696wms.16.2022.11.15.01.08.05\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 15 Nov 2022 01:08:05 -0800 (PST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1668503291;\n\tbh=YhIxN2di9TyNXMbx5fMifQcQb3B04ncA8Y/T2+CW3v4=;\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=CCWv0EP9062B61IIsx2KyAm+uQbFUkgLuS8wdUOz2OL5Ud85/0lN7ARgABnIS8Zd3\n\ti9rn9Vq5NBDX4pp/MUOPn+Ck/Wa/l0dWhJhRHANAy1/SphyfhUZRQRwgQAzD5tiNBD\n\twDR3JO1jIDA688xr2qhrlxEPSfSAVR05BeXZbzM74d170qjcAVwI3lZs7yEtaKjj8W\n\twYt0Pb8fUmqEBj+pppKt1j/vajcc86XChHSFXgJXv/Zf4ijOwHOsfh/4A+n4R7nrUW\n\t+lJH6BWmTvm7B1jtagP2vKi8fQyX6tDukzLcFqL5Qi33dYoJ57DjdCaqtOxLPnvNcM\n\tovZ5luZEJr2sg==","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\t:message-id:reply-to;\n\tbh=zdhz+1j/NkLDJJXH7usJMOs+Zyvf3jcELZrgcTTFIAE=;\n\tb=kc+I44djMYwTNTtT3Hb/KU8C6b4ZzYBMlVa6tZmuGyFTWtReRI6ZVZ5EVZG0bP88Nw\n\tEA6Kf1U3HWxAT2RRdtyk3xOGQ/D6+LYq0Mgi8YzjdoiInZTG9R3OZ53Ovme/hHTxmP/M\n\tszTzJbGnzMzLchnUZnV0jyWpzM8nHbkV5KcARJnTTqImUo/CZa+3O2wlKNn1r0xE1Orw\n\tufPWRDysc6MwtMUqbIJueYlciwW+ZdvKBhTR5kgS1v04+SBB+MVW+DvCijO5D1AiQwYD\n\t7iwDQbP1cHanc/e5yrFFTWhM4smz2Vp1whnveeKQ3GXT7r7komVOvJ2JGd9DFJaUngpF\n\tllBA=="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected) header.d=raspberrypi.com\n\theader.i=@raspberrypi.com\n\theader.b=\"kc+I44dj\"; 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:message-id:reply-to;\n\tbh=zdhz+1j/NkLDJJXH7usJMOs+Zyvf3jcELZrgcTTFIAE=;\n\tb=QMVMC1gY3dXuqzu16z1liZr3qx2kfjKtbYm99KBlYKbRuRhaI44GD7ERbe3yKwQL4U\n\tD0SkqScccbeFV4cppsRPRVFkCwVy1DAOHdQ77eYx1ypNPOJsDw2/uuNv5tcZ+bjcQJ1D\n\taxX2La95dN1dkPqEYZmcUWLYQBeA8i6O4MO+ZqyLeefQ51OyrI/oqaZFKr3wZThAqSMu\n\tBZ6YWwVZRTyUnrXML1sq2kgbOotyW/hX4cYjiyh5dsce8li3d7cXKJD/bZqEZ0MVLygf\n\tevsJYSju0i9syftHJ88ltOzBFD31IrCkzGRSWMgKfdkntFlJzp/NUfpCGl4Xbc6HfpR7\n\t9U5A==","X-Gm-Message-State":"ANoB5pkEBdXNLp3Qrz0cjOUU9Yrbo7povWeTQ78DkqrveA1AmHg3guxm\n\tEisaXO+7d9v4cFNoesrXAxvFNkUE1Ry9nA==","X-Google-Smtp-Source":"AA0mqf5eugk5u7ukkFVyUeihFIzhdvHrGdOdnr4AG/lLyy4jWWkcSCg9PDfnGUzH1zs9/IRfenwS3Q==","X-Received":"by 2002:adf:edc6:0:b0:236:6a28:eeda with SMTP id\n\tv6-20020adfedc6000000b002366a28eedamr9778463wro.315.1668503286518; \n\tTue, 15 Nov 2022 01:08:06 -0800 (PST)","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 15 Nov 2022 09:07:55 +0000","Message-Id":"<20221115090755.2921-9-naush@raspberrypi.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20221115090755.2921-1-naush@raspberrypi.com>","References":"<20221115090755.2921-1-naush@raspberrypi.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v6 8/8] 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 \nReviewed-by: Kieran Bingham \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 194171a8bc96..7904f2b696dd 100644\n--- a/src/ipa/raspberrypi/raspberrypi.cpp\n+++ b/src/ipa/raspberrypi/raspberrypi.cpp\n@@ -1028,6 +1028,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.delayContext];\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","v6","8/8"]}