Patch Detail
Show a patch.
GET /api/1.1/patches/4008/?format=api
{ "id": 4008, "url": "https://patchwork.libcamera.org/api/1.1/patches/4008/?format=api", "web_url": "https://patchwork.libcamera.org/patch/4008/", "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": "<20200609232323.29628-4-laurent.pinchart@ideasonboard.com>", "date": "2020-06-09T23:23:19", "name": "[libcamera-devel,v2,3/7] qcam: Replace explicit DRM FourCCs with libcamera formats", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "84a650b715859ecaa741563e32cbc74829672d2b", "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/4008/mbox/", "series": [ { "id": 982, "url": "https://patchwork.libcamera.org/api/1.1/series/982/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=982", "date": "2020-06-09T23:23:16", "name": "Introduce formats:: namespace for libcamera pixel formats", "version": 2, "mbox": "https://patchwork.libcamera.org/series/982/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/4008/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/4008/checks/", "tags": {}, "headers": { "Return-Path": "<laurent.pinchart@ideasonboard.com>", "Received": [ "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 30BB463CFA\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 10 Jun 2020 01:23:50 +0200 (CEST)", "from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id C02C531F\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 10 Jun 2020 01:23:49 +0200 (CEST)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"ukYsLLyc\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1591745029;\n\tbh=GVTSoAnQ1/ufwjjRhicbPUgvmP1GU90rJNhB0GWAxgs=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=ukYsLLycS+l8oa1l7FUnsydpRrTjjVrFZHrNejXVJnyAyt3XIU+wwy7FZ+BTTkIb0\n\tcaJ02TCnegqXhmcswnkJrzdFPAamwSHSqSrJ8Jq99HNbXlu4bdcJ8ab5E8QaiLsbQf\n\t6xO1+9zgfLJnX5eSqteple8/93Ue4YP6DFaNa2XE=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 10 Jun 2020 02:23:19 +0300", "Message-Id": "<20200609232323.29628-4-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.27.0", "In-Reply-To": "<20200609232323.29628-1-laurent.pinchart@ideasonboard.com>", "References": "<20200609232323.29628-1-laurent.pinchart@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v2 3/7] qcam: Replace explicit DRM FourCCs\n\twith libcamera formats", "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, 09 Jun 2020 23:23:50 -0000" }, "content": "Use the new pixel format constants to replace usage of macros from\ndrm_fourcc.h.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n---\n src/qcam/dng_writer.cpp | 17 +++++++++--------\n src/qcam/format_converter.cpp | 36 ++++++++++++++++++-----------------\n src/qcam/viewfinder.cpp | 10 ++++++----\n 3 files changed, 34 insertions(+), 29 deletions(-)", "diff": "diff --git a/src/qcam/dng_writer.cpp b/src/qcam/dng_writer.cpp\nindex cbd8bed3e6d0..1aa2eaa9a501 100644\n--- a/src/qcam/dng_writer.cpp\n+++ b/src/qcam/dng_writer.cpp\n@@ -14,6 +14,7 @@\n #include <tiffio.h>\n \n #include <libcamera/control_ids.h>\n+#include <libcamera/formats.h>\n \n using namespace libcamera;\n \n@@ -83,49 +84,49 @@ void thumbScanlineSBGGRxxP(const FormatInfo &info, void *output,\n }\n \n static const std::map<PixelFormat, FormatInfo> formatInfo = {\n-\t{ PixelFormat(DRM_FORMAT_SBGGR10, MIPI_FORMAT_MOD_CSI2_PACKED), {\n+\t{ formats::SBGGR10_CSI2P, {\n \t\t.bitsPerSample = 10,\n \t\t.pattern = { CFAPatternBlue, CFAPatternGreen, CFAPatternGreen, CFAPatternRed },\n \t\t.packScanline = packScanlineSBGGR10P,\n \t\t.thumbScanline = thumbScanlineSBGGRxxP,\n \t} },\n-\t{ PixelFormat(DRM_FORMAT_SGBRG10, MIPI_FORMAT_MOD_CSI2_PACKED), {\n+\t{ formats::SGBRG10_CSI2P, {\n \t\t.bitsPerSample = 10,\n \t\t.pattern = { CFAPatternGreen, CFAPatternBlue, CFAPatternRed, CFAPatternGreen },\n \t\t.packScanline = packScanlineSBGGR10P,\n \t\t.thumbScanline = thumbScanlineSBGGRxxP,\n \t} },\n-\t{ PixelFormat(DRM_FORMAT_SGRBG10, MIPI_FORMAT_MOD_CSI2_PACKED), {\n+\t{ formats::SGRBG10_CSI2P, {\n \t\t.bitsPerSample = 10,\n \t\t.pattern = { CFAPatternGreen, CFAPatternRed, CFAPatternBlue, CFAPatternGreen },\n \t\t.packScanline = packScanlineSBGGR10P,\n \t\t.thumbScanline = thumbScanlineSBGGRxxP,\n \t} },\n-\t{ PixelFormat(DRM_FORMAT_SRGGB10, MIPI_FORMAT_MOD_CSI2_PACKED), {\n+\t{ formats::SRGGB10_CSI2P, {\n \t\t.bitsPerSample = 10,\n \t\t.pattern = { CFAPatternRed, CFAPatternGreen, CFAPatternGreen, CFAPatternBlue },\n \t\t.packScanline = packScanlineSBGGR10P,\n \t\t.thumbScanline = thumbScanlineSBGGRxxP,\n \t} },\n-\t{ PixelFormat(DRM_FORMAT_SBGGR12, MIPI_FORMAT_MOD_CSI2_PACKED), {\n+\t{ formats::SBGGR12_CSI2P, {\n \t\t.bitsPerSample = 12,\n \t\t.pattern = { CFAPatternBlue, CFAPatternGreen, CFAPatternGreen, CFAPatternRed },\n \t\t.packScanline = packScanlineSBGGR12P,\n \t\t.thumbScanline = thumbScanlineSBGGRxxP,\n \t} },\n-\t{ PixelFormat(DRM_FORMAT_SGBRG12, MIPI_FORMAT_MOD_CSI2_PACKED), {\n+\t{ formats::SGBRG12_CSI2P, {\n \t\t.bitsPerSample = 12,\n \t\t.pattern = { CFAPatternGreen, CFAPatternBlue, CFAPatternRed, CFAPatternGreen },\n \t\t.packScanline = packScanlineSBGGR12P,\n \t\t.thumbScanline = thumbScanlineSBGGRxxP,\n \t} },\n-\t{ PixelFormat(DRM_FORMAT_SGRBG12, MIPI_FORMAT_MOD_CSI2_PACKED), {\n+\t{ formats::SGRBG12_CSI2P, {\n \t\t.bitsPerSample = 12,\n \t\t.pattern = { CFAPatternGreen, CFAPatternRed, CFAPatternBlue, CFAPatternGreen },\n \t\t.packScanline = packScanlineSBGGR12P,\n \t\t.thumbScanline = thumbScanlineSBGGRxxP,\n \t} },\n-\t{ PixelFormat(DRM_FORMAT_SRGGB12, MIPI_FORMAT_MOD_CSI2_PACKED), {\n+\t{ formats::SRGGB12_CSI2P, {\n \t\t.bitsPerSample = 12,\n \t\t.pattern = { CFAPatternRed, CFAPatternGreen, CFAPatternGreen, CFAPatternBlue },\n \t\t.packScanline = packScanlineSBGGR12P,\ndiff --git a/src/qcam/format_converter.cpp b/src/qcam/format_converter.cpp\nindex bf887ad446eb..4b9722d4ecf7 100644\n--- a/src/qcam/format_converter.cpp\n+++ b/src/qcam/format_converter.cpp\n@@ -11,6 +11,8 @@\n \n #include <QImage>\n \n+#include <libcamera/formats.h>\n+\n #define RGBSHIFT\t\t8\n #ifndef MAX\n #define MAX(a,b)\t\t((a)>(b)?(a):(b))\n@@ -29,79 +31,79 @@ int FormatConverter::configure(const libcamera::PixelFormat &format,\n \t\t\t const QSize &size)\n {\n \tswitch (format) {\n-\tcase DRM_FORMAT_NV12:\n+\tcase libcamera::formats::NV12:\n \t\tformatFamily_ = NV;\n \t\thorzSubSample_ = 2;\n \t\tvertSubSample_ = 2;\n \t\tnvSwap_ = false;\n \t\tbreak;\n-\tcase DRM_FORMAT_NV21:\n+\tcase libcamera::formats::NV21:\n \t\tformatFamily_ = NV;\n \t\thorzSubSample_ = 2;\n \t\tvertSubSample_ = 2;\n \t\tnvSwap_ = true;\n \t\tbreak;\n-\tcase DRM_FORMAT_NV16:\n+\tcase libcamera::formats::NV16:\n \t\tformatFamily_ = NV;\n \t\thorzSubSample_ = 2;\n \t\tvertSubSample_ = 1;\n \t\tnvSwap_ = false;\n \t\tbreak;\n-\tcase DRM_FORMAT_NV61:\n+\tcase libcamera::formats::NV61:\n \t\tformatFamily_ = NV;\n \t\thorzSubSample_ = 2;\n \t\tvertSubSample_ = 1;\n \t\tnvSwap_ = true;\n \t\tbreak;\n-\tcase DRM_FORMAT_NV24:\n+\tcase libcamera::formats::NV24:\n \t\tformatFamily_ = NV;\n \t\thorzSubSample_ = 1;\n \t\tvertSubSample_ = 1;\n \t\tnvSwap_ = false;\n \t\tbreak;\n-\tcase DRM_FORMAT_NV42:\n+\tcase libcamera::formats::NV42:\n \t\tformatFamily_ = NV;\n \t\thorzSubSample_ = 1;\n \t\tvertSubSample_ = 1;\n \t\tnvSwap_ = true;\n \t\tbreak;\n \n-\tcase DRM_FORMAT_RGB888:\n+\tcase libcamera::formats::RGB888:\n \t\tformatFamily_ = RGB;\n \t\tr_pos_ = 2;\n \t\tg_pos_ = 1;\n \t\tb_pos_ = 0;\n \t\tbpp_ = 3;\n \t\tbreak;\n-\tcase DRM_FORMAT_BGR888:\n+\tcase libcamera::formats::BGR888:\n \t\tformatFamily_ = RGB;\n \t\tr_pos_ = 0;\n \t\tg_pos_ = 1;\n \t\tb_pos_ = 2;\n \t\tbpp_ = 3;\n \t\tbreak;\n-\tcase DRM_FORMAT_ARGB8888:\n+\tcase libcamera::formats::ARGB8888:\n \t\tformatFamily_ = RGB;\n \t\tr_pos_ = 2;\n \t\tg_pos_ = 1;\n \t\tb_pos_ = 0;\n \t\tbpp_ = 4;\n \t\tbreak;\n-\tcase DRM_FORMAT_RGBA8888:\n+\tcase libcamera::formats::RGBA8888:\n \t\tformatFamily_ = RGB;\n \t\tr_pos_ = 3;\n \t\tg_pos_ = 2;\n \t\tb_pos_ = 1;\n \t\tbpp_ = 4;\n \t\tbreak;\n-\tcase DRM_FORMAT_ABGR8888:\n+\tcase libcamera::formats::ABGR8888:\n \t\tformatFamily_ = RGB;\n \t\tr_pos_ = 0;\n \t\tg_pos_ = 1;\n \t\tb_pos_ = 2;\n \t\tbpp_ = 4;\n \t\tbreak;\n-\tcase DRM_FORMAT_BGRA8888:\n+\tcase libcamera::formats::BGRA8888:\n \t\tformatFamily_ = RGB;\n \t\tr_pos_ = 1;\n \t\tg_pos_ = 2;\n@@ -109,28 +111,28 @@ int FormatConverter::configure(const libcamera::PixelFormat &format,\n \t\tbpp_ = 4;\n \t\tbreak;\n \n-\tcase DRM_FORMAT_VYUY:\n+\tcase libcamera::formats::VYUY:\n \t\tformatFamily_ = YUV;\n \t\ty_pos_ = 1;\n \t\tcb_pos_ = 2;\n \t\tbreak;\n-\tcase DRM_FORMAT_YVYU:\n+\tcase libcamera::formats::YVYU:\n \t\tformatFamily_ = YUV;\n \t\ty_pos_ = 0;\n \t\tcb_pos_ = 3;\n \t\tbreak;\n-\tcase DRM_FORMAT_UYVY:\n+\tcase libcamera::formats::UYVY:\n \t\tformatFamily_ = YUV;\n \t\ty_pos_ = 1;\n \t\tcb_pos_ = 0;\n \t\tbreak;\n-\tcase DRM_FORMAT_YUYV:\n+\tcase libcamera::formats::YUYV:\n \t\tformatFamily_ = YUV;\n \t\ty_pos_ = 0;\n \t\tcb_pos_ = 1;\n \t\tbreak;\n \n-\tcase DRM_FORMAT_MJPEG:\n+\tcase libcamera::formats::MJPEG:\n \t\tformatFamily_ = MJPEG;\n \t\tbreak;\n \ndiff --git a/src/qcam/viewfinder.cpp b/src/qcam/viewfinder.cpp\nindex 7a308f53f576..dcf8a15d2df6 100644\n--- a/src/qcam/viewfinder.cpp\n+++ b/src/qcam/viewfinder.cpp\n@@ -17,18 +17,20 @@\n #include <QPainter>\n #include <QtDebug>\n \n+#include <libcamera/formats.h>\n+\n #include \"format_converter.h\"\n \n static const QMap<libcamera::PixelFormat, QImage::Format> nativeFormats\n {\n #if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)\n-\t{ libcamera::PixelFormat{ DRM_FORMAT_ABGR8888 }, QImage::Format_RGBA8888 },\n+\t{ libcamera::formats::ABGR8888, QImage::Format_RGBA8888 },\n #endif\n-\t{ libcamera::PixelFormat{ DRM_FORMAT_ARGB8888 }, QImage::Format_RGB32 },\n+\t{ libcamera::formats::ARGB8888, QImage::Format_RGB32 },\n #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)\n-\t{ libcamera::PixelFormat{ DRM_FORMAT_RGB888 }, QImage::Format_BGR888 },\n+\t{ libcamera::formats::RGB888, QImage::Format_BGR888 },\n #endif\n-\t{ libcamera::PixelFormat{ DRM_FORMAT_BGR888 }, QImage::Format_RGB888 },\n+\t{ libcamera::formats::BGR888, QImage::Format_RGB888 },\n };\n \n ViewFinder::ViewFinder(QWidget *parent)\n", "prefixes": [ "libcamera-devel", "v2", "3/7" ] }