Patch Detail
Show a patch.
GET /api/1.1/patches/13707/?format=api
{ "id": 13707, "url": "https://patchwork.libcamera.org/api/1.1/patches/13707/?format=api", "web_url": "https://patchwork.libcamera.org/patch/13707/", "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": "<20210907002044.7319-5-laurent.pinchart@ideasonboard.com>", "date": "2021-09-07T00:20:43", "name": "[libcamera-devel,v2,4/5] qcam: format_converter: Add fully-planar YUV formats support", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "24243fc81fa7c6c8cfe4b0da157fa8a68a6cfeec", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/1.1/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/13707/mbox/", "series": [ { "id": 2484, "url": "https://patchwork.libcamera.org/api/1.1/series/2484/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2484", "date": "2021-09-07T00:20:39", "name": "qcam: Fix stride handling", "version": 2, "mbox": "https://patchwork.libcamera.org/series/2484/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/13707/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/13707/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 57B91BDC71\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 7 Sep 2021 00:21:16 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 77E7369171;\n\tTue, 7 Sep 2021 02:21:12 +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 934C56916B\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 7 Sep 2021 02:21:08 +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 35BB0891\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 7 Sep 2021 02:21:08 +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=\"kAWTBHdL\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1630974068;\n\tbh=SnYvx102aSYO0JZckMaGntaQZxQtSYhiDQYwOxKYTyE=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=kAWTBHdLN4mo4hT4DqxWhMOmBzmaqnefGXLA260OCZ4mJSg09iJSZD2IOx2+2pxSf\n\tDqQ3rihMY9S8sazVaq4rAhl+CahvgWETjLmMwdkH7PfEPoCFsA0bsgmBmUmb6ISDcP\n\tgMjfrekB+pGnhFYHA04qmO5NSi6PLSQ66mxv1gEI=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Tue, 7 Sep 2021 03:20:43 +0300", "Message-Id": "<20210907002044.7319-5-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.32.0", "In-Reply-To": "<20210907002044.7319-1-laurent.pinchart@ideasonboard.com>", "References": "<20210907002044.7319-1-laurent.pinchart@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v2 4/5] qcam: format_converter: Add\n\tfully-planar YUV formats support", "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 support for the YUV420, YVU420 and YUV420 formats supported by\nlibcamera. YUV420 can be produced by the Raspberry Pi pipeline handler,\nbeing able to display it is useful for testing.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/qcam/format_converter.cpp | 66 +++++++++++++++++++++++++++++++++++\n src/qcam/format_converter.h | 2 ++\n 2 files changed, 68 insertions(+)", "diff": "diff --git a/src/qcam/format_converter.cpp b/src/qcam/format_converter.cpp\nindex 7979ea8a77ff..d4d3223bc698 100644\n--- a/src/qcam/format_converter.cpp\n+++ b/src/qcam/format_converter.cpp\n@@ -8,6 +8,7 @@\n #include \"format_converter.h\"\n \n #include <errno.h>\n+#include <utility>\n \n #include <QImage>\n \n@@ -141,6 +142,25 @@ int FormatConverter::configure(const libcamera::PixelFormat &format,\n \t\tcb_pos_ = 1;\n \t\tbreak;\n \n+\tcase libcamera::formats::YUV420:\n+\t\tformatFamily_ = YUVPlanar;\n+\t\thorzSubSample_ = 2;\n+\t\tvertSubSample_ = 2;\n+\t\tnvSwap_ = false;\n+\t\tbreak;\n+\tcase libcamera::formats::YVU420:\n+\t\tformatFamily_ = YUVPlanar;\n+\t\thorzSubSample_ = 2;\n+\t\tvertSubSample_ = 2;\n+\t\tnvSwap_ = true;\n+\t\tbreak;\n+\tcase libcamera::formats::YUV422:\n+\t\tformatFamily_ = YUVPlanar;\n+\t\thorzSubSample_ = 2;\n+\t\tvertSubSample_ = 1;\n+\t\tnvSwap_ = false;\n+\t\tbreak;\n+\n \tcase libcamera::formats::MJPEG:\n \t\tformatFamily_ = MJPEG;\n \t\tbreak;\n@@ -172,6 +192,9 @@ void FormatConverter::convert(const Image *src, size_t size, QImage *dst)\n \tcase YUVSemiPlanar:\n \t\tconvertYUVSemiPlanar(src, dst->bits());\n \t\tbreak;\n+\tcase YUVPlanar:\n+\t\tconvertYUVPlanar(src, dst->bits());\n+\t\tbreak;\n \t};\n }\n \n@@ -247,6 +270,49 @@ void FormatConverter::convertYUVPacked(const Image *srcImage, unsigned char *dst\n \t}\n }\n \n+void FormatConverter::convertYUVPlanar(const Image *srcImage, unsigned char *dst)\n+{\n+\tunsigned int c_stride = stride_ / horzSubSample_;\n+\tunsigned int c_inc = horzSubSample_ == 1 ? 1 : 0;\n+\tconst unsigned char *src_y = srcImage->data(0).data();\n+\tconst unsigned char *src_cb = srcImage->data(1).data();\n+\tconst unsigned char *src_cr = srcImage->data(2).data();\n+\tint r, g, b;\n+\n+\tif (nvSwap_)\n+\t\tstd::swap(src_cb, src_cr);\n+\n+\tfor (unsigned int y = 0; y < height_; y++) {\n+\t\tconst unsigned char *line_y = src_y + y * stride_;\n+\t\tconst unsigned char *line_cb = src_cb + (y / vertSubSample_) *\n+\t\t\t\t\t c_stride;\n+\t\tconst unsigned char *line_cr = src_cr + (y / vertSubSample_) *\n+\t\t\t\t\t c_stride;\n+\n+\t\tfor (unsigned int x = 0; x < width_; x += 2) {\n+\t\t\tyuv_to_rgb(*line_y, *line_cb, *line_cr, &r, &g, &b);\n+\t\t\tdst[0] = b;\n+\t\t\tdst[1] = g;\n+\t\t\tdst[2] = r;\n+\t\t\tdst[3] = 0xff;\n+\t\t\tline_y++;\n+\t\t\tline_cb += c_inc;\n+\t\t\tline_cr += c_inc;\n+\t\t\tdst += 4;\n+\n+\t\t\tyuv_to_rgb(*line_y, *line_cb, *line_cr, &r, &g, &b);\n+\t\t\tdst[0] = b;\n+\t\t\tdst[1] = g;\n+\t\t\tdst[2] = r;\n+\t\t\tdst[3] = 0xff;\n+\t\t\tline_y++;\n+\t\t\tline_cb += 1;\n+\t\t\tline_cr += 1;\n+\t\t\tdst += 4;\n+\t\t}\n+\t}\n+}\n+\n void FormatConverter::convertYUVSemiPlanar(const Image *srcImage, unsigned char *dst)\n {\n \tunsigned int c_stride = stride_ * (2 / horzSubSample_);\ndiff --git a/src/qcam/format_converter.h b/src/qcam/format_converter.h\nindex 9ce2cc6da7f2..9da2df5d294b 100644\n--- a/src/qcam/format_converter.h\n+++ b/src/qcam/format_converter.h\n@@ -29,11 +29,13 @@ private:\n \t\tMJPEG,\n \t\tRGB,\n \t\tYUVPacked,\n+\t\tYUVPlanar,\n \t\tYUVSemiPlanar,\n \t};\n \n \tvoid convertRGB(const Image *src, unsigned char *dst);\n \tvoid convertYUVPacked(const Image *src, unsigned char *dst);\n+\tvoid convertYUVPlanar(const Image *src, unsigned char *dst);\n \tvoid convertYUVSemiPlanar(const Image *src, unsigned char *dst);\n \n \tlibcamera::PixelFormat format_;\n", "prefixes": [ "libcamera-devel", "v2", "4/5" ] }