From patchwork Wed Jul 1 08:53:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Plowman X-Patchwork-Id: 8526 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 6C19BBFFE2 for ; Wed, 1 Jul 2020 08:54:05 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id DDD8560C56; Wed, 1 Jul 2020 10:54:04 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="KKkvNYKi"; dkim-atps=neutral Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 3EE5A603B3 for ; Wed, 1 Jul 2020 10:54:03 +0200 (CEST) Received: by mail-wr1-x443.google.com with SMTP id z2so689033wrp.2 for ; Wed, 01 Jul 2020 01:54:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=BsO267ETNeS74AYM6aDuR28sGVor9jgljacQk+YQ12o=; b=KKkvNYKio20LIzzesBwwfPg4ybx9N8PA4/vcwP8F+7hlc5V/PMiyNh7oQBjRSrzyRg hBbVplC57Rniq/Naox8TiiwfTMxp4Cih5qhEf8YjBMqHANjZEZwUr3Wf6+2HQu2KxuSO 8kB0/4sxPheQ8maGjP33W0jz1Q4FiBi1TgxT9whFmsZXzjFlDa+MeLLQPTEHuoH5vgn7 CMapZLswuVhL3tqnyRcWTqMDKj0VUfYEnqW24Mjy0S3zMTAMZVXKJp5gPLh09vCLvFDG dqGdZkOWmEfPmEKCNK6kjjN5UUQOUdYBI7IFEWsuAgjABm3z4FHrBQDKfRpGqdRr5yfk eDZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=BsO267ETNeS74AYM6aDuR28sGVor9jgljacQk+YQ12o=; b=UH4+UKAZczXX+wWoU1WS2Hbnta9q3xDtCI3pYzHKPNI3sclTCND9LYTFvE17ZzYl+f i5aaRD8dTAPp9nn3MSDZuDy3k6SsX8k5dDzyw98AwEUOwxyxauoyFcLWm+I7UPL3sBBK gv6jYfUQBmoCOOe415+Hp5pSxfFfns1EDwC2vWjl7WPBMn8RU3IqyWRYLrFNhDrsSOwh TZofWF807i0nmY3eUoCMF25yDAhop3U+O+yftOe0VzkweX+5N+X7SzRZfgob1zKN+fD7 sdNaHcY3kMFKaZQ36QNCaCYAFpv99bBnLUUPeXviggG3FcjFaOAklquziO7L7a+4AqrX AsrA== X-Gm-Message-State: AOAM532d+mahGvFUnIkp4to5LoVZjBVzTByoW8wkzIsFzQDkg6mCiRPq KRwwR1UjLTJZ8mQaronGLUig/EaB+bM= X-Google-Smtp-Source: ABdhPJynMH9IlFmLblQO5EHZJ9k2Rvz2xRDziYsGkYwsVn73P1np8uPsCi+dwrTrWeQxdRx8uErm+w== X-Received: by 2002:adf:8524:: with SMTP id 33mr25532876wrh.366.1593593642240; Wed, 01 Jul 2020 01:54:02 -0700 (PDT) Received: from pi4-davidp.lan (plowpeople3.plus.com. [80.229.223.72]) by smtp.gmail.com with ESMTPSA id 1sm6197348wmf.21.2020.07.01.01.54.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 01:54:01 -0700 (PDT) From: David Plowman To: libcamera-devel@lists.libcamera.org Date: Wed, 1 Jul 2020 09:53:56 +0100 Message-Id: <20200701085356.3626-1-david.plowman@raspberrypi.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] libcamera: ipa: raspberrypi: Enable focus measure without recompile X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Previously output of the focus measure could be enabled without recompiling (because of the RPI_LOGGING_ENABLE macro). Here we disable it in the imx477 tuning, but if re-enabled there it will now be output to the console (much more helpful behaviour). Signed-off-by: David Plowman --- src/ipa/raspberrypi/controller/rpi/focus.cpp | 2 +- src/ipa/raspberrypi/data/imx477.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ipa/raspberrypi/controller/rpi/focus.cpp b/src/ipa/raspberrypi/controller/rpi/focus.cpp index 1e2b649..133ea6f 100644 --- a/src/ipa/raspberrypi/controller/rpi/focus.cpp +++ b/src/ipa/raspberrypi/controller/rpi/focus.cpp @@ -39,7 +39,7 @@ void Focus::Process(StatisticsPtr &stats, Metadata *image_metadata) image_metadata->Set("focus.status", status); if (print_) { uint32_t value = (status.focus_measures[5] + status.focus_measures[6]) / 10; - RPI_LOG("Focus contrast measure: " << value); + std::cout << "Focus contrast measure: " << value << std::endl; } } diff --git a/src/ipa/raspberrypi/data/imx477.json b/src/ipa/raspberrypi/data/imx477.json index 389e8ce..8976e31 100644 --- a/src/ipa/raspberrypi/data/imx477.json +++ b/src/ipa/raspberrypi/data/imx477.json @@ -415,6 +415,6 @@ }, "rpi.focus": { - "print": 1 + "print": 0 } }