{"id":12238,"url":"https://patchwork.libcamera.org/api/1.1/patches/12238/?format=json","web_url":"https://patchwork.libcamera.org/patch/12238/","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":"<20210510095814.3732400-6-naush@raspberrypi.com>","date":"2021-05-10T09:58:14","name":"[libcamera-devel,v6,5/6] ipa: raspberrypi: Add a Merge method to RPiController::Metadata","commit_ref":"a80db5a72391e8dba60c2dcf20397eb73b379574","pull_url":null,"state":"accepted","archived":false,"hash":"c2fca6e78e72f2d38b4c9646577572f84ca2a518","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/12238/mbox/","series":[{"id":2015,"url":"https://patchwork.libcamera.org/api/1.1/series/2015/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2015","date":"2021-05-10T09:58:09","name":"ipa: raspberrypi: Rate-limit the controller algorithms","version":6,"mbox":"https://patchwork.libcamera.org/series/2015/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12238/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12238/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 B0A89BF829\n\tfor ;\n\tMon, 10 May 2021 09:59:13 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 384B86892C;\n\tMon, 10 May 2021 11:59:13 +0200 (CEST)","from mail-wr1-x435.google.com (mail-wr1-x435.google.com\n\t[IPv6:2a00:1450:4864:20::435])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B3B046891D\n\tfor ;\n\tMon, 10 May 2021 11:59:09 +0200 (CEST)","by mail-wr1-x435.google.com with SMTP id l2so15934191wrm.9\n\tfor ;\n\tMon, 10 May 2021 02:59:09 -0700 (PDT)","from naush-laptop.pitowers.org\n\t([2a00:1098:3142:14:e710:3ec:6dad:dc2])\n\tby smtp.gmail.com with ESMTPSA id\n\ty17sm24767917wrw.90.2021.05.10.02.59.08\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 10 May 2021 02:59:08 -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=\"SWNr9P/Y\"; 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=FEqthfD1opOlgUQvReBRoIm1vl+hGBwXG6rHSbk0IFg=;\n\tb=SWNr9P/YXuB8jE68PEZuscFw1BmuUJ8jKD3Ss64BBlJEWXoVTpg3KQvy97T7R6CNaK\n\tD1/PKx5PtnZyd1Jh6WKphZhummuXlQiDJVEx8A3J4VAYF540xV42RAW9jOkE9HC07E8o\n\tYYoH/NM9BagcEuaC0fBJkEI0tZKcWyoOZrozqHTneUYzWdm09PYzgzeuDNS3FmWmtGkA\n\t7v37ISwN8/SufaI2J8djevgg/L7iOwEZ0ERyK0w7tlUPxnpgxSYRz5lQY3dAptkphS0W\n\tgqB54fWeYAvOjIgK4YOp7eurBid1d6yuG4VAJ/ZX4ZGYFwq+05+t7YUoQnojmvMxu/oW\n\taBLQ==","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=FEqthfD1opOlgUQvReBRoIm1vl+hGBwXG6rHSbk0IFg=;\n\tb=mYAIX3jrCA4GZwPj/nVxgCajuravVM5FENNuRtRF/O+KY2PEO9FRZTaymVw+zrIpfp\n\t8cOoJSRT+Q6Mqh83nbf+zpu2uZsG1hjK+4KoALUd6L3ucyxokLfyKKoF+bRSdJFO+W0R\n\tkaxAeEy3kTkoA8C0RrBLlkwQLI7vYGwkfP1dsqFMKUYcVSsA1yJJccUmoIjONQ0PUraj\n\tyBCfUoqiGcxkXA2vn/rjIOvqDoYlWBBNhVDjFuFRPJJR1yaWIgr91lqs0zeIeq99QnOm\n\tugxBumIzPHqXpaGS2/UQjyOt+WoooZBtVdhz0ocVtkCZQ011wacB7+/8i2qAsPKC5XBs\n\tXCSA==","X-Gm-Message-State":"AOAM532Kx0aRZGhRLS1/hLF1US07P8UTzqAVFrzfCrY6tRtkcrfUVRCi\n\tkoSZDlpLQ5hCg+5ALWMEG3M3C43IjqapgQ==","X-Google-Smtp-Source":"ABdhPJwnXSZnIYD8rj4ZkZ3f7VT7gMti1lplX2dyhn3WrLtc+AuPMhH9t9pCQ4zP9l1zVkRsB0CGKg==","X-Received":"by 2002:adf:e9d0:: with SMTP id\n\tl16mr29531308wrn.191.1620640749275; \n\tMon, 10 May 2021 02:59:09 -0700 (PDT)","From":"Naushir Patuck ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 10 May 2021 10:58:14 +0100","Message-Id":"<20210510095814.3732400-6-naush@raspberrypi.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20210510095814.3732400-1-naush@raspberrypi.com>","References":"<20210510095814.3732400-1-naush@raspberrypi.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v6 5/6] ipa: raspberrypi: Add a Merge\n\tmethod to RPiController::Metadata","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":"Add a new Merge method to the Metadata class. This will merge all unique\nkey/value pairs from a source metadata map to the destination map.\n\nSigned-off-by: Naushir Patuck \nReviewed-by: David Plowman \n---\n src/ipa/raspberrypi/controller/metadata.hpp | 6 ++++++\n 1 file changed, 6 insertions(+)","diff":"diff --git a/src/ipa/raspberrypi/controller/metadata.hpp b/src/ipa/raspberrypi/controller/metadata.hpp\nindex 3a97a5f5c502..fd6aac880bad 100644\n--- a/src/ipa/raspberrypi/controller/metadata.hpp\n+++ b/src/ipa/raspberrypi/controller/metadata.hpp\n@@ -73,6 +73,12 @@ public:\n \t\treturn *this;\n \t}\n \n+\tvoid Merge(Metadata &other)\n+\t{\n+\t\tstd::scoped_lock lock(mutex_, other.mutex_);\n+\t\tdata_.merge(other.data_);\n+\t}\n+\n \ttemplate\n \tT *GetLocked(std::string const &tag)\n \t{\n","prefixes":["libcamera-devel","v6","5/6"]}