{"id":12005,"url":"https://patchwork.libcamera.org/api/patches/12005/?format=json","web_url":"https://patchwork.libcamera.org/patch/12005/","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":"<20210419133451.263733-5-naush@raspberrypi.com>","date":"2021-04-19T13:34:50","name":"[libcamera-devel,v5,4/5] ipa: raspberrypi: Add Merge method to RPiController::Metadata","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"49ce1f6c21c166935e9e9f7ac68cb35b5298799a","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/12005/mbox/","series":[{"id":1950,"url":"https://patchwork.libcamera.org/api/series/1950/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1950","date":"2021-04-19T13:34:46","name":"ipa: raspberrypi: Rate-limit the controller algorithms","version":5,"mbox":"https://patchwork.libcamera.org/series/1950/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12005/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12005/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 D6399BD814\n\tfor ;\n\tMon, 19 Apr 2021 13:35:05 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 930AB68847;\n\tMon, 19 Apr 2021 15:35:04 +0200 (CEST)","from mail-wr1-x429.google.com (mail-wr1-x429.google.com\n\t[IPv6:2a00:1450:4864:20::429])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 45C1668839\n\tfor ;\n\tMon, 19 Apr 2021 15:35:01 +0200 (CEST)","by mail-wr1-x429.google.com with SMTP id j5so33117808wrn.4\n\tfor ;\n\tMon, 19 Apr 2021 06:35:01 -0700 (PDT)","from naush-laptop.pitowers.org\n\t([2a00:1098:3142:15:5363:8f56:4f84:754])\n\tby smtp.gmail.com with ESMTPSA id\n\tk11sm19952238wrx.88.2021.04.19.06.34.59\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 19 Apr 2021 06:35:00 -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=\"WTpkoMh2\"; 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=ByDL9nYy7x4L3Tto/bzy+16JVkmrBlZp1522yVKSnPo=;\n\tb=WTpkoMh2H19oXim9dqh8Y0Z2K2s5qNXE9JeGa6+0v0BbaTdYJoqELK5cUX2qDWoRQo\n\tYrYWG5HEJ+5sYLL1xNVuNuguteHuQ9UKiHJacumk0sg3OJTrgAoixdxwr2x8n1G5LFaU\n\tXMBmhy88EolMarYA6RyFaynSX9QlFAopvdhjtzjZvc17keJinPGxGsr0CB/g94KXynSr\n\tpJ/8m6+5TbgZ/6UAhGD39A6pwzHazxQsil8ZxqpJ+chqz2ORkxpkPhKAStsFeUoy6gb5\n\tBddvPH3dWlqtYDknKyDoDrrzzvXr4cHRvSdgghbxT37+1Oc3kbrsBGo77GqMjDN34s+A\n\tZPqQ==","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=ByDL9nYy7x4L3Tto/bzy+16JVkmrBlZp1522yVKSnPo=;\n\tb=CZD5Eq95sdX1fehXf0fpWc2QpVDPTbG0cqJSz7gx5jx7dVpU70UiDyxmFQ5yazK6ja\n\tWGe+G6+8o146Ebck8ZPvxpcm4WW+EanPP/AGJbY4N8gjG9DamlXFdQd+rl3FhkRtDlg/\n\te2A8oJw3E2Fq5PZNHSjzciuCHjQRYng77Bte+n06iZFjUV+4f/bXUVhHqD/7NXYrulxG\n\tcEIykdwAEFGEu4HOgpKQXUslhpZ1XZbtt3hqHBjf7j/8aFzCV4MrnFxqfvWQyuYp3Elu\n\tlYFYN6dLc3oANO+JBVCtXgnuXo/mseNlXQzVpM8u0Evv590Ml+EtUhKAfY+ReX3jtGss\n\tk64w==","X-Gm-Message-State":"AOAM533oDdL05wscJp4Iph1SpkYgaBP2jdGOi56mKC2iqN86T6Qn0NXU\n\toeFfcnASWDJDsQ1V0ttDnCEtoN9FfU5zrw==","X-Google-Smtp-Source":"ABdhPJzLg57UhnlUg6WTznD5fuvOjOr1Ej5SAtG1we4br5V2HjHr4SLXZSwQmQkbDkEQTU4MRbB2hA==","X-Received":"by 2002:a5d:6d0c:: with SMTP id\n\te12mr14206687wrq.321.1618839300796; \n\tMon, 19 Apr 2021 06:35:00 -0700 (PDT)","From":"Naushir Patuck ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 19 Apr 2021 14:34:50 +0100","Message-Id":"<20210419133451.263733-5-naush@raspberrypi.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20210419133451.263733-1-naush@raspberrypi.com>","References":"<20210419133451.263733-1-naush@raspberrypi.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v5 4/5] ipa: raspberrypi: Add Merge method\n\tto 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 move all\nkey/value pairs between a source and destination metadata object. Once\ncomplete, the source Metadata object will be empty.\n\nSigned-off-by: Naushir Patuck \n---\n src/ipa/raspberrypi/controller/metadata.hpp | 12 ++++++++++++\n 1 file changed, 12 insertions(+)","diff":"diff --git a/src/ipa/raspberrypi/controller/metadata.hpp b/src/ipa/raspberrypi/controller/metadata.hpp\nindex 319f2320fc70..1d3e941b3e52 100644\n--- a/src/ipa/raspberrypi/controller/metadata.hpp\n+++ b/src/ipa/raspberrypi/controller/metadata.hpp\n@@ -75,6 +75,18 @@ public:\n \t\treturn *this;\n \t}\n \n+\tvoid Merge(Metadata &other)\n+\t{\n+\t\tstd::lock_guard lock(mutex_);\n+\t\tstd::lock_guard other_lock(other.mutex_);\n+\n+\t\tfor (auto const &kv: other.data_)\n+\t\t\tdata_[kv.first] = std::move(kv.second);\n+\n+\t\t/* Render the other object as empty now! */\n+\t\tother.data_.clear();\n+\t}\n+\n \ttemplate\n \tT *GetLocked(std::string const &tag)\n \t{\n","prefixes":["libcamera-devel","v5","4/5"]}