{"id":17797,"url":"https://patchwork.libcamera.org/api/1.1/patches/17797/?format=json","web_url":"https://patchwork.libcamera.org/patch/17797/","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":"<20221115090755.2921-6-naush@raspberrypi.com>","date":"2022-11-15T09:07:52","name":"[libcamera-devel,v6,5/8] ipa: raspberrypi: Add RPiController::Metadata::mergeCopy","commit_ref":null,"pull_url":null,"state":"accepted","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/17797/mbox/","series":[{"id":3609,"url":"https://patchwork.libcamera.org/api/1.1/series/3609/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3609","date":"2022-11-15T09:07:47","name":"Raspberry Pi AGC digital gain fixes","version":6,"mbox":"https://patchwork.libcamera.org/series/3609/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/17797/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/17797/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 90D04BE08B\n\tfor ;\n\tTue, 15 Nov 2022 09:08:10 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4470363088;\n\tTue, 15 Nov 2022 10:08:10 +0100 (CET)","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 B29BD63094\n\tfor ;\n\tTue, 15 Nov 2022 10:08:04 +0100 (CET)","by mail-wr1-x431.google.com with SMTP id z14so22945306wrn.7\n\tfor ;\n\tTue, 15 Nov 2022 01:08:04 -0800 (PST)","from naush-laptop.localdomain ([93.93.133.154])\n\tby smtp.gmail.com with ESMTPSA id\n\tp25-20020a05600c1d9900b003c64c186206sm15143696wms.16.2022.11.15.01.08.03\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 15 Nov 2022 01:08:03 -0800 (PST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1668503290;\n\tbh=s2YTQygTvSeLyPnuHS2nRt//taGrUtun4/B03wSKMcQ=;\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=N2UqrqBazNrcxqR8AK8Hj+acuYhBYIqO8d2RwCc89yj0WV3Sfs2b3o+DCZkIHONYl\n\tNfV2o2pt2MZEfVEL9ch2vIkFLWfMKBSdDFRCDVqXq4CnK9BzjmxEE2hWPINkO4Rv3R\n\twXbkfLvTl84ufgEdULsTUPr2BgNlJ08h6ksh2ArdRzNtq/ptAHd9gIeH4jq/cWJITB\n\tI0avyAVzDvSY3JQWT8AWfQ/iLayORFFDU8j4aPG/9xDth6r3ncKKOs9A4cF+3SRBla\n\trrYZtJaPtjbrLaBge81OGvwjy008V2ykceVW9ugyQ2B7NDjWnu8c8G8zq/TODQ6lAU\n\toeR9tzQEJTUmQ==","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=U1yeWuA5xm3xCJOhL9gRZMk/o1jcW8BC8T8GrBzPs80=;\n\tb=OicspHLjy7TfH0tH5RathjH5fnXbaIoDIpYvTk559N6oc5vNK4NZM07pfLjyL0coRg\n\tdAqHEluOjSd/meUvj/zQ0/06jTqSTp2iwdy1AccDh2L5iDzUawZHj71ee+nPrVRQ0+ss\n\tZI12eupJ/hnIQb6DwVmGu5o6wv6l7iBYvOqHL5li4JQUlakc8c/g+IirFjkGNYl4/zt6\n\tBatde4Gf5oPuOWDuu8aVThRl3dqAt3icxYNOjmzwUM6XcIDah3aCtQTeI+F9dHGVuWgH\n\tgVpF0psZ+BNt5ThzOZsJRr1SbWUvTwpj8CB4ab+0dqnpdyALZaAA0fY3lHOlHi+Pme9T\n\tceBw=="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected) header.d=raspberrypi.com\n\theader.i=@raspberrypi.com\n\theader.b=\"OicspHLj\"; 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=U1yeWuA5xm3xCJOhL9gRZMk/o1jcW8BC8T8GrBzPs80=;\n\tb=wuxX59nZsBko7hI+qivM11K7to9z32marehTCg5lkc2XrYoLMIqN/PM3n1SHlvTZWJ\n\ttO1W9HUxBSAT2vXQyfr0RmHtuUU1u4mtzfkTvmPCXAMlqOUcIEzkrL4jCmj+nX2AQsV1\n\tAJ/3qjOoVlQ0Q0Ik6crSAKATLutknoI+PF32XAgBPzroEWXYlLh1wzPqyv1kVhz5ZJNK\n\tvoTiRLtFGuTwkQT+ZzSEjfHmSuYsMv5RPIGOSepaabejP3pOfcl3k/uc/JgY6YLq/VLN\n\t1S5iaHg19HOKtKC3DXmY3UA8WxEIrKsQcf16uRk+W6L9TrPka0pn2FfsBYEydaA8oIE0\n\tAWNw==","X-Gm-Message-State":"ANoB5pmOZzTHGT0PEJKqdDl5SS0Qe26svb2XUo5JEV9Gw2P4rdhydCzP\n\tn/JCxp9xAkXanuyCZ1DIpQ+0TwmI48mJUg==","X-Google-Smtp-Source":"AA0mqf5Yjpiy1UQK1tGn7OBxFiqjRIuZ5+neWAji8wUYJQoYA6jJPd09pisku+Pb30UnR97vhm6qxw==","X-Received":"by 2002:a5d:4051:0:b0:236:715c:aaa6 with SMTP id\n\tw17-20020a5d4051000000b00236715caaa6mr9815435wrp.25.1668503284068; \n\tTue, 15 Nov 2022 01:08:04 -0800 (PST)","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 15 Nov 2022 09:07:52 +0000","Message-Id":"<20221115090755.2921-6-naush@raspberrypi.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20221115090755.2921-1-naush@raspberrypi.com>","References":"<20221115090755.2921-1-naush@raspberrypi.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v6 5/8] 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 \nReviewed-by: David Plowman \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","v6","5/8"]}