{"id":11602,"url":"https://patchwork.libcamera.org/api/1.1/patches/11602/?format=json","web_url":"https://patchwork.libcamera.org/patch/11602/","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":"<20210317100211.1067585-5-naush@raspberrypi.com>","date":"2021-03-17T10:02:08","name":"[libcamera-devel,4/7] ipa: raspberrypi: Move the controller initialise to ipa::init()","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":false,"hash":"339a65b770335c17c05671aacc5767f491a607c2","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/11602/mbox/","series":[{"id":1799,"url":"https://patchwork.libcamera.org/api/1.1/series/1799/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1799","date":"2021-03-17T10:02:06","name":"Raspberry Pi: ipa::init() restructuring","version":1,"mbox":"https://patchwork.libcamera.org/series/1799/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/11602/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/11602/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 38350BD80C\n\tfor ;\n\tWed, 17 Mar 2021 10:02:27 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id CEA6268D79;\n\tWed, 17 Mar 2021 11:02:26 +0100 (CET)","from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com\n\t[IPv6:2a00:1450:4864:20::52d])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A56546084D\n\tfor ;\n\tWed, 17 Mar 2021 11:02:21 +0100 (CET)","by mail-ed1-x52d.google.com with SMTP id bf3so1476120edb.6\n\tfor ;\n\tWed, 17 Mar 2021 03:02:21 -0700 (PDT)","from naush-laptop.patuck.local ([88.97.76.4])\n\tby smtp.gmail.com with ESMTPSA id\n\tp24sm12061179edt.5.2021.03.17.03.02.20\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 17 Mar 2021 03:02:20 -0700 (PDT)"],"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=\"L/W8joOr\"; 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:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=3j3E0s8hAbb5lYiPxB6D4ErMchd8R4yQ+P49/lrs8E8=;\n\tb=L/W8joOr+171BsPkLV1GrjR6sRpaJ5TeW9PzBIHQyZT1qIw/2dOJfnDCSKI0tShkH1\n\tW+kYwbXwQ2kkP9eympQ9+JXN+OoUszurkJPTVj+yR3Od04G7wKWYkxluNufyyal24XDa\n\tYq5Osf9eq4X+0X5vpi1Race7THK2bjEHd2FCnQXvdIIY5tgN4R3MibQ7r3vKJ4YzZjyl\n\tRvoRxVtlaIFYP2smmXxIXXpUwHZ8lP6V/EyFXWzO4pcxWcL5Tq4m/AIQv1rCUlFSA/wl\n\tNBuesZ/RHkurZIRNDWCpwHQWPHpYq+rCeCMSdadTLBju9ERB+uRUY34Z64MwoAAwdtyq\n\tWH2g==","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:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=3j3E0s8hAbb5lYiPxB6D4ErMchd8R4yQ+P49/lrs8E8=;\n\tb=svDnp5nQKjewr3DJlQL8HOnOJ+LYlhahsu7qdcOViEGC/q18/NetjLVAX2kZj95EnN\n\tMcIzxvgQ46B6EmdMjchToIWp4yR+vlGwwy+Jipdu1OMliZXOF1UcXTxGhQ9O73TxN4gL\n\tYkku+Wfese+hWzC1oR6XqZ5lUW7Ci8d9WwJpvvBSR3/leGnlY+MFkkcNwna5RrqGaH4+\n\tmj2ZCYs60kZHd6apLbiMPjg/6K5JJ9YAraFbdVKR2zovHpwa5Xx4PGJk5ps/Vc2r3+lD\n\tusfg4ftLtIWdefYulJ/HOWciLKTlJddyj6zGorA62tIAr6xUt/E/RC4pm0bFhRS6t8Pm\n\trwNg==","X-Gm-Message-State":"AOAM532jIfIy3/XczdfF7gsklheL8k7SWPRQoLIY9m92LPSs/9wjFAWK\n\tSZ3UggcCuVtbrnfmGe4IF845pB7/p54ReA==","X-Google-Smtp-Source":"ABdhPJwa8C/GCAiUcp0NH1ZGwCD6xGy9DIeYCJnp5tDCaxBro3vtmR1LgnAI10VRTPLmvq1j4ux0/Q==","X-Received":"by 2002:aa7:dbd3:: with SMTP id\n\tv19mr40613258edt.314.1615975341096; \n\tWed, 17 Mar 2021 03:02:21 -0700 (PDT)","From":"Naushir Patuck ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 17 Mar 2021 10:02:08 +0000","Message-Id":"<20210317100211.1067585-5-naush@raspberrypi.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20210317100211.1067585-1-naush@raspberrypi.com>","References":"<20210317100211.1067585-1-naush@raspberrypi.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH 4/7] ipa: raspberrypi: Move the controller\n\tinitialise to ipa::init()","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":"The controller initialise is a one-off operation, so move it from\nipa::configure() to ipa::init().\n\nSigned-off-by: Naushir Patuck \n---\n src/ipa/raspberrypi/raspberrypi.cpp | 16 +++++-----------\n 1 file changed, 5 insertions(+), 11 deletions(-)","diff":"diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp\nindex 8a9eb92b39ec..e2db0716b84b 100644\n--- a/src/ipa/raspberrypi/raspberrypi.cpp\n+++ b/src/ipa/raspberrypi/raspberrypi.cpp\n@@ -127,9 +127,6 @@ private:\n \tControlInfoMap ispCtrls_;\n \tControlList libcameraMetadata_;\n \n-\t/* IPA configuration. */\n-\tstd::string tuningFile_;\n-\n \t/* Camera sensor params. */\n \tCameraMode mode_;\n \tCameraMode lastMode_;\n@@ -166,8 +163,6 @@ private:\n \n int IPARPi::init(const IPASettings &settings, ipa::RPi::SensorConfig *sensorConfig)\n {\n-\ttuningFile_ = settings.configurationFile;\n-\n \t/*\n \t * Load the \"helper\" for this sensor. This tells us all the device specific stuff\n \t * that the kernel driver doesn't. We only do this the first time; we don't need\n@@ -193,6 +188,10 @@ int IPARPi::init(const IPASettings &settings, ipa::RPi::SensorConfig *sensorConf\n \tsensorConfig->vblankDelay = vblankDelay;\n \tsensorConfig->sensorMetadata = sensorMetadata;\n \n+\t/* Load the tuning file for this sensor. */\n+\tcontroller_.Read(settings.configurationFile.c_str());\n+\tcontroller_.Initialise();\n+\n \treturn 0;\n }\n \n@@ -374,12 +373,7 @@ int IPARPi::configure(const CameraSensorInfo &sensorInfo,\n \t/* Pass the camera mode to the CamHelper to setup algorithms. */\n \thelper_->SetCameraMode(mode_);\n \n-\tif (!controllerInit_) {\n-\t\t/* Load the tuning file for this sensor. */\n-\t\tcontroller_.Read(tuningFile_.c_str());\n-\t\tcontroller_.Initialise();\n-\t\tcontrollerInit_ = true;\n-\n+\tif (firstStart_) {\n \t\t/* Supply initial values for frame durations. */\n \t\tapplyFrameDurations(defaultMinFrameDuration, defaultMaxFrameDuration);\n \n","prefixes":["libcamera-devel","4/7"]}