{"id":18406,"url":"https://patchwork.libcamera.org/api/1.1/patches/18406/?format=json","web_url":"https://patchwork.libcamera.org/patch/18406/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20230315102300.2265491-5-chenghaoyang@google.com>","date":"2023-03-15T10:22:58","name":"[libcamera-devel,v4,4/6] libcamera: pipeline: virtual: Generate and validate StreamConfigurations","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"b1dbe4e636a7d7a93138192d7f165b67bc70c596","submitter":{"id":117,"url":"https://patchwork.libcamera.org/api/1.1/people/117/?format=json","name":"Cheng-Hao Yang","email":"chenghaoyang@chromium.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/18406/mbox/","series":[{"id":3806,"url":"https://patchwork.libcamera.org/api/1.1/series/3806/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3806","date":"2023-03-15T10:22:54","name":"Virtual pipeline handler","version":4,"mbox":"https://patchwork.libcamera.org/series/3806/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/18406/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/18406/checks/","tags":{},"headers":{"Return-Path":"","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 892D5C329D\n\tfor ;\n\tWed, 15 Mar 2023 10:23:17 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 34B8B62717;\n\tWed, 15 Mar 2023 11:23:17 +0100 (CET)","from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com\n\t[IPv6:2607:f8b0:4864:20::1036])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5D6F86270A\n\tfor ;\n\tWed, 15 Mar 2023 11:23:12 +0100 (CET)","by mail-pj1-x1036.google.com with SMTP id\n\tj3-20020a17090adc8300b0023d09aea4a6so1307923pjv.5\n\tfor ;\n\tWed, 15 Mar 2023 03:23:12 -0700 (PDT)","from chenghaoyang-low.c.googlers.com.com\n\t(112.157.221.35.bc.googleusercontent.com. [35.221.157.112])\n\tby smtp.gmail.com with ESMTPSA id\n\tf11-20020a17090274cb00b001a0450da45csm3262786plt.185.2023.03.15.03.23.09\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 15 Mar 2023 03:23:10 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1678875797;\n\tbh=HUipLLAsOu56sfyzx2B4T69Uh/inoCt+MZJMElAJvFU=;\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=Xhvhune9v+pmKouFAK53auzYrAsCFgoPJdWgFRLYf3tfk+GpMVTDmyImEQZ9nT5Ml\n\tF5rfqcJ9tyfFifLBR4NN4L+RKRmlN6Wbzf3LhNuKsv6yRau3ljMeEbWCFEhHrUv1hh\n\tSB433WgdajxDshr4zh6zhGSwwmfrOJ7Ol6DnkVm8sqQdkPh57cSRpy6S60MoFY+9sq\n\tM8KoXmCxSJxrPpPCMll+T2XR7oJama1ZCtXE9PyYYAVk8GxVPXju85INeqD1VHT9J6\n\tdKncUJszGbOpGPGKtCbmfJHyiZ+dMM0fVR0Sq9/qal3zoLAi0MFCIdrI66/bVK6RxB\n\tYMNXuvxSbHe1w==","v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=chromium.org; s=google; t=1678875791;\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=7qQMFEtbq07W1ElR7VQSKGYfnRAtU6ZCdE527E1pQg8=;\n\tb=eCCOWHrI1DLPvw6F0WHO/eQWFVNpULTR/dT4v7kkgfcGnbGpnGr6G1DC5YzKOTQ87G\n\tIVAd1s/fl7+B2soUCzsD9o17Az7DmopgqVtWgd13hCl8Rx8YwBn2ArhgyF9pFpZzGYkY\n\tBzkD9nG0KGIANU6F37BKUe2CDRTWoXBm/wQuY="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=chromium.org\n\theader.i=@chromium.org header.b=\"eCCOWHrI\"; \n\tdkim-atps=neutral","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112; t=1678875791;\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=7qQMFEtbq07W1ElR7VQSKGYfnRAtU6ZCdE527E1pQg8=;\n\tb=uHx1ozjlMiMk2KXzdWxJgmTrUxS9ZW+TsYsAjwPC/Zp4eyvRcBpAsYStMs05w+Fiwl\n\tA0FxPpswVRvK5cOMK0Z28R+Zw/b/ee3KayFsNEfgGcDJCPz4LOqWJfyjXit3l8/lxUq7\n\tudIoVdJ7N2QtuADxHjou9+BTiqr+sCQHGnpRCqIfyCszpOasdvo+uGTLNk0heG/S3A8q\n\tNxUFFidRuKUPpcec8mt/NMUXwF2vvOYNGV1CMtBbPcs4AgaMdBTHclipAfzlupqfP7aS\n\trfBWus7yL/9gguhxwpUUBGXObYGe5E5SbttZapbQOA4Me2nrBoVqTQdiAu9dFMZfaeSO\n\tmYqA==","X-Gm-Message-State":"AO0yUKXy6RcxwP46+CStNHcIgJZW42Ut1VK2TYaXoDafrsLm1NQDWy0/\n\t8tBxpJQW54ObI5VEmSS0uyi4kwH1HT7zRxoAvh0=","X-Google-Smtp-Source":"AK7set8VGkp66r87LETsvWbU9qXx9XNAwjNzBZBpyxmmlLIKkkQDbsv9qatDiu7CbuyRUiejFVH3vA==","X-Received":"by 2002:a17:903:1106:b0:19d:7a4:4063 with SMTP id\n\tn6-20020a170903110600b0019d07a44063mr2659643plh.46.1678875790682; \n\tWed, 15 Mar 2023 03:23:10 -0700 (PDT)","X-Google-Original-From":"Harvey Yang ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 15 Mar 2023 10:22:58 +0000","Message-Id":"<20230315102300.2265491-5-chenghaoyang@google.com>","X-Mailer":"git-send-email 2.40.0.rc1.284.g88254d51c5-goog","In-Reply-To":"<20230315102300.2265491-1-chenghaoyang@google.com>","References":"<20230315102300.2265491-1-chenghaoyang@google.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v4 4/6] 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":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","From":"Harvey Yang via libcamera-devel ","Reply-To":"Harvey Yang ","Cc":"Harvey Yang ,\n\tHarvey Yang ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"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 \n---\n src/libcamera/pipeline/virtual/virtual.cpp | 141 +++++++++++++++++++--\n 1 file changed, 133 insertions(+), 8 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/virtual/virtual.cpp b/src/libcamera/pipeline/virtual/virtual.cpp\nindex 1d66a60e..b0e6de20 100644\n--- a/src/libcamera/pipeline/virtual/virtual.cpp\n+++ b/src/libcamera/pipeline/virtual/virtual.cpp\n@@ -8,6 +8,7 @@\n #include \n \n #include \n+#include \n \n #include \"libcamera/internal/camera.h\"\n #include \"libcamera/internal/pipeline_handler.h\"\n@@ -19,6 +20,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 frame_rates;\n+\t\tstd::vector formats;\n+\t};\n \tVirtualCameraData(PipelineHandler *pipe)\n \t\t: Camera::Private(pipe)\n \t{\n@@ -26,15 +32,22 @@ public:\n \n \t~VirtualCameraData() = default;\n \n+\tstd::vector 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@@ -55,16 +68,56 @@ public:\n \tint queueRequestDevice(Camera *camera, Request *request) override;\n \n \tbool match(DeviceEnumerator *enumerator) override;\n+\n+private:\n+\tVirtualCameraData *cameraData(Camera *camera)\n+\t{\n+\t\treturn static_cast(camera->_d());\n+\t}\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(&data_->stream_));\n+\n+\t\tcfg.bufferCount = VirtualCameraConfiguration::kBufferCount;\n+\t}\n+\n+\treturn status;\n }\n \n PipelineHandlerVirtual::PipelineHandlerVirtual(CameraManager *manager)\n@@ -75,16 +128,81 @@ PipelineHandlerVirtual::PipelineHandlerVirtual(CameraManager *manager)\n std::unique_ptr 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(nullptr);\n+\tVirtualCameraData *data = cameraData(camera);\n+\tauto config =\n+\t\tstd::make_unique(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> 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@@ -119,7 +237,14 @@ bool PipelineHandlerVirtual::match(DeviceEnumerator *enumerator)\n {\n \t(void)enumerator;\n \n+\t// TODO: Add virtual cameras according to a config file.\n+\n \tstd::unique_ptr data = std::make_unique(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 streams{ &data->stream_ };\n \tconst std::string id = \"Virtual0\";\n","prefixes":["libcamera-devel","v4","4/6"]}