Patch Detail
Show a patch.
GET /api/patches/13670/?format=api
{ "id": 13670, "url": "https://patchwork.libcamera.org/api/patches/13670/?format=api", "web_url": "https://patchwork.libcamera.org/patch/13670/", "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": "<20210906225636.14683-4-laurent.pinchart@ideasonboard.com>", "date": "2021-09-06T22:56:10", "name": "[libcamera-devel,v3,04/30] libcamera: Use V4L2PixelFormat::fromPixelFormat()", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "8239b022f2d44c540772e1c7a0b61f3c4bedadb6", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/13670/mbox/", "series": [ { "id": 2482, "url": "https://patchwork.libcamera.org/api/series/2482/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2482", "date": "2021-09-06T22:54:20", "name": "libcamera: Handle fallout of FrameBuffer offset support", "version": 3, "mbox": "https://patchwork.libcamera.org/series/2482/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/13670/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/13670/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 DBDAABE175\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 6 Sep 2021 22:57:06 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7BAB669181;\n\tTue, 7 Sep 2021 00:57:05 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 29B8B6916A\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 7 Sep 2021 00:57:00 +0200 (CEST)", "from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id B57FE891;\n\tTue, 7 Sep 2021 00:56:59 +0200 (CEST)" ], "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"N8e2qa+q\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1630969019;\n\tbh=b7gPBp850bZHu3787Wvt9wPxGmz/eKhWf5qntMcqV4c=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=N8e2qa+qOE3HnQZSO5VJmfyNAJl+wkOIPYKM5yt04OXaKByVNdbLRHQbFQtKmYJ9U\n\tjgHEzgpgvterCF4K8YhZzYoEj22TNAooDfItosw6BC+nAoNdwjd8GN0803bcLGfIdv\n\tN4U4ZsvHaeXqkgzr0+4MlYqqMHAfX3OvEuAMTDdA=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Tue, 7 Sep 2021 01:56:10 +0300", "Message-Id": "<20210906225636.14683-4-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.32.0", "In-Reply-To": "<20210906225420.13275-1-laurent.pinchart@ideasonboard.com>", "References": "<20210906225420.13275-1-laurent.pinchart@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v3 04/30] libcamera: Use\n\tV4L2PixelFormat::fromPixelFormat()", "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": "Replace manual looked for V4L2 pixel format in the PixelFormatInfo with\nthe V4L2PixelFormat::fromPixelFormat() helper function. This prepares\nfor multi-planar support that will modify how V4L2 pixel formats are\nstored in PixelFormatInfo.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\nReviewed-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>\nReviewed-by: Hirokazu Honda <hiroh@chromium.org>\n---\n src/libcamera/pipeline/ipu3/cio2.cpp | 4 +---\n src/v4l2/v4l2_camera_proxy.cpp | 9 +++------\n 2 files changed, 4 insertions(+), 9 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/ipu3/cio2.cpp b/src/libcamera/pipeline/ipu3/cio2.cpp\nindex 9cedcb5b2879..dc62ab197acb 100644\n--- a/src/libcamera/pipeline/ipu3/cio2.cpp\n+++ b/src/libcamera/pipeline/ipu3/cio2.cpp\n@@ -203,9 +203,7 @@ int CIO2Device::configure(const Size &size, V4L2DeviceFormat *outputFormat)\n \tif (itInfo == mbusCodesToPixelFormat.end())\n \t\treturn -EINVAL;\n \n-\tconst PixelFormatInfo &info = PixelFormatInfo::info(itInfo->second);\n-\n-\toutputFormat->fourcc = info.v4l2Format;\n+\toutputFormat->fourcc = V4L2PixelFormat::fromPixelFormat(itInfo->second);\n \toutputFormat->size = sensorFormat.size;\n \toutputFormat->planesCount = 1;\n \ndiff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp\nindex 07b1a90aa32f..d926a7b77083 100644\n--- a/src/v4l2/v4l2_camera_proxy.cpp\n+++ b/src/v4l2/v4l2_camera_proxy.cpp\n@@ -164,12 +164,11 @@ bool V4L2CameraProxy::validateMemoryType(uint32_t memory)\n \n void V4L2CameraProxy::setFmtFromConfig(const StreamConfiguration &streamConfig)\n {\n-\tconst PixelFormatInfo &info = PixelFormatInfo::info(streamConfig.pixelFormat);\n \tconst Size &size = streamConfig.size;\n \n \tv4l2PixFormat_.width = size.width;\n \tv4l2PixFormat_.height = size.height;\n-\tv4l2PixFormat_.pixelformat = info.v4l2Format;\n+\tv4l2PixFormat_.pixelformat = V4L2PixelFormat::fromPixelFormat(streamConfig.pixelFormat);\n \tv4l2PixFormat_.field = V4L2_FIELD_NONE;\n \tv4l2PixFormat_.bytesperline = streamConfig.stride;\n \tv4l2PixFormat_.sizeimage = streamConfig.frameSize;\n@@ -276,7 +275,7 @@ int V4L2CameraProxy::vidioc_enum_fmt(V4L2CameraFile *file, struct v4l2_fmtdesc *\n \t/* \\todo Add map from format to description. */\n \tutils::strlcpy(reinterpret_cast<char *>(arg->description),\n \t\t \"Video Format Description\", sizeof(arg->description));\n-\targ->pixelformat = PixelFormatInfo::info(format).v4l2Format;\n+\targ->pixelformat = V4L2PixelFormat::fromPixelFormat(format);\n \n \tmemset(arg->reserved, 0, sizeof(arg->reserved));\n \n@@ -311,11 +310,9 @@ int V4L2CameraProxy::tryFormat(struct v4l2_format *arg)\n \t\treturn -EINVAL;\n \t}\n \n-\tconst PixelFormatInfo &info = PixelFormatInfo::info(config.pixelFormat);\n-\n \targ->fmt.pix.width = config.size.width;\n \targ->fmt.pix.height = config.size.height;\n-\targ->fmt.pix.pixelformat = info.v4l2Format;\n+\targ->fmt.pix.pixelformat = V4L2PixelFormat::fromPixelFormat(config.pixelFormat);\n \targ->fmt.pix.field = V4L2_FIELD_NONE;\n \targ->fmt.pix.bytesperline = config.stride;\n \targ->fmt.pix.sizeimage = config.frameSize;\n", "prefixes": [ "libcamera-devel", "v3", "04/30" ] }