Patch Detail
Show a patch.
GET /api/1.1/patches/12172/?format=api
{ "id": 12172, "url": "https://patchwork.libcamera.org/api/1.1/patches/12172/?format=api", "web_url": "https://patchwork.libcamera.org/patch/12172/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20210503104152.34048-4-jacopo@jmondi.org>", "date": "2021-05-03T10:41:38", "name": "[libcamera-devel,v5,03/17] test: control_list: Test ControlList::merge()", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "d1e0a29ae554b1dfef03f05ec3c2417527e90ef0", "submitter": { "id": 3, "url": "https://patchwork.libcamera.org/api/1.1/people/3/?format=api", "name": "Jacopo Mondi", "email": "jacopo@jmondi.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/12172/mbox/", "series": [ { "id": 1994, "url": "https://patchwork.libcamera.org/api/1.1/series/1994/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1994", "date": "2021-05-03T10:41:35", "name": "Support SensorTimestamp metadata", "version": 5, "mbox": "https://patchwork.libcamera.org/series/1994/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/12172/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/12172/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 E9429BDE78\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 3 May 2021 10:41:17 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3E5E2688E4;\n\tMon, 3 May 2021 12:41:14 +0200 (CEST)", "from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net\n\t[217.70.183.199])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 12B7260511\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 3 May 2021 12:41:13 +0200 (CEST)", "from uno.lan (93-34-118-233.ip49.fastwebnet.it [93.34.118.233])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay9-d.mail.gandi.net (Postfix) with ESMTPSA id D4E83FF805\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 3 May 2021 10:41:12 +0000 (UTC)" ], "X-Originating-IP": "93.34.118.233", "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Mon, 3 May 2021 12:41:38 +0200", "Message-Id": "<20210503104152.34048-4-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.31.1", "In-Reply-To": "<20210503104152.34048-1-jacopo@jmondi.org>", "References": "<20210503104152.34048-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v5 03/17] test: control_list: Test\n\tControlList::merge()", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "base64", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Test the ControlList::merge() method by creating a new list and\nmerging it with the existing one.\n\nTest that the merged list contains all the controls, the existing values\ndo not get overwritten and the ones copied are not changed.\n\nReviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\nReviewed-by: Hirokazu Honda <hiroh@chromium.org>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n test/controls/control_list.cpp | 46 ++++++++++++++++++++++++++++++++++\n 1 file changed, 46 insertions(+)", "diff": "diff --git a/test/controls/control_list.cpp b/test/controls/control_list.cpp\nindex 2b321ddd6fa4..70cf61b85cbc 100644\n--- a/test/controls/control_list.cpp\n+++ b/test/controls/control_list.cpp\n@@ -150,6 +150,52 @@ protected:\n \t\t\treturn TestFail;\n \t\t}\n \n+\t\t/*\n+\t\t * Create a new list with a new control and merge it with the\n+\t\t * existing one, verifying that the existing controls\n+\t\t * values don't get overwritten.\n+\t\t */\n+\t\tControlList mergeList(controls::controls, &validator);\n+\t\tmergeList.set(controls::Brightness, 0.7f);\n+\t\tmergeList.set(controls::Saturation, 0.4f);\n+\n+\t\tmergeList.merge(list);\n+\t\tif (mergeList.size() != 3) {\n+\t\t\tcout << \"Merged list should contain three elements\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tif (list.size() != 2) {\n+\t\t\tcout << \"The list to merge should contain two elements\"\n+\t\t\t << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tif (!mergeList.contains(controls::Brightness) ||\n+\t\t !mergeList.contains(controls::Contrast) ||\n+\t\t !mergeList.contains(controls::Saturation)) {\n+\t\t\tcout << \"Merged list does not contain all controls\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tif (mergeList.get(controls::Brightness) != 0.7f) {\n+\t\t\tcout << \"Brightness control value changed after merging lists\"\n+\t\t\t << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tif (mergeList.get(controls::Contrast) != 1.1f) {\n+\t\t\tcout << \"Contrast control value changed after merging lists\"\n+\t\t\t << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tif (mergeList.get(controls::Saturation) != 0.4f) {\n+\t\t\tcout << \"Saturation control value changed after merging lists\"\n+\t\t\t << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n \t\treturn TestPass;\n \t}\n };\n", "prefixes": [ "libcamera-devel", "v5", "03/17" ] }