Patch Detail

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

{
    "id": 15353,
    "url": "https://patchwork.libcamera.org/api/1.1/patches/15353/?format=api",
    "web_url": "https://patchwork.libcamera.org/patch/15353/",
    "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": "<20220209071917.559993-9-hanlinchen@chromium.org>",
    "date": "2022-02-09T07:19:16",
    "name": "[libcamera-devel,8/9] libcamera: ipu3: Support PipelineConfigFile option",
    "commit_ref": null,
    "pull_url": null,
    "state": "new",
    "archived": false,
    "hash": "c619efec06ffd12a50550b640e4f64c37af7a8b4",
    "submitter": {
        "id": 98,
        "url": "https://patchwork.libcamera.org/api/1.1/people/98/?format=api",
        "name": "Hanlin Chen",
        "email": "hanlinchen@chromium.org"
    },
    "delegate": null,
    "mbox": "https://patchwork.libcamera.org/patch/15353/mbox/",
    "series": [
        {
            "id": 2923,
            "url": "https://patchwork.libcamera.org/api/1.1/series/2923/?format=api",
            "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2923",
            "date": "2022-02-09T07:19:08",
            "name": "Introduce Pipeline configuration preference for IPU3",
            "version": 1,
            "mbox": "https://patchwork.libcamera.org/series/2923/mbox/"
        }
    ],
    "comments": "https://patchwork.libcamera.org/api/patches/15353/comments/",
    "check": "pending",
    "checks": "https://patchwork.libcamera.org/api/patches/15353/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 2A128C3262\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed,  9 Feb 2022 07:19:57 +0000 (UTC)",
            "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 79D3D610F9;\n\tWed,  9 Feb 2022 08:19:45 +0100 (CET)",
            "from mail-pf1-x430.google.com (mail-pf1-x430.google.com\n\t[IPv6:2607:f8b0:4864:20::430])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id DC613610F9\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed,  9 Feb 2022 08:19:42 +0100 (CET)",
            "by mail-pf1-x430.google.com with SMTP id e3so1386115pfd.12\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 08 Feb 2022 23:19:42 -0800 (PST)",
            "from localhost ([2401:fa00:1:10:a5cf:9a43:1c6d:824])\n\tby smtp.gmail.com with UTF8SMTPSA id\n\tmy18sm4993033pjb.57.2022.02.08.23.19.39\n\t(version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);\n\tTue, 08 Feb 2022 23:19:40 -0800 (PST)"
        ],
        "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"QppWawhO\"; dkim-atps=neutral",
        "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=google; \n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=dw278bQHV6XJPfx2edmz6pUTSApQY/UOPFBqZmgNrek=;\n\tb=QppWawhO7zG3NhY2F8zdJbHSeQizU9jZYId9dSObubxdIuvh+xHnhH6QOnZ1GM9tke\n\tHVphkeeIUq/bG+n94OQ/lqK/GfdwBuCPT5zTsj320CZ+8ZSUOEKR0xMa6l0reLyjB3gv\n\tFFpQSe9IPDYAbstcLuCg8lJByZVxdOg/4cLd8=",
        "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=dw278bQHV6XJPfx2edmz6pUTSApQY/UOPFBqZmgNrek=;\n\tb=miof8n+0C5qGU5qUaHG2DujqFkcYoWtLUEKkl3zgZZLcGvJLojaAON+ogf/otHEuJP\n\tD2kgyIILvAqEDLd82m4Y3F5/OKWJ0edluMTvDep9NQutI3jNyYcYXYWsA/mIHr7OeEwk\n\taxGPf0E01pTI2cQjonkjC6SJItbkaHSPTutEBf8i7HzAtj2UFX/zxY9JN149AHD8uH7u\n\ttOrtUe5G1BoqoFcFQbmUr9/gsTUS7kf/0PHCbH2QejyTRztyvZp+Lj+IUiywzYVpGtUy\n\t/GyswAncKzPL+mk1PqwPV42voiiZIPA5G9IjDPP1bdJsBrk8C7cK0Mp4vYN30RfpUERP\n\tGmbg==",
        "X-Gm-Message-State": "AOAM531yY4xe3s+rcyvbcJtvr93mVa8+F0z94Yf4YmiMaR/dXU8SeV04\n\tmfxqP132kxa/mSbcvbytYodnqFNKhcknsQ==",
        "X-Google-Smtp-Source": "ABdhPJxKdJ+mk8jzyU4jNuQymWfZPpjj1JirZsazW+xhGfReubiUqPhhtIVGTycWuSCby8Tp/qFkrw==",
        "X-Received": "by 2002:a62:b618:: with SMTP id j24mr998678pff.42.1644391180743; \n\tTue, 08 Feb 2022 23:19:40 -0800 (PST)",
        "From": "Han-Lin Chen <hanlinchen@chromium.org>",
        "To": "libcamera-devel@lists.libcamera.org",
        "Date": "Wed,  9 Feb 2022 15:19:16 +0800",
        "Message-Id": "<20220209071917.559993-9-hanlinchen@chromium.org>",
        "X-Mailer": "git-send-email 2.35.0.263.gb82422642f-goog",
        "In-Reply-To": "<20220209071917.559993-1-hanlinchen@chromium.org>",
        "References": "<20220209071917.559993-1-hanlinchen@chromium.org>",
        "MIME-Version": "1.0",
        "Content-Transfer-Encoding": "8bit",
        "Subject": "[libcamera-devel] [PATCH 8/9] libcamera: ipu3: Support\n\tPipelineConfigFile option",
        "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": "Add PipelineConfigFile option for ipu3, which supports setting a yaml\nconfiguration file which contains preferred ImgU configurations when\ncertain output resolutions are requested.\n\nThis is a supplement of the current calculation designed by\nhttps://github.com/intel/intel-ipu3-pipecfg.\n\nThis changes the result of IPU3CameraConfiguration::validate() and\nPipelineHandlerIPU3::generateConfiguration(), and only validates\nstream configurations defined in the file. The user can cancel the option\nby calling setOptions() again without the option.\n\nSigned-off-by: Han-Lin Chen <hanlinchen@chromium.org>\n---\n src/libcamera/pipeline/ipu3/ipu3.cpp | 215 ++++++++++++++++++++++++++-\n 1 file changed, 214 insertions(+), 1 deletion(-)",
    "diff": "diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 6c5617cd..2d43b760 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -16,6 +16,7 @@\n \n #include <libcamera/camera.h>\n #include <libcamera/control_ids.h>\n+#include <libcamera/option_ids.h>\n #include <libcamera/formats.h>\n #include <libcamera/ipa/ipu3_ipa_interface.h>\n #include <libcamera/ipa/ipu3_ipa_proxy.h>\n@@ -35,11 +36,16 @@\n #include \"cio2.h\"\n #include \"frames.h\"\n #include \"imgu.h\"\n+#include \"pipe_config_pref.h\"\n \n namespace libcamera {\n \n LOG_DEFINE_CATEGORY(IPU3)\n \n+static const ControlInfoMap::Map IPU3Options = {\n+\t{ &options::PipelineConfigFile, ControlInfo(0, 512, std::string()) },\n+};\n+\n static const ControlInfoMap::Map IPU3Controls = {\n \t{ &controls::draft::PipelineDepth, ControlInfo(2, 3) },\n };\n@@ -62,6 +68,11 @@ public:\n \tvoid cancelPendingRequests();\n \tvoid frameStart(uint32_t sequence);\n \n+\tbool hasPreference() const\n+\t{\n+\t\treturn pipeConfigPreference_.isValid();\n+\t}\n+\n \tCIO2Device cio2_;\n \tImgUDevice *imgu_;\n \n@@ -85,6 +96,8 @@ public:\n \n \tControlInfoMap ipaControls_;\n \n+\tPipeConfigPreference pipeConfigPreference_;\n+\n private:\n \tvoid queueFrameAction(unsigned int id,\n \t\t\t      const ipa::ipu3::IPU3Action &action);\n@@ -107,6 +120,10 @@ public:\n \tTransform combinedTransform_;\n \n private:\n+\tStatus adjustTransform();\n+\tStatus validateByCalulation();\n+\tStatus validateByPipeConfigPreference();\n+\n \t/*\n \t * The IPU3CameraData instance is guaranteed to be valid as long as the\n \t * corresponding Camera instance is valid. In order to borrow a\n@@ -131,6 +148,8 @@ public:\n \n \tPipelineHandlerIPU3(CameraManager *manager);\n \n+\tint setOptions(Camera *camera, const ControlList *options) override;\n+\n \tCameraConfiguration *generateConfiguration(Camera *camera,\n \t\tconst StreamRoles &roles) override;\n \tint configure(Camera *camera, CameraConfiguration *config) override;\n@@ -151,6 +170,7 @@ private:\n \t\treturn static_cast<IPU3CameraData *>(camera->_d());\n \t}\n \n+\tint initOptions(IPU3CameraData *data);\n \tint initControls(IPU3CameraData *data);\n \tint updateControls(IPU3CameraData *data);\n \tint registerCameras();\n@@ -158,6 +178,11 @@ private:\n \tint allocateBuffers(Camera *camera);\n \tint freeBuffers(Camera *camera);\n \n+\tCameraConfiguration *generateConfigurationByCalculation(Camera *camera,\n+\t\t\t\t\t\t\t\tconst StreamRoles &roles);\n+\tCameraConfiguration *generateConfigurationByPreference(Camera *camera,\n+\t\t\t\t\t\t\t       const StreamRoles &roles);\n+\n \tImgUDevice imgu0_;\n \tImgUDevice imgu1_;\n \tMediaDevice *cio2MediaDev_;\n@@ -172,7 +197,7 @@ IPU3CameraConfiguration::IPU3CameraConfiguration(IPU3CameraData *data)\n \tdata_ = data;\n }\n \n-CameraConfiguration::Status IPU3CameraConfiguration::validate()\n+CameraConfiguration::Status IPU3CameraConfiguration::adjustTransform()\n {\n \tStatus status = Valid;\n \n@@ -221,6 +246,25 @@ CameraConfiguration::Status IPU3CameraConfiguration::validate()\n \t * apply to the sensor to save us working it out again.\n \t */\n \tcombinedTransform_ = combined;\n+\treturn status;\n+}\n+\n+CameraConfiguration::Status IPU3CameraConfiguration::validate()\n+{\n+\tif (data_->hasPreference())\n+\t\treturn validateByPipeConfigPreference();\n+\n+\treturn validateByCalulation();\n+}\n+\n+CameraConfiguration::Status IPU3CameraConfiguration::validateByCalulation()\n+{\n+\tStatus status = Valid;\n+\n+\tif (config_.empty())\n+\t\treturn Invalid;\n+\n+\tstatus = adjustTransform();\n \n \t/* Cap the number of entries to the available streams. */\n \tif (config_.size() > kMaxStreams) {\n@@ -412,13 +456,118 @@ CameraConfiguration::Status IPU3CameraConfiguration::validate()\n \treturn status;\n }\n \n+CameraConfiguration::Status IPU3CameraConfiguration::validateByPipeConfigPreference()\n+{\n+\tif (config_.empty() || config_.size() > 2)\n+\t\treturn Invalid;\n+\n+\tStatus status = adjustTransform();\n+\n+\tbool mainAvailable = false;\n+\tStreamConfiguration *mainStream = nullptr;\n+\tStreamConfiguration *viewfinderStream = nullptr;\n+\n+\t/* Assign the mainStream as the stream with the larger size. */\n+\tfor (StreamConfiguration &cfg : config_) {\n+\t\tconst PixelFormatInfo &info = PixelFormatInfo::info(cfg.pixelFormat);\n+\t\tif (info.colourEncoding != PixelFormatInfo::ColourEncodingYUV) {\n+\t\t\treturn Invalid;\n+\t\t}\n+\t\tif (!mainAvailable) {\n+\t\t\tmainStream = &cfg;\n+\t\t} else if (mainStream->size < cfg.size) {\n+\t\t\tviewfinderStream = mainStream;\n+\t\t\tmainStream = &cfg;\n+\t\t}\n+\t}\n+\n+\t/*\n+\t * \\todo Query and use the configuration for the still pipe when the\n+\t * pipeline handler is refactored to use both ImgU device for a camera.\n+\t */\n+\tPipeConfigPreference::PipeConfig videoPipe;\n+\tPipeConfigPreference::PipeConfig stillPipe;\n+\n+\tint ret = data_->pipeConfigPreference_.queryPipeConfig(\n+\t\tmainStream->size,\n+\t\t(viewfinderStream) ? viewfinderStream->size : PipeConfigPreference::Disabled,\n+\t\tPipeConfigPreference::Disabled,\n+\t\tPipeConfigPreference::Disabled,\n+\t\tvideoPipe, stillPipe);\n+\tif (ret) {\n+\t\tLOG(IPU3, Error)\n+\t\t\t<< \"Fail to find a valid configuration: \"\n+\t\t\t<< \" main: \" << mainStream->size\n+\t\t\t<< \" viewfinder: \"\n+\t\t\t<< ((viewfinderStream) ? viewfinderStream->size : PipeConfigPreference::Disabled);\n+\t\treturn Invalid;\n+\t}\n+\n+\tcio2Configuration_.size = videoPipe.cio2;\n+\tcio2Configuration_.pixelFormat = formats::SGRBG10_IPU3;\n+\tcio2Configuration_.bufferCount = kBufferCount;\n+\n+\tpipeConfig_.bds = videoPipe.bds;\n+\tpipeConfig_.iif = videoPipe.iff;\n+\tpipeConfig_.gdc = videoPipe.gdc;\n+\n+\tconst PixelFormatInfo &info = PixelFormatInfo::info(formats::NV12);\n+\n+\tmainStream->pixelFormat = formats::NV12;\n+\tmainStream->bufferCount = kBufferCount;\n+\tmainStream->stride = info.stride(mainStream->size.width, 0, 1);\n+\tmainStream->frameSize = info.frameSize(mainStream->size, 1);\n+\tmainStream->setStream(const_cast<Stream *>(&data_->outStream_));\n+\n+\tif (viewfinderStream) {\n+\t\tviewfinderStream->pixelFormat = formats::NV12;\n+\t\tviewfinderStream->bufferCount = kBufferCount;\n+\t\tviewfinderStream->stride = info.stride(viewfinderStream->size.width, 0, 1);\n+\t\tviewfinderStream->frameSize = info.frameSize(viewfinderStream->size, 1);\n+\t\tviewfinderStream->setStream(const_cast<Stream *>(&data_->vfStream_));\n+\t}\n+\n+\treturn status;\n+}\n+\n PipelineHandlerIPU3::PipelineHandlerIPU3(CameraManager *manager)\n \t: PipelineHandler(manager), cio2MediaDev_(nullptr), imguMediaDev_(nullptr)\n {\n }\n \n+int PipelineHandlerIPU3::setOptions(Camera *camera,\n+\t\t\t\t    const ControlList *options)\n+{\n+\tIPU3CameraData *data = cameraData(camera);\n+\n+\tPipeConfigPreference &preference = data->pipeConfigPreference_;\n+\tpreference.invalid();\n+\n+\tif (options && options->contains(options::PipelineConfigFile)) {\n+\t\tstd::string path = options->get(options::PipelineConfigFile);\n+\t\tint ret = preference.parsePreferenceFile(path);\n+\t\tif (ret) {\n+\t\t\tLOG(IPU3, Error) << \"Fail to load pipline config \"\n+\t\t\t\t\t << \"preference file: \" << path;\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\t}\n+\n+\treturn 0;\n+}\n+\n CameraConfiguration *PipelineHandlerIPU3::generateConfiguration(Camera *camera,\n \t\t\t\t\t\t\t\tconst StreamRoles &roles)\n+{\n+\tIPU3CameraData *data = cameraData(camera);\n+\tif (data->hasPreference())\n+\t\treturn generateConfigurationByPreference(camera, roles);\n+\n+\treturn generateConfigurationByCalculation(camera, roles);\n+}\n+\n+CameraConfiguration *PipelineHandlerIPU3::generateConfigurationByCalculation(\n+\tCamera *camera, const StreamRoles &roles)\n {\n \tIPU3CameraData *data = cameraData(camera);\n \tIPU3CameraConfiguration *config = new IPU3CameraConfiguration(data);\n@@ -505,6 +654,57 @@ CameraConfiguration *PipelineHandlerIPU3::generateConfiguration(Camera *camera,\n \treturn config;\n }\n \n+CameraConfiguration *PipelineHandlerIPU3::generateConfigurationByPreference(\n+\tCamera *camera, const StreamRoles &roles)\n+{\n+\tIPU3CameraData *data = cameraData(camera);\n+\tIPU3CameraConfiguration *config = new IPU3CameraConfiguration(data);\n+\tPipeConfigPreference &preference = data->pipeConfigPreference_;\n+\n+\tif (roles.empty())\n+\t\treturn config;\n+\n+\tfor (const StreamRole role : roles) {\n+\t\tstd::map<PixelFormat, std::vector<SizeRange>> streamFormats;\n+\t\tPixelFormat pixelFormat = formats::NV12;\n+\t\tSize size;\n+\n+\t\tswitch (role) {\n+\t\tcase StreamRole::StillCapture:\n+\t\t\tsize = preference.maxStillResolution();\n+\t\t\tstreamFormats[pixelFormat] = { { preference.maxStillResolution(),\n+\t\t\t\t\t\t\t preference.maxStillResolution() } };\n+\t\t\tbreak;\n+\n+\t\tcase StreamRole::Viewfinder:\n+\t\tcase StreamRole::VideoRecording:\n+\t\t\tsize = preference.maxVideoResolution();\n+\t\t\tstreamFormats[pixelFormat] = { { preference.maxVideoResolution(),\n+\t\t\t\t\t\t\t preference.maxVideoResolution() } };\n+\t\t\tbreak;\n+\n+\t\tcase StreamRole::Raw:\n+\t\tdefault:\n+\t\t\tLOG(IPU3, Error)\n+\t\t\t\t<< \"Requested stream role not supported: \" << role;\n+\t\t\tdelete config;\n+\t\t\treturn nullptr;\n+\t\t}\n+\n+\t\tStreamFormats formats(streamFormats);\n+\t\tStreamConfiguration cfg(formats);\n+\t\tcfg.size = size;\n+\t\tcfg.pixelFormat = pixelFormat;\n+\t\tcfg.bufferCount = IPU3CameraConfiguration::kBufferCount;\n+\t\tconfig->addConfiguration(cfg);\n+\t}\n+\n+\tif (config->validate() == CameraConfiguration::Invalid)\n+\t\treturn {};\n+\n+\treturn config;\n+}\n+\n int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)\n {\n \tIPU3CameraConfiguration *config =\n@@ -971,6 +1171,15 @@ int PipelineHandlerIPU3::initControls(IPU3CameraData *data)\n \treturn updateControls(data);\n }\n \n+int PipelineHandlerIPU3::initOptions(IPU3CameraData *data)\n+{\n+\t/* Expose IPU3 options. */\n+\tControlInfoMap::Map options = IPU3Options;\n+\tdata->optionInfo_ = ControlInfoMap(std::move(options), options::options);\n+\n+\treturn 0;\n+}\n+\n /**\n  * \\brief Update the camera controls\n  * \\param[in] data The camera data\n@@ -1118,6 +1327,10 @@ int PipelineHandlerIPU3::registerCameras()\n \t\t/* Initialize the camera properties. */\n \t\tdata->properties_ = cio2->sensor()->properties();\n \n+\t\tret = initOptions(data.get());\n+\t\tif (ret)\n+\t\t\tcontinue;\n+\n \t\tret = initControls(data.get());\n \t\tif (ret)\n \t\t\tcontinue;\n",
    "prefixes": [
        "libcamera-devel",
        "8/9"
    ]
}