From patchwork Mon Sep 5 07:39:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 17300 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 7044EC327D for ; Mon, 5 Sep 2022 07:40:09 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 059CB62067; Mon, 5 Sep 2022 09:40:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1662363609; bh=U7rRLgZNVeakhzpRY7gzpK21lH//TwjRw+pO6UfATzU=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=glPjdIuNp0lmXSyIBRUGL6uV6F7XMsk7aXiaPkZYswdyiXt1LTK/9vI9ZLtVk3TIb CI4g2VelbkDlklzaxlfZaiIKZiEq6dWm5oNKMdOc3Hp6pa8QBdu0pqUidLc5APjnhu dd+6nGAQCd0pzBh64RKyWGUxQOfOEgILm0axpFNTYjJEF9a/kkhhuEWZaVzX8CAZ7B YCP6DJted6c6F9BnRZqY/pcENgGbm6ajB0fXHu4LLDekf+rYWC3rQJk4g+Ah/F9G8h 3ahOS5fBZFSV1K0Vvpm/jBhEvNfB/aVpZeFPe7TVw70wUcSOoZ8nOlgaK3W7BS2Kn5 ULpmTEFr/Ph7w== Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 7CDBC62058 for ; Mon, 5 Sep 2022 09:40:06 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="bsXv9JCj"; dkim-atps=neutral Received: by mail-wm1-x334.google.com with SMTP id v7-20020a1cac07000000b003a6062a4f81so7277973wme.1 for ; Mon, 05 Sep 2022 00:40:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=W8bW29zIOyXkNjvwpfgjJZmcaplT23dZq31GBRrrDss=; b=bsXv9JCjyNwv34Sz2Ey7zDI3QNraMutGQ2XnnH017TI8kvrHGlTe4umjB+Lc9mptzc eX6uRxoWv5DbAE5QxiubjxGyz4lq8IxGjhCAN8ARsSsNh4DVOXfakWbM+6dW39T4xoxt BEQCnLlFluMWZmHo7+4bXGmYIIoytSjZCR2hqlRlzMkoXWHPo6uATxQBqhszNzqbaQYU kVj3GTJAF28B80OCl+z83VP5d7gmQ4/AI2xWLop6+rDLKqQsUYQPwt7BRX3zauYRT1Ub rFRKEaAbjmoZKeEtIgZ7jOP+YQZLds4JDAbWcfm3pBnIthft4pCzpB3gxN08HQfdeQK+ +lsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=W8bW29zIOyXkNjvwpfgjJZmcaplT23dZq31GBRrrDss=; b=Rt7UNMBIU3OglcinhcVPKxzz2BFZmXHRVVDMpMsDcM3BSmHw6OXfa8nTyVK64sg9D5 isOnDSp48b6RevMc5bJHid5zoGhRUPm3MUgCSDtljj+zBlBSCSGmeQK+5s1EC6nUZefI fYlSnzwkqXkHFH5aDsYVCqwxOhwY3l2+QuCHNHhCuGM6qA84AnJwBYlmuvfOk+zsADUF S7pU+n+hudOFvKy9KOWhQ2pvSaaWvV+FsJ7hLDahm8LZp15+G/yZ3OZBToDB5WevM4as BTDPY3V7XGETfSbTBmrvwp3TLM/TaPXvggGuZvaibA8ssfXV1w4rIF2GRlHMBa0mzL8p oO4g== X-Gm-Message-State: ACgBeo23GE3wLvGBX+g4vHt4aGhJguixrbzJXSN9IdWLCcJqoCRof/Ys wh79prPHeRgIoma8lmwa+ikpmLPN1/VadcZS X-Google-Smtp-Source: AA6agR59LEvGm9UrPDqinKBKgUQW0iPRvJgHZGbmyGYOfK5/Niy/ip89Rf7Esv/3ALf0dSDUzw4BLw== X-Received: by 2002:a05:600c:4148:b0:3a5:4f94:577b with SMTP id h8-20020a05600c414800b003a54f94577bmr10107956wmm.167.1662363605834; Mon, 05 Sep 2022 00:40:05 -0700 (PDT) Received: from naush-laptop.localdomain ([93.93.133.154]) by smtp.gmail.com with ESMTPSA id v16-20020a5d5910000000b00228a6ce17b4sm1342841wrd.37.2022.09.05.00.40.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Sep 2022 00:40:04 -0700 (PDT) To: libcamera-devel@lists.libcamera.org Date: Mon, 5 Sep 2022 08:39:53 +0100 Message-Id: <20220905073956.7342-5-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220905073956.7342-1-naush@raspberrypi.com> References: <20220905073956.7342-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 4/7] ipa: raspberrypi: Add RPiController::Metadata::mergeCopy X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Naushir Patuck via libcamera-devel From: Naushir Patuck Reply-To: Naushir Patuck Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Add a new member function to RPiController::Metadata that copies unique key/value pairs from one object to the other. This is different from std::map::merge that would remove the key/value pairs from the source object. Signed-off-by: Naushir Patuck --- src/ipa/raspberrypi/controller/metadata.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/ipa/raspberrypi/controller/metadata.h b/src/ipa/raspberrypi/controller/metadata.h index 0f7ebfaf4c25..3816e9f8536d 100644 --- a/src/ipa/raspberrypi/controller/metadata.h +++ b/src/ipa/raspberrypi/controller/metadata.h @@ -78,6 +78,18 @@ public: data_.merge(other.data_); } + void mergeCopy(Metadata &other) + { + std::scoped_lock lock(mutex_, other.mutex_); + for (auto &kv : other.data_) { + /* + * If the metadata key exists, ignore this item and copy + * only unique key/value pairs. + */ + data_.insert(kv); + } + } + template T *getLocked(std::string const &tag) {