Patch Detail
Show a patch.
GET /api/patches/24143/?format=api
{ "id": 24143, "url": "https://patchwork.libcamera.org/api/patches/24143/?format=api", "web_url": "https://patchwork.libcamera.org/patch/24143/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/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": "<20250815135253.2231076-2-barnabas.pocze@ideasonboard.com>", "date": "2025-08-15T13:52:53", "name": "[RFC,v1,2/2] libcamera: pipeline: Construct `DeviceMatch` once", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "9f7b3ae57a867384f472a48a2ea3c54627cca607", "submitter": { "id": 216, "url": "https://patchwork.libcamera.org/api/people/216/?format=api", "name": "Barnabás Pőcze", "email": "barnabas.pocze@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/24143/mbox/", "series": [ { "id": 5385, "url": "https://patchwork.libcamera.org/api/series/5385/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=5385", "date": "2025-08-15T13:52:52", "name": "[RFC,v1,1/2] libcamera: device_enumerator: Take list of entity names in ctor", "version": 1, "mbox": "https://patchwork.libcamera.org/series/5385/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/24143/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/24143/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 BFD06BDCC1\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 15 Aug 2025 13:53:01 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D914769251;\n\tFri, 15 Aug 2025 15:52:59 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2ED2D6924E\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 15 Aug 2025 15:52:57 +0200 (CEST)", "from pb-laptop.local (185.221.141.188.nat.pool.zt.hu\n\t[185.221.141.188])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 08F9B605\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 15 Aug 2025 15:52:01 +0200 (CEST)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"jgysbbaV\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1755265922;\n\tbh=7jytn1H+d+rqefZLP2Q7q8ttS/bkddya3bCe7o2tIsw=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=jgysbbaVBZbieB/1a+p9X73audW88+epWP024otlPOAmaU7a3eBOshC1S63xVM7nK\n\tIC8WKoJxnZQ9NZ3XeUy63NSYzpGK2K+fRZ0EVV7ozVd7y4r9jO6pMgXFp8ts7W2p5q\n\tmqxC+bFhZ8sZ9Wcqm5wrucThbjZ7svJ8nHnGp384=", "From": "=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= <barnabas.pocze@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Subject": "[RFC PATCH v1 2/2] libcamera: pipeline: Construct `DeviceMatch` once", "Date": "Fri, 15 Aug 2025 15:52:53 +0200", "Message-ID": "<20250815135253.2231076-2-barnabas.pocze@ideasonboard.com>", "X-Mailer": "git-send-email 2.50.1", "In-Reply-To": "<20250815135253.2231076-1-barnabas.pocze@ideasonboard.com>", "References": "<20250815135253.2231076-1-barnabas.pocze@ideasonboard.com>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "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>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Most `DeviceMatch` objects are constructed from static data and used\nonce, then thrown away. Instead of doing that, give them static lifetime\nand reuse them on subsequent invocations.\n\nTests using `DeviceMatch` are also converted if possible.\n\nSigned-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>\n---\n src/libcamera/pipeline/imx8-isi/imx8-isi.cpp | 9 ++--\n src/libcamera/pipeline/ipu3/ipu3.cpp | 49 ++++++++++----------\n src/libcamera/pipeline/mali-c55/mali-c55.cpp | 13 +++---\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 20 ++++----\n src/libcamera/pipeline/rpi/pisp/pisp.cpp | 30 ++++++------\n src/libcamera/pipeline/rpi/vc4/vc4.cpp | 4 +-\n src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 2 +-\n src/libcamera/pipeline/vimc/vimc.cpp | 22 ++++-----\n test/camera-sensor.cpp | 2 +-\n test/delayed_controls.cpp | 5 +-\n test/libtest/buffer_source.cpp | 7 +--\n test/media_device/media_device_test.cpp | 2 +-\n test/v4l2_subdevice/v4l2_subdevice_test.cpp | 2 +-\n test/v4l2_videodevice/v4l2_m2mdevice.cpp | 7 +--\n 14 files changed, 93 insertions(+), 81 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp b/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp\nindex 72e055e40..d93c9c2ff 100644\n--- a/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp\n+++ b/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp\n@@ -952,10 +952,11 @@ int PipelineHandlerISI::queueRequestDevice(Camera *camera, Request *request)\n \n bool PipelineHandlerISI::match(DeviceEnumerator *enumerator)\n {\n-\tDeviceMatch dm(\"mxc-isi\");\n-\tdm.add(\"crossbar\");\n-\tdm.add(\"mxc_isi.0\");\n-\tdm.add(\"mxc_isi.0.capture\");\n+\tstatic const DeviceMatch dm(\"mxc-isi\", {\n+\t\t\"crossbar\",\n+\t\t\"mxc_isi.0\",\n+\t\t\"mxc_isi.0.capture\",\n+\t});\n \n \tisiDev_ = acquireMediaDevice(enumerator, dm);\n \tif (!isiDev_)\ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex ad20810e6..49554a705 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -845,31 +845,32 @@ int PipelineHandlerIPU3::queueRequestDevice(Camera *camera, Request *request)\n \n bool PipelineHandlerIPU3::match(DeviceEnumerator *enumerator)\n {\n-\tint ret;\n+\tstatic const DeviceMatch cio2_dm(\"ipu3-cio2\", {\n+\t\t\"ipu3-csi2 0\",\n+\t\t\"ipu3-cio2 0\",\n+\t\t\"ipu3-csi2 1\",\n+\t\t\"ipu3-cio2 1\",\n+\t\t\"ipu3-csi2 2\",\n+\t\t\"ipu3-cio2 2\",\n+\t\t\"ipu3-csi2 3\",\n+\t\t\"ipu3-cio2 3\",\n+\t});\n+\tstatic const DeviceMatch imgu_dm(\"ipu3-imgu\", {\n+\t\t\"ipu3-imgu 0\",\n+\t\t\"ipu3-imgu 0 input\",\n+\t\t\"ipu3-imgu 0 parameters\",\n+\t\t\"ipu3-imgu 0 output\",\n+\t\t\"ipu3-imgu 0 viewfinder\",\n+\t\t\"ipu3-imgu 0 3a stat\",\n+\t\t\"ipu3-imgu 1\",\n+\t\t\"ipu3-imgu 1 input\",\n+\t\t\"ipu3-imgu 1 parameters\",\n+\t\t\"ipu3-imgu 1 output\",\n+\t\t\"ipu3-imgu 1 viewfinder\",\n+\t\t\"ipu3-imgu 1 3a stat\",\n+\t});\n \n-\tDeviceMatch cio2_dm(\"ipu3-cio2\");\n-\tcio2_dm.add(\"ipu3-csi2 0\");\n-\tcio2_dm.add(\"ipu3-cio2 0\");\n-\tcio2_dm.add(\"ipu3-csi2 1\");\n-\tcio2_dm.add(\"ipu3-cio2 1\");\n-\tcio2_dm.add(\"ipu3-csi2 2\");\n-\tcio2_dm.add(\"ipu3-cio2 2\");\n-\tcio2_dm.add(\"ipu3-csi2 3\");\n-\tcio2_dm.add(\"ipu3-cio2 3\");\n-\n-\tDeviceMatch imgu_dm(\"ipu3-imgu\");\n-\timgu_dm.add(\"ipu3-imgu 0\");\n-\timgu_dm.add(\"ipu3-imgu 0 input\");\n-\timgu_dm.add(\"ipu3-imgu 0 parameters\");\n-\timgu_dm.add(\"ipu3-imgu 0 output\");\n-\timgu_dm.add(\"ipu3-imgu 0 viewfinder\");\n-\timgu_dm.add(\"ipu3-imgu 0 3a stat\");\n-\timgu_dm.add(\"ipu3-imgu 1\");\n-\timgu_dm.add(\"ipu3-imgu 1 input\");\n-\timgu_dm.add(\"ipu3-imgu 1 parameters\");\n-\timgu_dm.add(\"ipu3-imgu 1 output\");\n-\timgu_dm.add(\"ipu3-imgu 1 viewfinder\");\n-\timgu_dm.add(\"ipu3-imgu 1 3a stat\");\n+\tint ret;\n \n \tcio2MediaDev_ = acquireMediaDevice(enumerator, cio2_dm);\n \tif (!cio2MediaDev_)\ndiff --git a/src/libcamera/pipeline/mali-c55/mali-c55.cpp b/src/libcamera/pipeline/mali-c55/mali-c55.cpp\nindex 76341ed3f..1d2d48d6d 100644\n--- a/src/libcamera/pipeline/mali-c55/mali-c55.cpp\n+++ b/src/libcamera/pipeline/mali-c55/mali-c55.cpp\n@@ -1630,12 +1630,13 @@ bool PipelineHandlerMaliC55::match(DeviceEnumerator *enumerator)\n \t * The TPG and the downscale pipe are both optional blocks and may not\n \t * be fitted.\n \t */\n-\tDeviceMatch dm(\"mali-c55\");\n-\tdm.add(\"mali-c55 isp\");\n-\tdm.add(\"mali-c55 resizer fr\");\n-\tdm.add(\"mali-c55 fr\");\n-\tdm.add(\"mali-c55 3a stats\");\n-\tdm.add(\"mali-c55 3a params\");\n+\tstatic const DeviceMatch dm(\"mali-c55\", {\n+\t\t\"mali-c55 isp\",\n+\t\t\"mali-c55 resizer fr\",\n+\t\t\"mali-c55 fr\",\n+\t\t\"mali-c55 3a stats\",\n+\t\t\"mali-c55 3a params\",\n+\t});\n \n \tmedia_ = acquireMediaDevice(enumerator, dm);\n \tif (!media_)\ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 81370f4cd..2dc396ed9 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -1362,12 +1362,13 @@ int PipelineHandlerRkISP1::createCamera(MediaEntity *sensor)\n \n bool PipelineHandlerRkISP1::match(DeviceEnumerator *enumerator)\n {\n-\tDeviceMatch dm(\"rkisp1\");\n-\tdm.add(\"rkisp1_isp\");\n-\tdm.add(\"rkisp1_resizer_mainpath\");\n-\tdm.add(\"rkisp1_mainpath\");\n-\tdm.add(\"rkisp1_stats\");\n-\tdm.add(\"rkisp1_params\");\n+\tstatic const DeviceMatch dm(\"rkisp1\", {\n+\t\t\"rkisp1_isp\",\n+\t\t\"rkisp1_resizer_mainpath\",\n+\t\t\"rkisp1_mainpath\",\n+\t\t\"rkisp1_stats\",\n+\t\t\"rkisp1_params\",\n+\t});\n \n \tmedia_ = acquireMediaDevice(enumerator, dm);\n \tif (!media_)\n@@ -1409,9 +1410,10 @@ bool PipelineHandlerRkISP1::match(DeviceEnumerator *enumerator)\n \tparam_->bufferReady.connect(this, &PipelineHandlerRkISP1::paramBufferReady);\n \n \t/* If dewarper is present, create its instance. */\n-\tDeviceMatch dwp(\"dw100\");\n-\tdwp.add(\"dw100-source\");\n-\tdwp.add(\"dw100-sink\");\n+\tstatic const DeviceMatch dwp(\"dw100\", {\n+\t\t\"dw100-source\",\n+\t\t\"dw100-sink\",\n+\t});\n \n \tstd::shared_ptr<MediaDevice> dwpMediaDevice = enumerator->search(dwp);\n \tif (dwpMediaDevice) {\ndiff --git a/src/libcamera/pipeline/rpi/pisp/pisp.cpp b/src/libcamera/pipeline/rpi/pisp/pisp.cpp\nindex 082724c5a..6f244c639 100644\n--- a/src/libcamera/pipeline/rpi/pisp/pisp.cpp\n+++ b/src/libcamera/pipeline/rpi/pisp/pisp.cpp\n@@ -880,10 +880,12 @@ bool PipelineHandlerPiSP::match(DeviceEnumerator *enumerator)\n \t * device nodes due to a sensor subdevice failure.\n \t */\n \tfor (unsigned int i = 0; i < numCfeDevices; i++) {\n-\t\tDeviceMatch cfe(\"rp1-cfe\");\n-\t\tcfe.add(\"rp1-cfe-fe-image0\");\n-\t\tcfe.add(\"rp1-cfe-fe-stats\");\n-\t\tcfe.add(\"rp1-cfe-fe-config\");\n+\t\tstatic const DeviceMatch cfe(\"rp1-cfe\", {\n+\t\t\t\"rp1-cfe-fe-image0\",\n+\t\t\t\"rp1-cfe-fe-stats\",\n+\t\t\t\"rp1-cfe-fe-config\",\n+\t\t});\n+\n \t\tMediaDevice *cfeDevice = acquireMediaDevice(enumerator, cfe);\n \n \t\tif (!cfeDevice) {\n@@ -891,15 +893,17 @@ bool PipelineHandlerPiSP::match(DeviceEnumerator *enumerator)\n \t\t\tbreak;\n \t\t}\n \n-\t\tDeviceMatch isp(\"pispbe\");\n-\t\tisp.add(\"pispbe-input\");\n-\t\tisp.add(\"pispbe-config\");\n-\t\tisp.add(\"pispbe-output0\");\n-\t\tisp.add(\"pispbe-output1\");\n-\t\tisp.add(\"pispbe-tdn_output\");\n-\t\tisp.add(\"pispbe-tdn_input\");\n-\t\tisp.add(\"pispbe-stitch_output\");\n-\t\tisp.add(\"pispbe-stitch_input\");\n+\t\tstatic const DeviceMatch isp(\"pispbe\", {\n+\t\t\t\"pispbe-input\",\n+\t\t\t\"pispbe-config\",\n+\t\t\t\"pispbe-output0\",\n+\t\t\t\"pispbe-output1\",\n+\t\t\t\"pispbe-tdn_output\",\n+\t\t\t\"pispbe-tdn_input\",\n+\t\t\t\"pispbe-stitch_output\",\n+\t\t\t\"pispbe-stitch_input\",\n+\t\t});\n+\n \t\tMediaDevice *ispDevice = acquireMediaDevice(enumerator, isp);\n \n \t\tif (!ispDevice) {\ndiff --git a/src/libcamera/pipeline/rpi/vc4/vc4.cpp b/src/libcamera/pipeline/rpi/vc4/vc4.cpp\nindex 99d43bd0a..7d9e141b3 100644\n--- a/src/libcamera/pipeline/rpi/vc4/vc4.cpp\n+++ b/src/libcamera/pipeline/rpi/vc4/vc4.cpp\n@@ -172,7 +172,7 @@ bool PipelineHandlerVc4::match(DeviceEnumerator *enumerator)\n \t * device nodes due to a sensor subdevice failure.\n \t */\n \tfor (unsigned int i = 0; i < numUnicamDevices; i++) {\n-\t\tDeviceMatch unicam(\"unicam\");\n+\t\tstatic const DeviceMatch unicam(\"unicam\");\n \t\tMediaDevice *unicamDevice = acquireMediaDevice(enumerator, unicam);\n \n \t\tif (!unicamDevice) {\n@@ -180,7 +180,7 @@ bool PipelineHandlerVc4::match(DeviceEnumerator *enumerator)\n \t\t\tcontinue;\n \t\t}\n \n-\t\tDeviceMatch isp(\"bcm2835-isp\");\n+\t\tstatic const DeviceMatch isp(\"bcm2835-isp\");\n \t\tMediaDevice *ispDevice = acquireMediaDevice(enumerator, isp);\n \n \t\tif (!ispDevice) {\ndiff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\nindex 4b5816dfd..fffbbcd2b 100644\n--- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n+++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n@@ -466,8 +466,8 @@ int PipelineHandlerUVC::queueRequestDevice(Camera *camera, Request *request)\n \n bool PipelineHandlerUVC::match(DeviceEnumerator *enumerator)\n {\n+\tstatic const DeviceMatch dm(\"uvcvideo\");\n \tMediaDevice *media;\n-\tDeviceMatch dm(\"uvcvideo\");\n \n \tmedia = acquireMediaDevice(enumerator, dm);\n \tif (!media)\ndiff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp\nindex 07273bd2b..b28a23a13 100644\n--- a/src/libcamera/pipeline/vimc/vimc.cpp\n+++ b/src/libcamera/pipeline/vimc/vimc.cpp\n@@ -464,17 +464,17 @@ int PipelineHandlerVimc::queueRequestDevice(Camera *camera, Request *request)\n \n bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator)\n {\n-\tDeviceMatch dm(\"vimc\");\n-\n-\tdm.add(\"Raw Capture 0\");\n-\tdm.add(\"Raw Capture 1\");\n-\tdm.add(\"RGB/YUV Capture\");\n-\tdm.add(\"Sensor A\");\n-\tdm.add(\"Sensor B\");\n-\tdm.add(\"Debayer A\");\n-\tdm.add(\"Debayer B\");\n-\tdm.add(\"RGB/YUV Input\");\n-\tdm.add(\"Scaler\");\n+\tstatic const DeviceMatch dm(\"vimc\", {\n+\t\t\"Raw Capture 0\",\n+\t\t\"Raw Capture 1\",\n+\t\t\"RGB/YUV Capture\",\n+\t\t\"Sensor A\",\n+\t\t\"Sensor B\",\n+\t\t\"Debayer A\",\n+\t\t\"Debayer B\",\n+\t\t\"RGB/YUV Input\",\n+\t\t\"Scaler\",\n+\t});\n \n \tMediaDevice *media = acquireMediaDevice(enumerator, dm);\n \tif (!media)\ndiff --git a/test/camera-sensor.cpp b/test/camera-sensor.cpp\nindex c30a2212e..77d6cf741 100644\n--- a/test/camera-sensor.cpp\n+++ b/test/camera-sensor.cpp\n@@ -39,7 +39,7 @@ protected:\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tDeviceMatch dm(\"vimc\");\n+\t\tstatic const DeviceMatch dm(\"vimc\");\n \t\tmedia_ = enumerator_->search(dm);\n \t\tif (!media_) {\n \t\t\tcerr << \"Unable to find \\'vimc\\' media device node\" << endl;\ndiff --git a/test/delayed_controls.cpp b/test/delayed_controls.cpp\nindex 7bd30e7ae..4c6d7e226 100644\n--- a/test/delayed_controls.cpp\n+++ b/test/delayed_controls.cpp\n@@ -38,8 +38,9 @@ protected:\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tDeviceMatch dm(\"vivid\");\n-\t\tdm.add(\"vivid-000-vid-cap\");\n+\t\tstatic const DeviceMatch dm(\"vivid\", {\n+\t\t\t\"vivid-000-vid-cap\",\n+\t\t});\n \n \t\tmedia_ = enumerator_->search(dm);\n \t\tif (!media_) {\ndiff --git a/test/libtest/buffer_source.cpp b/test/libtest/buffer_source.cpp\nindex dde11f365..52bae498d 100644\n--- a/test/libtest/buffer_source.cpp\n+++ b/test/libtest/buffer_source.cpp\n@@ -29,7 +29,7 @@ BufferSource::~BufferSource()\n int BufferSource::allocate(const StreamConfiguration &config)\n {\n \t/* Locate and open the video device. */\n-\tstd::string videoDeviceName = \"vivid-000-vid-out\";\n+\tstatic const std::string videoDeviceName = \"vivid-000-vid-out\";\n \n \tstd::unique_ptr<DeviceEnumerator> enumerator =\n \t\tDeviceEnumerator::create();\n@@ -43,8 +43,9 @@ int BufferSource::allocate(const StreamConfiguration &config)\n \t\treturn TestFail;\n \t}\n \n-\tDeviceMatch dm(\"vivid\");\n-\tdm.add(videoDeviceName);\n+\tstatic const DeviceMatch dm(\"vivid\", {\n+\t\tvideoDeviceName,\n+\t});\n \n \tmedia_ = enumerator->search(dm);\n \tif (!media_) {\ndiff --git a/test/media_device/media_device_test.cpp b/test/media_device/media_device_test.cpp\nindex 3e41d0f04..286580450 100644\n--- a/test/media_device/media_device_test.cpp\n+++ b/test/media_device/media_device_test.cpp\n@@ -25,7 +25,7 @@ int MediaDeviceTest::init()\n \t\treturn TestFail;\n \t}\n \n-\tDeviceMatch dm(\"vimc\");\n+\tstatic const DeviceMatch dm(\"vimc\");\n \tmedia_ = enumerator_->search(dm);\n \tif (!media_) {\n \t\tcerr << \"No VIMC media device found: skip test\" << endl;\ndiff --git a/test/v4l2_subdevice/v4l2_subdevice_test.cpp b/test/v4l2_subdevice/v4l2_subdevice_test.cpp\nindex c349c9e31..109965b4d 100644\n--- a/test/v4l2_subdevice/v4l2_subdevice_test.cpp\n+++ b/test/v4l2_subdevice/v4l2_subdevice_test.cpp\n@@ -39,7 +39,7 @@ int V4L2SubdeviceTest::init()\n \t\treturn TestFail;\n \t}\n \n-\tDeviceMatch dm(\"vimc\");\n+\tstatic const DeviceMatch dm(\"vimc\");\n \tmedia_ = enumerator_->search(dm);\n \tif (!media_) {\n \t\tcerr << \"Unable to find \\'vimc\\' media device node\" << endl;\ndiff --git a/test/v4l2_videodevice/v4l2_m2mdevice.cpp b/test/v4l2_videodevice/v4l2_m2mdevice.cpp\nindex c45f581a8..36a3e3201 100644\n--- a/test/v4l2_videodevice/v4l2_m2mdevice.cpp\n+++ b/test/v4l2_videodevice/v4l2_m2mdevice.cpp\n@@ -65,9 +65,10 @@ protected:\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tDeviceMatch dm(\"vim2m\");\n-\t\tdm.add(\"vim2m-source\");\n-\t\tdm.add(\"vim2m-sink\");\n+\t\tstatic const DeviceMatch dm(\"vim2m\", {\n+\t\t\t\"vim2m-source\",\n+\t\t\t\"vim2m-sink\",\n+\t\t});\n \n \t\tmedia_ = enumerator_->search(dm);\n \t\tif (!media_) {\n", "prefixes": [ "RFC", "v1", "2/2" ] }