Patch Detail
Show a patch.
GET /api/1.1/patches/9095/?format=api
{ "id": 9095, "url": "https://patchwork.libcamera.org/api/1.1/patches/9095/?format=api", "web_url": "https://patchwork.libcamera.org/patch/9095/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20200731140801.13253-5-david.plowman@raspberrypi.com>", "date": "2020-07-31T14:08:01", "name": "[libcamera-devel,v2,4/4] libcamera: ipa: raspberrypi: ALSC: Improve behaviour when camera mode changes", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "7458eb22570d3c0d208532ec21c6b1839b530044", "submitter": { "id": 42, "url": "https://patchwork.libcamera.org/api/1.1/people/42/?format=api", "name": "David Plowman", "email": "david.plowman@raspberrypi.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/9095/mbox/", "series": [ { "id": 1169, "url": "https://patchwork.libcamera.org/api/1.1/series/1169/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1169", "date": "2020-07-31T14:07:57", "name": "Raspberry Pi ALSC improvements", "version": 2, "mbox": "https://patchwork.libcamera.org/series/1169/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/9095/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/9095/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 110BCBD86F\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 31 Jul 2020 14:08:14 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9C62A61F0C;\n\tFri, 31 Jul 2020 16:08:13 +0200 (CEST)", "from mail-wr1-x431.google.com (mail-wr1-x431.google.com\n\t[IPv6:2a00:1450:4864:20::431])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2FF9C61EEF\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 31 Jul 2020 16:08:11 +0200 (CEST)", "by mail-wr1-x431.google.com with SMTP id r2so23045750wrs.8\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 31 Jul 2020 07:08:11 -0700 (PDT)", "from pi4-davidp.lan (plowpeople3.plus.com. [80.229.223.72])\n\tby smtp.gmail.com with ESMTPSA id\n\tg126sm12815084wme.16.2020.07.31.07.08.09\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tFri, 31 Jul 2020 07:08:09 -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=\"TkFZ5n7+\"; 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=vr8MqjIF3etQv7i3lRrEg6lcaH4p38YZ64pRJ90aOUs=;\n\tb=TkFZ5n7+JBmCGZdkZQRtu5N4ZGxym2oEVPXKzNctA69vku+q4HPXi9ift4CrswEVzk\n\t3mZjVfKK2U+U3KDEKlM3ozLAhVx8UnHZX5JvrxlhXxtLhXHY+worHsaSSvH5qButLY3n\n\tMYSe7q9QE94VZEdQGfKkG8/czMxxRWL1aR6C74B+WHaHFnroh4jrQqRIATNq9NituVp4\n\t8wqydZjIxv/LWMaDPwYPk2WDb6v2B0fZEuwWD+kc4un0pzWMSSQ75M7YaseJbxsup7Lg\n\tlDtjWDba3GtykSFJhw45EZ3mpU7rKRLXbzTm75oll2ai8i4kkOBF43ASiwcrSmsduASe\n\th26A==", "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=vr8MqjIF3etQv7i3lRrEg6lcaH4p38YZ64pRJ90aOUs=;\n\tb=JQ60dOEk054yRPZlsQcTTaZmi0kIWLBJTvMn/42ABQswFDutvbNecClrnsO0PxytED\n\tYH9/45fB6TL/m9+TK6ki7l91Ny4P61VeFP0TvfKYyxQbE8d9lQA+s76+urCtpErs9osi\n\tsLURbnnDtFGJeAP5UKZXTkCMw2u5d9UsCIO4sG5h0cP6mNzH1eb8mcgeU1JljqlrMfHr\n\tT2lK8qocXE2An/IVcES8nokcW9W4aR1KGNdH+Yg/3rQwXDMqmmXjcEFrchq2jqXseszv\n\tYFqwWK/eFbydU8WyxIRIsyAkMSx960lW1ZkiBtOavnxrLyMAD981aEeasvf9Whqj74gu\n\tN2vw==", "X-Gm-Message-State": "AOAM532R3PBUwh2385TSKu6q254u6zn5Qwr/0OG1AdldT73Eh3gFeeO/\n\tyvesniwiASPruguEGh9savp6A1S9NQAGWg==", "X-Google-Smtp-Source": "ABdhPJy28Ttwdw7mO260IjWq6AW+rJtMiO+Mj5Li6EJ3EEUiPEcUBUSanEHk+htVsL3D78u+uyG4IQ==", "X-Received": "by 2002:a5d:5446:: with SMTP id w6mr3611926wrv.127.1596204490513;\n\tFri, 31 Jul 2020 07:08:10 -0700 (PDT)", "From": "David Plowman <david.plowman@raspberrypi.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 31 Jul 2020 15:08:01 +0100", "Message-Id": "<20200731140801.13253-5-david.plowman@raspberrypi.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20200731140801.13253-1-david.plowman@raspberrypi.com>", "References": "<20200731140801.13253-1-david.plowman@raspberrypi.com>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v2 4/4] libcamera: ipa: raspberrypi: ALSC:\n\tImprove behaviour when camera mode changes", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Now that we stop the asynchronous thread on a SwitchMode, we would do\nbetter to regenerate all the tables if the new camera mode crops in a\nsignificantly different way to the old one. A few minor tweaks make\nsense along with this:\n\n* Reset the lambda values when we reset everything. It wouldn't make\n sense to re-start with the old mode's values.\n\n* Use the last recorded colour temperature to generate new tables rather\n than any default value.\n\n* Set the frame \"phase\" counter to ensure the adaptive procedure will\n run asap.\n\nSigned-off-by: David Plowman <david.plowman@raspberrypi.com>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/ipa/raspberrypi/controller/rpi/alsc.cpp | 54 ++++++++++++++-------\n 1 file changed, 37 insertions(+), 17 deletions(-)", "diff": "diff --git a/src/ipa/raspberrypi/controller/rpi/alsc.cpp b/src/ipa/raspberrypi/controller/rpi/alsc.cpp\nindex 4df9934..6e781bd 100644\n--- a/src/ipa/raspberrypi/controller/rpi/alsc.cpp\n+++ b/src/ipa/raspberrypi/controller/rpi/alsc.cpp\n@@ -166,11 +166,8 @@ void Alsc::Initialise()\n \tRPI_LOG(\"Alsc\");\n \tframe_count2_ = frame_count_ = frame_phase_ = 0;\n \tfirst_time_ = true;\n-\t// Initialise the lambdas. Each call to Process then restarts from the\n-\t// previous results. Also initialise the previous frame tables to the\n-\t// same harmless values.\n-\tfor (int i = 0; i < XY; i++)\n-\t\tlambda_r_[i] = lambda_b_[i] = 1.0;\n+\tct_ = config_.default_ct;\n+\t// The lambdas are initialised in the SwitchMode.\n }\n \n void Alsc::waitForAysncThread()\n@@ -185,31 +182,53 @@ void Alsc::waitForAysncThread()\n \t}\n }\n \n+static bool compare_modes(CameraMode const &cm0, CameraMode const &cm1)\n+{\n+\t// Return true if the modes crop from the sensor significantly differently.\n+\tint left_diff = std::abs(cm0.crop_x - cm1.crop_x);\n+\tint top_diff = std::abs(cm0.crop_y - cm1.crop_y);\n+\tint right_diff = std::abs(cm0.crop_x + cm0.scale_x * cm0.width -\n+\t\t\t\t cm1.crop_x - cm1.scale_x * cm1.width);\n+\tint bottom_diff = std::abs(cm0.crop_y + cm0.scale_y * cm0.height -\n+\t\t\t\t cm1.crop_y - cm1.scale_y * cm1.height);\n+\t// These thresholds are a rather arbitrary amount chosen to trigger\n+\t// when carrying on with the previously calculated tables might be\n+\t// worse than regenerating them (but without the adaptive algorithm).\n+\tint threshold_x = cm0.sensor_width >> 4;\n+\tint threshold_y = cm0.sensor_height >> 4;\n+\treturn left_diff > threshold_x || right_diff > threshold_x ||\n+\t top_diff > threshold_y || bottom_diff > threshold_y;\n+}\n+\n void Alsc::SwitchMode(CameraMode const &camera_mode, Metadata *metadata)\n {\n \t(void)metadata;\n \n+\t// We're going to start over with the tables if there's any \"significant\"\n+\t// change.\n+\tbool reset_tables = first_time_ || compare_modes(camera_mode_, camera_mode);\n+\n \t// Ensure the other thread isn't running while we do this.\n \twaitForAysncThread();\n \n-\t// There's a bit of a question what we should do if the \"crop\" of the\n-\t// camera mode has changed. Should we effectively reset the algorithm\n-\t// and start over?\n \tcamera_mode_ = camera_mode;\n \n \t// We must resample the luminance table like we do the others, but it's\n \t// fixed so we can simply do it up front here.\n \tresample_cal_table(config_.luminance_lut, camera_mode_, luminance_table_);\n \n-\tif (first_time_) {\n-\t\t// On the first time, arrange for something sensible in the\n-\t\t// initial tables. Construct the tables for some default colour\n-\t\t// temperature. This echoes the code in doAlsc, without the\n-\t\t// adaptive algorithm.\n+\tif (reset_tables) {\n+\t\t// Upon every \"table reset\", arrange for something sensible to be\n+\t\t// generated. Construct the tables for the previous recorded colour\n+\t\t// temperature. In order to start over from scratch we initialise\n+\t\t// the lambdas, but the rest of this code then echoes the code in\n+\t\t// doAlsc, without the adaptive algorithm.\n+\t\tfor (int i = 0; i < XY; i++)\n+\t\t\tlambda_r_[i] = lambda_b_[i] = 1.0;\n \t\tdouble cal_table_r[XY], cal_table_b[XY], cal_table_tmp[XY];\n-\t\tget_cal_table(4000, config_.calibrations_Cr, cal_table_tmp);\n+\t\tget_cal_table(ct_, config_.calibrations_Cr, cal_table_tmp);\n \t\tresample_cal_table(cal_table_tmp, camera_mode_, cal_table_r);\n-\t\tget_cal_table(4000, config_.calibrations_Cb, cal_table_tmp);\n+\t\tget_cal_table(ct_, config_.calibrations_Cb, cal_table_tmp);\n \t\tresample_cal_table(cal_table_tmp, camera_mode_, cal_table_b);\n \t\tcompensate_lambdas_for_cal(cal_table_r, lambda_r_,\n \t\t\t\t\t async_lambda_r_);\n@@ -220,6 +239,7 @@ void Alsc::SwitchMode(CameraMode const &camera_mode, Metadata *metadata)\n \t\t\t\t\tconfig_.luminance_strength);\n \t\tmemcpy(prev_sync_results_, sync_results_,\n \t\t sizeof(prev_sync_results_));\n+\t\tframe_phase_ = config_.frame_period; // run the algo again asap\n \t\tfirst_time_ = false;\n \t}\n }\n@@ -265,8 +285,8 @@ void Alsc::restartAsync(StatisticsPtr &stats, Metadata *image_metadata)\n {\n \tRPI_LOG(\"Starting ALSC thread\");\n \t// Get the current colour temperature. It's all we need from the\n-\t// metadata.\n-\tct_ = get_ct(image_metadata, config_.default_ct);\n+\t// metadata. Default to the last CT value (which could be the default).\n+\tct_ = get_ct(image_metadata, ct_);\n \t// We have to copy the statistics here, dividing out our best guess of\n \t// the LSC table that the pipeline applied to them.\n \tAlscStatus alsc_status;\n", "prefixes": [ "libcamera-devel", "v2", "4/4" ] }