Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 18093,
    "url": "https://patchwork.libcamera.org/api/patches/18093/?format=api",
    "web_url": "https://patchwork.libcamera.org/patch/18093/",
    "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": "<20230105043726.679968-8-chenghaoyang@google.com>",
    "date": "2023-01-05T04:37:24",
    "name": "[libcamera-devel,v3,7/9] libcamera: pipeline: virtual: Generate and validate StreamConfigurations",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": false,
    "hash": "ee58210c8ba4f462f31757f7a86ebf59ec2e5aa7",
    "submitter": {
        "id": 117,
        "url": "https://patchwork.libcamera.org/api/people/117/?format=api",
        "name": "Cheng-Hao Yang",
        "email": "chenghaoyang@chromium.org"
    },
    "delegate": null,
    "mbox": "https://patchwork.libcamera.org/patch/18093/mbox/",
    "series": [
        {
            "id": 3700,
            "url": "https://patchwork.libcamera.org/api/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/18093/comments/",
    "check": "pending",
    "checks": "https://patchwork.libcamera.org/api/patches/18093/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 B84C6C322E\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu,  5 Jan 2023 04:38:07 +0000 (UTC)",
            "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 70FD1625E4;\n\tThu,  5 Jan 2023 05:38:07 +0100 (CET)",
            "from mail-pl1-x62b.google.com (mail-pl1-x62b.google.com\n\t[IPv6:2607:f8b0:4864:20::62b])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 425AF625E0\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu,  5 Jan 2023 05:38:03 +0100 (CET)",
            "by mail-pl1-x62b.google.com with SMTP id p24so15732750plw.11\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 04 Jan 2023 20:38:03 -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.38.00\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 04 Jan 2023 20:38:01 -0800 (PST)"
        ],
        "DKIM-Signature": [
            "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1672893487;\n\tbh=APeQXA7xUzqatN2KHkXdArmpDV/MRE+qbbFiX/hrdv8=;\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=23G6OdybxcmqwyYPVYFrt5S9BmPySA+oWuJqcnp1GypJfmOt/kLhnI36HxlX9fdOo\n\tsSvH0l5VKfySDju4tSOiVTcLfb1OeX9OtWjexhJoLcKNkCK1pkLnSFTy0u6tTQ0Ckg\n\tSrH3OHlypZNfejUs0zUb/u5Utxi3o9jVIBUf/zP4a/GhHeKIedghfn28YRzI0ORsbH\n\tzbZBZl7Dd92OjiHs3ILa84bKrApQ590jXvJh56rycfLlXqmiH7SA3gYJ/uIm44DEVF\n\tLdvvApU8AMzPGeDQA1qdscAW225wpI+Xo/UrCSJi6fGhUq3s8snuYhuRE3SJBAmsTb\n\tUWbDRtSeDNjpw==",
            "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=xZUF8kLRelIKfAN12rHK0VQVbiYV9PuXYXL0Rf+v8Rk=;\n\tb=Fi2lJI5kCGbH/7HWTgP9co2eC3tW/3DNU86amBvu+zkExsN3gbWMKYlCznv/PFeFVj\n\tlkTeFS6e2NopgqEEoE9YxyTmuCbM5EmjMRI0rWTCY4l5nMFICRjwFyMbJ0X2PQRu6jfC\n\tnyc19F77u/u0LV3JMGqZppcbBQbVW0bzhkH9Y="
        ],
        "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=chromium.org\n\theader.i=@chromium.org header.b=\"Fi2lJI5k\"; \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=xZUF8kLRelIKfAN12rHK0VQVbiYV9PuXYXL0Rf+v8Rk=;\n\tb=VQ962qSUziS2oR2KhpQ0HylcN8X95b/I8xaM7XUmegN0zXiO3tl2rTSKrHq3EdptC/\n\t9aL+qsP3osArZB6734dYCSCrok0MruPLjyPyTS6z5J8p4eU/ZRxkf4aXzn5L2CjHFyfE\n\twt+81IHpFQktTwd0Ty5qCvaTCKPNfhPrX5Rwg+25Y3JV8XOAR1e+uenSqcwrhiCEQLiz\n\t3DPTK4sxw5e/WMlXpCudU3Bcw+xznB4Q/LyK9eO1Er5qpfwFyhf37txyHeNmJSt00tbc\n\tswOWZe2LIIVJrmugs4cIHz4rBj8f6WOMknaGPMaGta9cP2RBhzqpX0yp/Yq30qnYwKiP\n\t6jGw==",
        "X-Gm-Message-State": "AFqh2kp/fNC04++H1oPD9XQcn5GT6IeowYK0BsD971nyNUznZ9Qpn1g2\n\t/2l/V2YBnK8blmpBg8/dZBKvSYX1dfVwNjHH",
        "X-Google-Smtp-Source": "AMrXdXtErhSQyT6DVZILd0e27UaMzOCyd4pEOUzNGEKs3Diu2aUpVaSg/bPswrloVdWVEXthuPdXOA==",
        "X-Received": "by 2002:a17:902:ccc1:b0:189:5ff5:eb92 with SMTP id\n\tz1-20020a170902ccc100b001895ff5eb92mr66564137ple.39.1672893481480; \n\tWed, 04 Jan 2023 20:38:01 -0800 (PST)",
        "X-Google-Original-From": "Harvey Yang <chenghaoyang@google.com>",
        "To": "libcamera-devel@lists.libcamera.org",
        "Date": "Thu,  5 Jan 2023 04:37:24 +0000",
        "Message-Id": "<20230105043726.679968-8-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 7/9] libcamera: pipeline: virtual:\n\tGenerate and validate StreamConfigurations",
        "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": "Implement the support for Generating and Validating the streams the\nCamera can provide.\n\nCurrently use only one camera with fixed configuration. Will add a\nconfiguration file to specify virtual cameras.\n\nIn |PipelineHandlerVirtual::configure|, nothing needs to be done.\n\nTest the configurations can be generated and reported with cam -I:\n\"\"\"\nbuild/src/apps/cam/cam -c 1 -I\n[45:19:28.901456135] [2611530]  INFO IPAManager ipa_manager.cpp:143\nlibcamera is not installed. Adding\n'/usr/local/google/home/chenghaoyang/cros2/src/third_party/libcamera/build/src\n/ipa' to the IPA search path\n[45:19:28.904364465] [2611530]  INFO Camera camera_manager.cpp:293\nlibcamera v0.0.1+56-4f4554fa-dirty (2022-12-07T06:55:04+00:00)\nUsing camera Virtual0 as cam0\n0: 1920x1080-NV12\n * Pixelformat: NV12 (1280x720)-(1920x1080)/(+1,+1)\n  - 1280x720\n  - 1280x800\n  - 1360x768\n  - 1366x768\n  - 1440x900\n  - 1280x1024\n  - 1536x864\n  - 1280x1080\n  - 1600x900\n  - 1400x1050\n  - 1680x1050\n  - 1920x1080\n\"\"\"\n\nSigned-off-by: Harvey Yang <chenghaoyang@chromium.org>\n---\n src/libcamera/pipeline/virtual/virtual.cpp | 140 +++++++++++++++++++--\n 1 file changed, 132 insertions(+), 8 deletions(-)",
    "diff": "diff --git a/src/libcamera/pipeline/virtual/virtual.cpp b/src/libcamera/pipeline/virtual/virtual.cpp\nindex ba77d757..ef2901e7 100644\n--- a/src/libcamera/pipeline/virtual/virtual.cpp\n+++ b/src/libcamera/pipeline/virtual/virtual.cpp\n@@ -8,6 +8,7 @@\n #include <libcamera/base/log.h>\n \n #include <libcamera/camera.h>\n+#include <libcamera/formats.h>\n \n #include \"libcamera/internal/camera.h\"\n #include \"libcamera/internal/media_device_virtual.h\"\n@@ -20,6 +21,11 @@ LOG_DEFINE_CATEGORY(VIRTUAL)\n class VirtualCameraData : public Camera::Private\n {\n public:\n+\tstruct Resolution {\n+\t\tSize size;\n+\t\tstd::vector<int> frame_rates;\n+\t\tstd::vector<std::string> formats;\n+\t};\n \tVirtualCameraData(PipelineHandler *pipe)\n \t\t: Camera::Private(pipe)\n \t{\n@@ -27,15 +33,22 @@ public:\n \n \t~VirtualCameraData() = default;\n \n+\tstd::vector<Resolution> supportedResolutions_;\n+\n \tStream stream_;\n };\n \n class VirtualCameraConfiguration : public CameraConfiguration\n {\n public:\n-\tVirtualCameraConfiguration();\n+\tstatic constexpr unsigned int kBufferCount = 4; // 4~6\n+\n+\tVirtualCameraConfiguration(VirtualCameraData *data);\n \n \tStatus validate() override;\n+\n+private:\n+\tconst VirtualCameraData *data_;\n };\n \n class PipelineHandlerVirtual : public PipelineHandler\n@@ -58,17 +71,56 @@ public:\n \tbool match(DeviceEnumerator *enumerator) override;\n \n private:\n+\tVirtualCameraData *cameraData(Camera *camera)\n+\t{\n+\t\treturn static_cast<VirtualCameraData *>(camera->_d());\n+\t}\n+\n \tstd::shared_ptr<MediaDeviceVirtual> mediaDeviceVirtual_;\n };\n \n-VirtualCameraConfiguration::VirtualCameraConfiguration()\n-\t: CameraConfiguration()\n+VirtualCameraConfiguration::VirtualCameraConfiguration(VirtualCameraData *data)\n+\t: CameraConfiguration(), data_(data)\n {\n }\n \n CameraConfiguration::Status VirtualCameraConfiguration::validate()\n {\n-\treturn Invalid;\n+\tStatus status = Valid;\n+\n+\tif (config_.empty()) {\n+\t\tLOG(VIRTUAL, Error) << \"Empty config\";\n+\t\treturn Invalid;\n+\t}\n+\n+\t// TODO: check if we should limit |config_.size()|\n+\n+\tSize maxSize;\n+\tfor (const auto &resolution : data_->supportedResolutions_)\n+\t\tmaxSize = std::max(maxSize, resolution.size);\n+\n+\tfor (StreamConfiguration &cfg : config_) {\n+\t\t// TODO: check |cfg.pixelFormat|.\n+\n+\t\tbool found = false;\n+\t\tfor (const auto &resolution : data_->supportedResolutions_) {\n+\t\t\tif (resolution.size.width >= cfg.size.width && resolution.size.height >= cfg.size.height) {\n+\t\t\t\tfound = true;\n+\t\t\t\tbreak;\n+\t\t\t}\n+\t\t}\n+\n+\t\tif (!found) {\n+\t\t\tcfg.size = maxSize;\n+\t\t\tstatus = Adjusted;\n+\t\t}\n+\n+\t\tcfg.setStream(const_cast<Stream *>(&data_->stream_));\n+\n+\t\tcfg.bufferCount = VirtualCameraConfiguration::kBufferCount;\n+\t}\n+\n+\treturn status;\n }\n \n PipelineHandlerVirtual::PipelineHandlerVirtual(CameraManager *manager)\n@@ -79,16 +131,81 @@ PipelineHandlerVirtual::PipelineHandlerVirtual(CameraManager *manager)\n std::unique_ptr<CameraConfiguration> PipelineHandlerVirtual::generateConfiguration(Camera *camera,\n \t\t\t\t\t\t\t\t\t\t   const StreamRoles &roles)\n {\n-\t(void)camera;\n-\t(void)roles;\n-\treturn std::unique_ptr<VirtualCameraConfiguration>(nullptr);\n+\tVirtualCameraData *data = cameraData(camera);\n+\tauto config =\n+\t\tstd::make_unique<VirtualCameraConfiguration>(data);\n+\n+\tif (roles.empty())\n+\t\treturn config;\n+\n+\tSize minSize, sensorResolution;\n+\tfor (const auto &resolution : data->supportedResolutions_) {\n+\t\tif (minSize.isNull() || minSize > resolution.size)\n+\t\t\tminSize = resolution.size;\n+\n+\t\tsensorResolution = std::max(sensorResolution, resolution.size);\n+\t}\n+\n+\tfor (const StreamRole role : roles) {\n+\t\tstd::map<PixelFormat, std::vector<SizeRange>> streamFormats;\n+\t\tunsigned int bufferCount;\n+\t\tPixelFormat pixelFormat;\n+\n+\t\tswitch (role) {\n+\t\tcase StreamRole::StillCapture:\n+\t\t\tpixelFormat = formats::NV12;\n+\t\t\tbufferCount = VirtualCameraConfiguration::kBufferCount;\n+\t\t\tstreamFormats[pixelFormat] = { { minSize, sensorResolution } };\n+\n+\t\t\tbreak;\n+\n+\t\tcase StreamRole::Raw: {\n+\t\t\t// TODO: check\n+\t\t\tpixelFormat = formats::SBGGR10;\n+\t\t\tbufferCount = VirtualCameraConfiguration::kBufferCount;\n+\t\t\tstreamFormats[pixelFormat] = { { minSize, sensorResolution } };\n+\n+\t\t\tbreak;\n+\t\t}\n+\n+\t\tcase StreamRole::Viewfinder:\n+\t\tcase StreamRole::VideoRecording: {\n+\t\t\tpixelFormat = formats::NV12;\n+\t\t\tbufferCount = VirtualCameraConfiguration::kBufferCount;\n+\t\t\tstreamFormats[pixelFormat] = { { minSize, sensorResolution } };\n+\n+\t\t\tbreak;\n+\t\t}\n+\n+\t\tdefault:\n+\t\t\tLOG(VIRTUAL, Error)\n+\t\t\t\t<< \"Requested stream role not supported: \" << role;\n+\t\t\tconfig.reset();\n+\t\t\treturn config;\n+\t\t}\n+\n+\t\tStreamFormats formats(streamFormats);\n+\t\tStreamConfiguration cfg(formats);\n+\t\tcfg.size = sensorResolution;\n+\t\tcfg.pixelFormat = pixelFormat;\n+\t\tcfg.bufferCount = bufferCount;\n+\t\tconfig->addConfiguration(cfg);\n+\t}\n+\n+\tif (config->validate() == CameraConfiguration::Invalid) {\n+\t\tconfig.reset();\n+\t\treturn config;\n+\t}\n+\n+\treturn config;\n }\n \n int PipelineHandlerVirtual::configure(Camera *camera, CameraConfiguration *config)\n {\n \t(void)camera;\n \t(void)config;\n-\treturn -1;\n+\t// Nothing to be done.\n+\treturn 0;\n }\n \n int PipelineHandlerVirtual::exportFrameBuffers(Camera *camera, Stream *stream,\n@@ -124,7 +241,14 @@ bool PipelineHandlerVirtual::match(DeviceEnumerator *enumerator)\n \t(void)enumerator;\n \tmediaDevices_.push_back(mediaDeviceVirtual_);\n \n+\t// TODO: Add virtual cameras according to a config file.\n+\n \tstd::unique_ptr<VirtualCameraData> data = std::make_unique<VirtualCameraData>(this);\n+\n+\tdata->supportedResolutions_.resize(2);\n+\tdata->supportedResolutions_[0] = { .size = Size(1920, 1080), .frame_rates = { 30 }, .formats = { \"YCbCr_420_888\" } };\n+\tdata->supportedResolutions_[1] = { .size = Size(1280, 720), .frame_rates = { 30, 60 }, .formats = { \"YCbCr_420_888\" } };\n+\n \t/* Create and register the camera. */\n \tstd::set<Stream *> streams{ &data->stream_ };\n \tconst std::string id = \"Virtual0\";\n",
    "prefixes": [
        "libcamera-devel",
        "v3",
        "7/9"
    ]
}