{"id":17739,"url":"https://patchwork.libcamera.org/api/1.1/patches/17739/?format=json","web_url":"https://patchwork.libcamera.org/patch/17739/","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":"<20221031114522.14215-5-naush@raspberrypi.com>","date":"2022-10-31T11:45:19","name":"[libcamera-devel,v5,4/7] ipa: raspberrypi: Add RPiController::Metadata::mergeCopy","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"6a8535cdbd90b4b94685519208d27aea33fda4f8","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/17739/mbox/","series":[{"id":3590,"url":"https://patchwork.libcamera.org/api/1.1/series/3590/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3590","date":"2022-10-31T11:45:15","name":"Raspberry Pi AGC digital gain fixes","version":5,"mbox":"https://patchwork.libcamera.org/series/3590/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/17739/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/17739/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 6082BC3287\n\tfor ;\n\tMon, 31 Oct 2022 11:45:36 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A73306304D;\n\tMon, 31 Oct 2022 12:45:35 +0100 (CET)","from mail-wr1-x432.google.com (mail-wr1-x432.google.com\n\t[IPv6:2a00:1450:4864:20::432])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 26D1963032\n\tfor ;\n\tMon, 31 Oct 2022 12:45:31 +0100 (CET)","by mail-wr1-x432.google.com with SMTP id a14so15581626wru.5\n\tfor ;\n\tMon, 31 Oct 2022 04:45:31 -0700 (PDT)","from naush-laptop.localdomain ([93.93.133.154])\n\tby smtp.gmail.com with ESMTPSA id\n\th11-20020adff18b000000b0023677e1157fsm6936354wro.56.2022.10.31.04.45.29\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 31 Oct 2022 04:45:29 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1667216735;\n\tbh=QlbSyZb55JOooihaGg2jancKeP/f5baLUDuOMGUyyuI=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=m5F8uDtV1ENXY7zVhypBBV08948D/jtt/ABFcSJYyv5UK/PRDQpB+eKl2fO1JOkSb\n\tGGeBdQE2Z/Sb092iXK/fVRcpBUO9RzWLsa7X+hYK0x+eMINc8elyik6A7qBgIeXohK\n\tA1tYOuXcZPjmLOen9qHSyrA/0WzOLdp2vZ34xEpAb80guygLquBGG023uUdEYSGA2j\n\toySlM9pGnsY1PmvbavwlE9+Nw+D0TbbZKVXvbmd19Lwe7wNCyRzdkv5H8SkcAcSThb\n\thiFv4jLNRvdPkgyXurlZo45rWc6a1fM9j6nnBAM1XJbqnO+Dinl9prbKI8qGUdHfu4\n\tqCRaGoo8nPh+A==","v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:from:to:cc:subject:date\n\t:message-id:reply-to;\n\tbh=yn36HTpXKWZYQWKnBoWmhX3QM0Hd57lWMTJ6qGaKsMY=;\n\tb=UGZIgmqCHxJEqx10cMo4+Qs2nLCn2CKBdn2jTMlIZmaU4stPAbosAiCQx0WqKYjRDd\n\tw8SseGLHbliVoOr/4p+5gzdn9+hW9q/9531B3q35VrRn/78mxOamt34ryIGZfaE11g8k\n\tJkgDgXOTqDczAUMmKlj0O7MSxNmtSvbzrVW9CGuUCpk9IgKSofVfO42k+2/J9AE5wQYn\n\t/owKN0EWxTPhEC2GPF5SycHcJ+oH9TgRuQsgpvL7WxKprt1Eq/PWOknn+y/eZPuamC9R\n\tc7O/EzBPJbG9D29ruReXlD2XHdeJl4smjVzP6QZoFThM3pbs16ErHliEI29fRc0ev5Oh\n\tlI4Q=="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected) header.d=raspberrypi.com\n\theader.i=@raspberrypi.com\n\theader.b=\"UGZIgmqC\"; dkim-atps=neutral","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n\t:subject:date:message-id:reply-to;\n\tbh=yn36HTpXKWZYQWKnBoWmhX3QM0Hd57lWMTJ6qGaKsMY=;\n\tb=msBLdZEcG7L5nn+0XsoYdrZp5lA0PlIyzxbBbwAbVD3wI9Pwag9I6WtY31sTnjTQDc\n\tGa8TSGP6yebdjIts4dFqhgN8pxsBB+xKAG/fDym0gBeGxhGc+vDmE8brOZqUyGU8OzDO\n\tng986pkBtse1YIu+nkfm9U+gmOmU0pcgEiohcBHADRzKQu/MZGkoO/AJWq/QgqdkWaK1\n\tmKIkwXu702K6tQv/H2YeWjwGljWConn4cFQOJsd5CNGO7mOvDtgCNQpHzUtAP15/zljC\n\tWhk4pf6lPNSp/72K8vkhyvPCKSo4+15l3m6uDyPjomCCqm0d82WHbOh11MZzhwPZS/pm\n\tviOA==","X-Gm-Message-State":"ACrzQf1eagUzG5w+T1LWBLh6PmS+2wxeNZOXCVp/uqJp4gKfwgY/3uVf\n\t+GC0qGsmSynH8RDgYrihiZUNC4Zew8tJdQ==","X-Google-Smtp-Source":"AMsMyM6ALfszR/ykSZ0uZxX1zrp0URaFPSBXtAACh1LujF/0XWzLPn99EdF9r3jvgdZfD0TBApgPCw==","X-Received":"by 2002:a05:6000:4086:b0:236:b659:471d with SMTP id\n\tda6-20020a056000408600b00236b659471dmr6336829wrb.563.1667216730394; \n\tMon, 31 Oct 2022 04:45:30 -0700 (PDT)","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 31 Oct 2022 11:45:19 +0000","Message-Id":"<20221031114522.14215-5-naush@raspberrypi.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20221031114522.14215-1-naush@raspberrypi.com>","References":"<20221031114522.14215-1-naush@raspberrypi.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v5 4/7] ipa: raspberrypi: Add\n\tRPiController::Metadata::mergeCopy","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","From":"Naushir Patuck via libcamera-devel\n\t","Reply-To":"Naushir Patuck ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Add a new member function to RPiController::Metadata that copies unique\nkey/value pairs from one object to the other. This is different from\nstd::map::merge that would remove the key/value pairs from the source object.\n\nSigned-off-by: Naushir Patuck \nReviewed-by: Kieran Bingham \n---\n src/ipa/raspberrypi/controller/metadata.h | 10 ++++++++++\n 1 file changed, 10 insertions(+)","diff":"diff --git a/src/ipa/raspberrypi/controller/metadata.h b/src/ipa/raspberrypi/controller/metadata.h\nindex 0f7ebfaf4c25..ddce491784e9 100644\n--- a/src/ipa/raspberrypi/controller/metadata.h\n+++ b/src/ipa/raspberrypi/controller/metadata.h\n@@ -78,6 +78,16 @@ public:\n \t\tdata_.merge(other.data_);\n \t}\n \n+\tvoid mergeCopy(const Metadata &other)\n+\t{\n+\t\tstd::scoped_lock lock(mutex_, other.mutex_);\n+\t\t/*\n+\t\t * If the metadata key exists, ignore this item and copy only\n+\t\t * unique key/value pairs.\n+\t\t */\n+\t\tdata_.insert(other.data_.begin(), other.data_.end());\n+\t}\n+\n \ttemplate\n \tT *getLocked(std::string const &tag)\n \t{\n","prefixes":["libcamera-devel","v5","4/7"]}