Patch Detail
Show a patch.
GET /api/1.1/patches/18091/?format=api
{ "id": 18091, "url": "https://patchwork.libcamera.org/api/1.1/patches/18091/?format=api", "web_url": "https://patchwork.libcamera.org/patch/18091/", "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": "<20230105043726.679968-6-chenghaoyang@google.com>", "date": "2023-01-05T04:37:22", "name": "[libcamera-devel,v3,5/9] libcamera: pipeline: virtual: Add MediaDeviceVirtual", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "c51496d61b399e4ef5d5e66828a6eb37cf908909", "submitter": { "id": 117, "url": "https://patchwork.libcamera.org/api/1.1/people/117/?format=api", "name": "Cheng-Hao Yang", "email": "chenghaoyang@chromium.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/18091/mbox/", "series": [ { "id": 3700, "url": "https://patchwork.libcamera.org/api/1.1/series/3700/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3700", "date": "2023-01-05T04:37:17", "name": "Virtual pipeline handler", "version": 3, "mbox": "https://patchwork.libcamera.org/series/3700/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/18091/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/18091/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 A1221C3291\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 5 Jan 2023 04:38:04 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 20612625EF;\n\tThu, 5 Jan 2023 05:38:04 +0100 (CET)", "from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com\n\t[IPv6:2607:f8b0:4864:20::102d])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C2FCE625EB\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 5 Jan 2023 05:38:00 +0100 (CET)", "by mail-pj1-x102d.google.com with SMTP id v23so38656979pju.3\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 04 Jan 2023 20:38:00 -0800 (PST)", "from chenghaoyang-low.c.googlers.com.com\n\t(46.165.189.35.bc.googleusercontent.com. [35.189.165.46])\n\tby smtp.gmail.com with ESMTPSA id\n\tx23-20020a170902b41700b00188c5f0f9e9sm25015200plr.199.2023.01.04.20.37.58\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 04 Jan 2023 20:37:58 -0800 (PST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1672893484;\n\tbh=MiBEvbXlz+1BGq21sH77k9hUxEq8grZsBfiZJbRKcxU=;\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:Cc:\n\tFrom;\n\tb=FznFSNpl+QAoUc2UHr9lv9vUoB2RZ3tT2mbPjqOQw/uwNDyz7sVTC31SOVOA6Q4Wt\n\tl6gjRYbVrmmngWeTWlSljNchTPHdM8A4Av+sKakqAqszeqQAD4Zr76Obiz2mGlKDB7\n\tum6CqAVoFpG0751sp5GnJJpAskZuJv2DSlHZBJ9q3zeiTSZoKvQxwbxgPWbxQ/WwhP\n\tah7fKsfb9p2KHNYiXV1NUxSsdpkhK70kx2xHCENm1j3b/J1oBzx7DlNxmeH74p3c6p\n\tmg9N/b4ANytTCcLi0D7AzSeQsmgE1zY8vKfQSzdfTj2NbYW46eNx2vDBPd5BJ3yveG\n\tFde86hKgRDB9w==", "v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=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=E+5l/E5dTt8O4fLT9DI1XkChOsHxPPry4q2+/5TrVVc=;\n\tb=mgnmjeTcBGuzyQIdRZ8iFTVtqhALDHFNBNlrK1hBmXuCiVlLFjt4986uaRWtil0wXH\n\tAt1K3ps7t17OX1oBe9hahZ1CXkPudC0vbYfdQox3tCBwY1+LqdezQrspn9A5x82b+mJL\n\tLQKdPnRRYIH7Xz1V6FFRC7G6cIaxKYJaUaWps=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=chromium.org\n\theader.i=@chromium.org header.b=\"mgnmjeTc\"; \n\tdkim-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=E+5l/E5dTt8O4fLT9DI1XkChOsHxPPry4q2+/5TrVVc=;\n\tb=hGFG0FKlraeqU/9K2LsaY4uHdMo/CSZV/ktZ8Bl7O3dWXMNnP1hTb0rSOw9tZf6XQE\n\t+MzwxrolTqShQ+GXvm1p4B/WlfzPn9JqPZuSPdH5aLVUjVBSv5GeS2/VFDEW9JWaCSTg\n\tlbaWQ2qwJkp7gcvkFCEBdhYzNV6eEafY00vD/c6OB+jo6FIIDn/OZ++ewfScpHRNqKd5\n\tdhOMV9gzeffu3jivsjdRDB95HoI4JwCTzdi4t1H5RD9Ke23s9MqBgvcspm9DmraDx0mS\n\tPcSsBMCyrU0hxUBUnWBnQxCv5uiejTg5MJm9n0GIZo2gbAr6hX/Nw2psKKH7Li93f7t6\n\tNuDA==", "X-Gm-Message-State": "AFqh2kpAi/eTSeS+6rht6yDF7heCWPLoN0t3e8q6BkElLQNbmPy/cVrZ\n\t+Z9ynusMtbB4aKdoDvZik6oBW6fosTftEcfL", "X-Google-Smtp-Source": "AMrXdXvheJDHcDMNIN7hvtKw0KqudVs7YWUrGsYtLiJAz+B1uyGIJSYhsqIbViNl5ZBSdt/mOowk9g==", "X-Received": "by 2002:a17:902:ab1a:b0:192:9924:ce7e with SMTP id\n\tik26-20020a170902ab1a00b001929924ce7emr25846518plb.55.1672893479162; \n\tWed, 04 Jan 2023 20:37:59 -0800 (PST)", "X-Google-Original-From": "Harvey Yang <chenghaoyang@google.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 5 Jan 2023 04:37:22 +0000", "Message-Id": "<20230105043726.679968-6-chenghaoyang@google.com>", "X-Mailer": "git-send-email 2.39.0.314.g84b9a713c41-goog", "In-Reply-To": "<20230105043726.679968-1-chenghaoyang@google.com>", "References": "<20230105043726.679968-1-chenghaoyang@google.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v3 5/9] libcamera: pipeline: virtual: Add\n\tMediaDeviceVirtual", "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>", "From": "Harvey Yang via libcamera-devel <libcamera-devel@lists.libcamera.org>", "Reply-To": "Harvey Yang <chenghaoyang@chromium.org>", "Cc": "Harvey Yang <chenghaoyang@google.com>,\n\tHarvey Yang <chenghaoyang@chromium.org>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Add a dummy MediaDeviceVirtual in PipelineHandlerVirtual::match, to\navoid having no MediaDevice in the pipeline handler.\n\nSigned-off-by: Harvey Yang <chenghaoyang@chromium.org>\n---\n include/libcamera/internal/device_enumerator.h | 2 +-\n include/libcamera/internal/pipeline_handler.h | 2 +-\n src/libcamera/pipeline/virtual/virtual.cpp | 9 +++++++--\n 3 files changed, 9 insertions(+), 4 deletions(-)", "diff": "diff --git a/include/libcamera/internal/device_enumerator.h b/include/libcamera/internal/device_enumerator.h\nindex 87a2b5ce..e5eb3e94 100644\n--- a/include/libcamera/internal/device_enumerator.h\n+++ b/include/libcamera/internal/device_enumerator.h\n@@ -41,13 +41,13 @@ public:\n \tvirtual int init() = 0;\n \tvirtual int enumerate() = 0;\n \n+\tvoid addDevice(std::unique_ptr<MediaDeviceBase> media);\n \tstd::shared_ptr<MediaDeviceBase> search(const DeviceMatch &dm);\n \n \tSignal<> devicesAdded;\n \n protected:\n \tstd::unique_ptr<MediaDeviceBase> createDevice(const std::string &deviceNode);\n-\tvoid addDevice(std::unique_ptr<MediaDeviceBase> media);\n \tvoid removeDevice(const std::string &deviceNode);\n \n private:\ndiff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h\nindex 1223b1cb..09004365 100644\n--- a/include/libcamera/internal/pipeline_handler.h\n+++ b/include/libcamera/internal/pipeline_handler.h\n@@ -77,6 +77,7 @@ protected:\n \tvirtual void releaseDevice(Camera *camera);\n \n \tCameraManager *manager_;\n+\tstd::vector<std::shared_ptr<MediaDeviceBase>> mediaDevices_;\n \n private:\n \tvoid unlockMediaDevices();\n@@ -87,7 +88,6 @@ private:\n \tvoid doQueueRequest(Request *request);\n \tvoid doQueueRequests();\n \n-\tstd::vector<std::shared_ptr<MediaDeviceBase>> mediaDevices_;\n \tstd::vector<std::weak_ptr<Camera>> cameras_;\n \n \tstd::queue<Request *> waitingRequests_;\ndiff --git a/src/libcamera/pipeline/virtual/virtual.cpp b/src/libcamera/pipeline/virtual/virtual.cpp\nindex 09583b4e..6221196c 100644\n--- a/src/libcamera/pipeline/virtual/virtual.cpp\n+++ b/src/libcamera/pipeline/virtual/virtual.cpp\n@@ -9,6 +9,7 @@\n \n #include <libcamera/camera.h>\n \n+#include \"libcamera/internal/media_device_virtual.h\"\n #include \"libcamera/internal/pipeline_handler.h\"\n \n namespace libcamera {\n@@ -41,6 +42,9 @@ public:\n \tint queueRequestDevice(Camera *camera, Request *request) override;\n \n \tbool match(DeviceEnumerator *enumerator) override;\n+\n+private:\n+\tstd::shared_ptr<MediaDeviceVirtual> mediaDeviceVirtual_;\n };\n \n VirtualCameraConfiguration::VirtualCameraConfiguration()\n@@ -54,7 +58,7 @@ CameraConfiguration::Status VirtualCameraConfiguration::validate()\n }\n \n PipelineHandlerVirtual::PipelineHandlerVirtual(CameraManager *manager)\n-\t: PipelineHandler(manager)\n+\t: PipelineHandler(manager), mediaDeviceVirtual_(new MediaDeviceVirtual(\"virtual\"))\n {\n }\n \n@@ -104,7 +108,8 @@ int PipelineHandlerVirtual::queueRequestDevice(Camera *camera, Request *request)\n bool PipelineHandlerVirtual::match(DeviceEnumerator *enumerator)\n {\n \t(void)enumerator;\n-\treturn false;\n+\tmediaDevices_.push_back(mediaDeviceVirtual_);\n+\treturn false; // Prevent infinite loops for now\n }\n \n REGISTER_PIPELINE_HANDLER(PipelineHandlerVirtual)\n", "prefixes": [ "libcamera-devel", "v3", "5/9" ] }