Patch Detail
Show a patch.
GET /api/patches/3309/?format=api
{ "id": 3309, "url": "https://patchwork.libcamera.org/api/patches/3309/?format=api", "web_url": "https://patchwork.libcamera.org/patch/3309/", "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": "<20200324175643.22382-3-kgupta@es.iitr.ac.in>", "date": "2020-03-24T17:56:42", "name": "[libcamera-devel,v2,2/3] libcamera: pipeline: rkisp1: Use parameterized StreamConfiguration", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "04ad178911cde89668db1f74c14adb9303ed0c4b", "submitter": { "id": 39, "url": "https://patchwork.libcamera.org/api/people/39/?format=api", "name": "Kaaira Gupta", "email": "kgupta@es.iitr.ac.in" }, "delegate": { "id": 11, "url": "https://patchwork.libcamera.org/api/users/11/?format=api", "username": "kbingham", "first_name": "Kieran", "last_name": "Bingham", "email": "kieran.bingham@ideasonboard.com" }, "mbox": "https://patchwork.libcamera.org/patch/3309/mbox/", "series": [ { "id": 771, "url": "https://patchwork.libcamera.org/api/series/771/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=771", "date": "2020-03-24T17:56:40", "name": "Use StreamFormats in pipelines", "version": 2, "mbox": "https://patchwork.libcamera.org/series/771/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/3309/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/3309/checks/", "tags": {}, "headers": { "Return-Path": "<kgupta@es.iitr.ac.in>", "Received": [ "from mail-pl1-x631.google.com (mail-pl1-x631.google.com\n\t[IPv6:2607:f8b0:4864:20::631])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 28AC760411\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 24 Mar 2020 18:57:09 +0100 (CET)", "by mail-pl1-x631.google.com with SMTP id b9so7699831pls.12\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 24 Mar 2020 10:57:09 -0700 (PDT)", "from kaaira-HP-Pavilion-Notebook ([103.113.213.154])\n\tby smtp.gmail.com with ESMTPSA id\n\tj38sm14995443pgi.51.2020.03.24.10.57.05\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 24 Mar 2020 10:57:06 -0700 (PDT)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected)\n\theader.d=es-iitr-ac-in.20150623.gappssmtp.com\n\theader.i=@es-iitr-ac-in.20150623.gappssmtp.com header.b=\"uf7Omt8z\"; \n\tdkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=es-iitr-ac-in.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=BxCHFxmMHeDPopi6DfMS46XCjrfnqI6dzpiKbtcYCkw=;\n\tb=uf7Omt8z/OWYeZWI39Aw3uAZvX7LLdayv5Y4pLCzl9MAULeD9aZVHUBv9B4Jccv599\n\tr4/yDjRBAhv+lNPGbG5DUcfPgIC/HQYE/LyVK6Bf0jG0EwuiwcaTWASeZNB325vE81j5\n\tkLAyrdy2tUGi4321I8p8qGWdyHu9T7dnGJlSgRCvXlaH1RnfxZEywb+FOxZKEeJflAJT\n\tct/5DsvZ1WMo7dBZTAVnnMYld3cfqk/npY6anWdxfZjFjlA55aLmb6FaeNyHZQgLvlku\n\t7gajNjETcGNGMjYNCuGsz7V14BRU8LFCkgQYfrzUG8ukQ3ScIC+bnTz9c97v/a6mfuNf\n\tTTsw==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=BxCHFxmMHeDPopi6DfMS46XCjrfnqI6dzpiKbtcYCkw=;\n\tb=KqY6CnzrQLTo7P3mee6SsB3KQ7AyA8zgZKtFyB5XTWeqst42hUcjS9mY3GMnOwYDcX\n\tYSmUR4mTbj2AgfwL9ZAr0M1z7rprpA+jLlP2ndi1iK18ldnHUWX7XeC+sOj1up/0EoTy\n\tRmxS+7BlWVkzLppiJvGS+2J55GPXRNs9OpQGPVuclkq7KVW0x+nrAo/wCe2LNkbCsHFt\n\t9UsdpYwWfwV7QtpbujIFBxGtxnc13B0AYr1ytsmU6cq5pXEJ0XpnQHsXcTtNImyXiFeD\n\tpICvqhuMm4cKiegsbaKWHzBFZs4WTMB/MVIc/awLhESFyMYQyhBPxzybnuQ+MuGyUsfz\n\t18hQ==", "X-Gm-Message-State": "ANhLgQ1s5jGe8zgs0FnubZz6gSEXYTT/2j7h/2uGToBuSDhMEoUpH1MM\n\tSzVtILCUb2euWdDL7ZUq9H3XDA==", "X-Google-Smtp-Source": "ADFU+vul9yArNEP5pJCtJKQG8HJ3MaQYdjSqz6C8mlg8WgCCGFwy66Ss2gMs5VXFcGsT3PDg/+ijbA==", "X-Received": "by 2002:a17:90a:d585:: with SMTP id\n\tv5mr6776996pju.168.1585072627149; \n\tTue, 24 Mar 2020 10:57:07 -0700 (PDT)", "From": "Kaaira Gupta <kgupta@es.iitr.ac.in>", "To": "libcamera-devel@lists.libcamera.org,\n\tKieran Bingham <kieran.bingham@ideasonboard.com>,\n\tHelen Koike <helen.koike@collabora.com>,\n\tVaishali Thakkar <vthakkar@vaishalithakkar.in>", "Cc": "Kaaira Gupta <kgupta@es.iitr.ac.in>", "Date": "Tue, 24 Mar 2020 23:26:42 +0530", "Message-Id": "<20200324175643.22382-3-kgupta@es.iitr.ac.in>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20200324175643.22382-1-kgupta@es.iitr.ac.in>", "References": "<20200324175643.22382-1-kgupta@es.iitr.ac.in>", "Subject": "[libcamera-devel] [PATCH v2 2/3] libcamera: pipeline: rkisp1: Use\n\tparameterized StreamConfiguration", "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>", "X-List-Received-Date": "Tue, 24 Mar 2020 17:57:09 -0000" }, "content": "Replace default constructor StreamConfiguration() by its parameterized\ncounterpart by using StreamFormats in generateConfiguration() in\nrkisp1.\n\nSigned-off-by: Kaaira Gupta <kgupta@es.iitr.ac.in>\nReviewed-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 39 ++++++++++++++++--------\n 1 file changed, 27 insertions(+), 12 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 04b0ed3..cfbfc9e 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -218,6 +218,21 @@ private:\n \tCamera *activeCamera_;\n };\n \n+namespace {\n+\n+static const std::array<PixelFormat, 8> formats{\n+\tPixelFormat(DRM_FORMAT_YUYV),\n+\tPixelFormat(DRM_FORMAT_YVYU),\n+\tPixelFormat(DRM_FORMAT_VYUY),\n+\tPixelFormat(DRM_FORMAT_NV16),\n+\tPixelFormat(DRM_FORMAT_NV61),\n+\tPixelFormat(DRM_FORMAT_NV21),\n+\tPixelFormat(DRM_FORMAT_NV12),\n+\t/* \\todo Add support for 8-bit greyscale to DRM formats */\n+};\n+\n+} /* namespace */\n+\n RkISP1Frames::RkISP1Frames(PipelineHandler *pipe)\n \t: pipe_(dynamic_cast<PipelineHandlerRkISP1 *>(pipe))\n {\n@@ -430,17 +445,6 @@ RkISP1CameraConfiguration::RkISP1CameraConfiguration(Camera *camera,\n \n CameraConfiguration::Status RkISP1CameraConfiguration::validate()\n {\n-\tstatic const std::array<PixelFormat, 8> formats{\n-\t\tPixelFormat(DRM_FORMAT_YUYV),\n-\t\tPixelFormat(DRM_FORMAT_YVYU),\n-\t\tPixelFormat(DRM_FORMAT_VYUY),\n-\t\tPixelFormat(DRM_FORMAT_NV16),\n-\t\tPixelFormat(DRM_FORMAT_NV61),\n-\t\tPixelFormat(DRM_FORMAT_NV21),\n-\t\tPixelFormat(DRM_FORMAT_NV12),\n-\t\t/* \\todo Add support for 8-bit greyscale to DRM formats */\n-\t};\n-\n \tconst CameraSensor *sensor = data_->sensor_;\n \tStatus status = Valid;\n \n@@ -541,7 +545,18 @@ CameraConfiguration *PipelineHandlerRkISP1::generateConfiguration(Camera *camera\n \tif (roles.empty())\n \t\treturn config;\n \n-\tStreamConfiguration cfg{};\n+\tstd::map<PixelFormat, std::vector<SizeRange>> pixelformats;\n+\tfor (PixelFormat pixelformat : formats) {\n+\t\tstd::vector<SizeRange> sizes{\n+\t\t\t/* Minimum and maximum capabilities of ISP output */\n+\t\t\tSizeRange{ { 32, 16 }, { 4416, 3312 } }\n+\t\t};\n+\t\tpixelformats[pixelformat] = sizes;\n+\t}\n+\n+\tStreamFormats format(pixelformats);\n+\tStreamConfiguration cfg(format);\n+\n \tcfg.pixelFormat = PixelFormat(DRM_FORMAT_NV12);\n \tcfg.size = data->sensor_->resolution();\n \n", "prefixes": [ "libcamera-devel", "v2", "2/3" ] }