Patch Detail
Show a patch.
GET /api/1.1/patches/9292/?format=api
{ "id": 9292, "url": "https://patchwork.libcamera.org/api/1.1/patches/9292/?format=api", "web_url": "https://patchwork.libcamera.org/patch/9292/", "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": "<20200813005246.3265807-3-niklas.soderlund@ragnatech.se>", "date": "2020-08-13T00:52:35", "name": "[libcamera-devel,02/13] libcamera: pipeline: rkisp1: Breakout mainpath size and format constraints", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "af0039117b23497b72c56857bda281b20af760ba", "submitter": { "id": 5, "url": "https://patchwork.libcamera.org/api/1.1/people/5/?format=api", "name": "Niklas Söderlund", "email": "niklas.soderlund@ragnatech.se" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/9292/mbox/", "series": [ { "id": 1215, "url": "https://patchwork.libcamera.org/api/1.1/series/1215/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1215", "date": "2020-08-13T00:52:33", "name": "libcamera: pipeline: rkisp1: Extend to support two streams", "version": 1, "mbox": "https://patchwork.libcamera.org/series/1215/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/9292/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/9292/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 0C11BBD87D\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 13 Aug 2020 00:53:43 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 09812612F7;\n\tThu, 13 Aug 2020 02:53:41 +0200 (CEST)", "from vsp-unauthed02.binero.net (vsp-unauthed02.binero.net\n\t[195.74.38.227])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7F15C60DF1\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 13 Aug 2020 02:53:38 +0200 (CEST)", "from bismarck.berto.se (p54ac52a8.dip0.t-ipconnect.de\n\t[84.172.82.168]) by bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA\n\tid 6b950845-dcff-11ea-92dc-005056917a89;\n\tThu, 13 Aug 2020 02:53:37 +0200 (CEST)" ], "X-Halon-ID": "6b950845-dcff-11ea-92dc-005056917a89", "Authorized-sender": "niklas.soderlund@fsdn.se", "From": "=?utf-8?q?Niklas_S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 13 Aug 2020 02:52:35 +0200", "Message-Id": "<20200813005246.3265807-3-niklas.soderlund@ragnatech.se>", "X-Mailer": "git-send-email 2.28.0", "In-Reply-To": "<20200813005246.3265807-1-niklas.soderlund@ragnatech.se>", "References": "<20200813005246.3265807-1-niklas.soderlund@ragnatech.se>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH 02/13] libcamera: pipeline: rkisp1:\n\tBreakout mainpath size and format constraints", "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>", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "base64", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Breakout the mainpath size and format constrains as it will be used in\nmore places then just validate(). While at it use the new helpers to\nvalidate Size.\n\nSigned-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n---\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 32 +++++++++++++-----------\n 1 file changed, 17 insertions(+), 15 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex e2b703fc09f7afda..a0e36a44d8d91260 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -37,6 +37,19 @@ namespace libcamera {\n \n LOG_DEFINE_CATEGORY(RkISP1)\n \n+static const Size RKISP1_RSZ_MP_SRC_MIN = { 32, 16 };\n+static const Size RKISP1_RSZ_MP_SRC_MAX = { 4416, 3312 };\n+static const std::array<PixelFormat, 7> RKISP1_RSZ_MP_FORMATS{\n+\tformats::YUYV,\n+\tformats::YVYU,\n+\tformats::VYUY,\n+\tformats::NV16,\n+\tformats::NV61,\n+\tformats::NV21,\n+\tformats::NV12,\n+\t/* \\todo Add support for 8-bit greyscale to DRM formats */\n+};\n+\n class PipelineHandlerRkISP1;\n class RkISP1ActionQueueBuffers;\n \n@@ -461,17 +474,6 @@ RkISP1CameraConfiguration::RkISP1CameraConfiguration(Camera *camera,\n \n CameraConfiguration::Status RkISP1CameraConfiguration::validate()\n {\n-\tstatic const std::array<PixelFormat, 7> formats{\n-\t\tformats::YUYV,\n-\t\tformats::YVYU,\n-\t\tformats::VYUY,\n-\t\tformats::NV16,\n-\t\tformats::NV61,\n-\t\tformats::NV21,\n-\t\tformats::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@@ -487,8 +489,8 @@ CameraConfiguration::Status RkISP1CameraConfiguration::validate()\n \tStreamConfiguration &cfg = config_[0];\n \n \t/* Adjust the pixel format. */\n-\tif (std::find(formats.begin(), formats.end(), cfg.pixelFormat) ==\n-\t formats.end()) {\n+\tif (std::find(RKISP1_RSZ_MP_FORMATS.begin(), RKISP1_RSZ_MP_FORMATS.end(),\n+\t\t cfg.pixelFormat) == RKISP1_RSZ_MP_FORMATS.end()) {\n \t\tLOG(RkISP1, Debug) << \"Adjusting format to NV12\";\n \t\tcfg.pixelFormat = formats::NV12,\n \t\tstatus = Adjusted;\n@@ -525,8 +527,8 @@ CameraConfiguration::Status RkISP1CameraConfiguration::validate()\n \t\t\t\t/ sensorFormat_.size.width;\n \t}\n \n-\tcfg.size.width = std::max(32U, std::min(4416U, cfg.size.width));\n-\tcfg.size.height = std::max(16U, std::min(3312U, cfg.size.height));\n+\tcfg.size.boundTo(RKISP1_RSZ_MP_SRC_MAX);\n+\tcfg.size.expandTo(RKISP1_RSZ_MP_SRC_MIN);\n \n \tif (cfg.size != size) {\n \t\tLOG(RkISP1, Debug)\n", "prefixes": [ "libcamera-devel", "02/13" ] }