{"id":10668,"url":"https://patchwork.libcamera.org/api/patches/10668/?format=json","web_url":"https://patchwork.libcamera.org/patch/10668/","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":"<20201215101633.21546-1-naush@raspberrypi.com>","date":"2020-12-15T10:16:32","name":"[libcamera-devel,1/2] ipa: raspberrypi: Rename unicamCtrls_ to sensorCtrls_","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"d6b78e637435a3abe514a377cac6423e03ff1227","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/10668/mbox/","series":[{"id":1534,"url":"https://patchwork.libcamera.org/api/series/1534/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1534","date":"2020-12-15T10:16:32","name":"[libcamera-devel,1/2] ipa: raspberrypi: Rename unicamCtrls_ to sensorCtrls_","version":1,"mbox":"https://patchwork.libcamera.org/series/1534/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10668/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10668/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 01B61BD80A\n\tfor ;\n\tTue, 15 Dec 2020 10:16:40 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 790FB61589;\n\tTue, 15 Dec 2020 11:16:39 +0100 (CET)","from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com\n\t[IPv6:2a00:1450:4864:20::32f])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 71908600FD\n\tfor ;\n\tTue, 15 Dec 2020 11:16:37 +0100 (CET)","by mail-wm1-x32f.google.com with SMTP id k10so16357479wmi.3\n\tfor ;\n\tTue, 15 Dec 2020 02:16:37 -0800 (PST)","from localhost.localdomain ([2a00:1098:3142:14:a00:27ff:fe4d:f6a2])\n\tby smtp.gmail.com with ESMTPSA id\n\ts63sm39801117wms.18.2020.12.15.02.16.35\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 15 Dec 2020 02:16:36 -0800 (PST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=raspberrypi.com header.i=@raspberrypi.com\n\theader.b=\"Y7233wkR\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google;\n\th=from:to:cc:subject:date:message-id:mime-version\n\t:content-transfer-encoding;\n\tbh=XHIjF8pTtfTR+I7MO5gyDSmE2jrPjHp9CjV3PgFMXLI=;\n\tb=Y7233wkRql+LteRTsV2/HK0cVcSaf6svl+bZsmH5izAgXA3KABOsaquaZgycoO0wDA\n\tTzCm+SRQoqIVCDIgxjQtFuvPCxIT/yMzMhXjWdwhzSRaDTj8a9joevpdEmH+433WZbjH\n\tstjvMd8jc7GEtUyPyaaL3NNc0Awtan9Xd1XAJOWdjS2pWkSME1iQ3olZunM/E2d9l826\n\tPgNJK8ZPGkFo9rHPmS96WmKYQzj8Uw7RoSuYJ2Ts2VTMgLyarup3siMaUdT6wCKyrAKG\n\tk+jz7uzGL+Wiw7W7EEXVyehWNhAIYc9pA+V0v9zPOKlH7I/b51+TIkMS0vJFr/AoCVK9\n\tCizg==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version\n\t:content-transfer-encoding;\n\tbh=XHIjF8pTtfTR+I7MO5gyDSmE2jrPjHp9CjV3PgFMXLI=;\n\tb=KH+bnXwtR1AOTabMZpyqbIK73EGFXQmD9yqvKxxiPtsM+bMt4BR7jjdISnlC9gd9Wc\n\tvEQHf5GLeA57+zJvHHGUEdqshYutdz4Jc8LN+ttlwtUvXutGjk1SzbvAo/jitD62Zkh3\n\tqEt6CJNr3zqyr51Xz9O59RZ5cNxF+b28zVg9eaMGyBQfo290MJXnDW6Lu2qwtXOVF9ru\n\tcCDnhEq1TqBecazPAdeEkwSi4hM41Tr6tta+7M2QxL0UOmOit1W3OSUK4NWh0m/ERTjy\n\ty6sPq8/LN63VSG6+HbSx+FGFaaUsPabOha90eeaDJIPCHkWPpsOx7xTGp+QhaBD7ufQ6\n\tY0SA==","X-Gm-Message-State":"AOAM532E6Leez9zE0Ccx3bFOmb05w5M8TV9Ex1ca+H9ifgftMqAZwaCk\n\t7521mcCM0AQB5p62cJBUvJCviFMTyw7Njg==","X-Google-Smtp-Source":"ABdhPJxo8llnC1fcTKHQh/q75I0pGlTvMKCSi6yybgnEPhA0d+BFH+zEQMRDXvY2irsn7cWuCVOOuw==","X-Received":"by 2002:a7b:c385:: with SMTP id\n\ts5mr31815276wmj.170.1608027396674; \n\tTue, 15 Dec 2020 02:16:36 -0800 (PST)","From":"Naushir Patuck ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 15 Dec 2020 10:16:32 +0000","Message-Id":"<20201215101633.21546-1-naush@raspberrypi.com>","X-Mailer":"git-send-email 2.25.1","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH 1/2] ipa: raspberrypi: Rename unicamCtrls_\n\tto sensorCtrls_","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","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"These specific controls are part of the sensor device, so rename them\nappropriately.\n\nSigned-off-by: Naushir Patuck \n---\n src/ipa/raspberrypi/raspberrypi.cpp | 14 +++++++-------\n 1 file changed, 7 insertions(+), 7 deletions(-)","diff":"diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp\nindex a7439bad..5f2e07fd 100644\n--- a/src/ipa/raspberrypi/raspberrypi.cpp\n+++ b/src/ipa/raspberrypi/raspberrypi.cpp\n@@ -113,7 +113,7 @@ private:\n \n \tstd::map buffers_;\n \n-\tControlInfoMap unicamCtrls_;\n+\tControlInfoMap sensorCtrls_;\n \tControlInfoMap ispCtrls_;\n \tControlList libcameraMetadata_;\n \n@@ -177,7 +177,7 @@ int IPARPi::start(const IPAOperationData &data, IPAOperationData *result)\n \t/* SwitchMode may supply updated exposure/gain values to use. */\n \tmetadata.Get(\"agc.status\", agcStatus);\n \tif (agcStatus.shutter_time != 0.0 && agcStatus.analogue_gain != 0.0) {\n-\t\tControlList ctrls(unicamCtrls_);\n+\t\tControlList ctrls(sensorCtrls_);\n \t\tapplyAGC(&agcStatus, ctrls);\n \t\tresult->controls.emplace_back(ctrls);\n \t\tresult->operation |= RPi::IPA_CONFIG_SENSOR;\n@@ -287,7 +287,7 @@ void IPARPi::configure(const CameraSensorInfo &sensorInfo,\n \n \tresult->operation = 0;\n \n-\tunicamCtrls_ = entityControls.at(0);\n+\tsensorCtrls_ = entityControls.at(0);\n \tispCtrls_ = entityControls.at(1);\n \n \t/* Setup a metadata ControlList to output metadata. */\n@@ -364,7 +364,7 @@ void IPARPi::configure(const CameraSensorInfo &sensorInfo,\n \t\tcontrollerInit_ = true;\n \n \t\t/* Supply initial values for gain and exposure. */\n-\t\tControlList ctrls(unicamCtrls_);\n+\t\tControlList ctrls(sensorCtrls_);\n \t\tAgcStatus agcStatus;\n \t\tagcStatus.shutter_time = DefaultExposureTime;\n \t\tagcStatus.analogue_gain = DefaultAnalogueGain;\n@@ -879,7 +879,7 @@ void IPARPi::processStats(unsigned int bufferId)\n \n \tstruct AgcStatus agcStatus;\n \tif (rpiMetadata_.Get(\"agc.status\", agcStatus) == 0) {\n-\t\tControlList ctrls(unicamCtrls_);\n+\t\tControlList ctrls(sensorCtrls_);\n \t\tapplyAGC(&agcStatus, ctrls);\n \n \t\tIPAOperationData op;\n@@ -917,12 +917,12 @@ void IPARPi::applyAGC(const struct AgcStatus *agcStatus, ControlList &ctrls)\n \tint32_t gainCode = helper_->GainCode(agcStatus->analogue_gain);\n \tint32_t exposureLines = helper_->ExposureLines(agcStatus->shutter_time);\n \n-\tif (unicamCtrls_.find(V4L2_CID_ANALOGUE_GAIN) == unicamCtrls_.end()) {\n+\tif (sensorCtrls_.find(V4L2_CID_ANALOGUE_GAIN) == sensorCtrls_.end()) {\n \t\tLOG(IPARPI, Error) << \"Can't find analogue gain control\";\n \t\treturn;\n \t}\n \n-\tif (unicamCtrls_.find(V4L2_CID_EXPOSURE) == unicamCtrls_.end()) {\n+\tif (sensorCtrls_.find(V4L2_CID_EXPOSURE) == sensorCtrls_.end()) {\n \t\tLOG(IPARPI, Error) << \"Can't find exposure control\";\n \t\treturn;\n \t}\n","prefixes":["libcamera-devel","1/2"]}