{"id":3847,"url":"https://patchwork.libcamera.org/api/patches/3847/?format=json","web_url":"https://patchwork.libcamera.org/patch/3847/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200522145459.16836-9-laurent.pinchart@ideasonboard.com>","date":"2020-05-22T14:54:55","name":"[libcamera-devel,PATCH/RFC,07/11] qcam: Replace explicit DRM FourCCs with libcamera formats","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"19c8682d49998d73eebe6d9f4015e5e816dcb84d","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/3847/mbox/","series":[{"id":923,"url":"https://patchwork.libcamera.org/api/series/923/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=923","date":"2020-05-22T14:54:47","name":"Introduce formats:: namespace for libcamera pixel formats","version":1,"mbox":"https://patchwork.libcamera.org/series/923/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/3847/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/3847/checks/","tags":{},"headers":{"Return-Path":"<laurent.pinchart@ideasonboard.com>","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id DC216610A5\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 22 May 2020 16:55:21 +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 850FA24D\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 22 May 2020 16:55:21 +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=\"qyV2CUbI\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1590159321;\n\tbh=APopVhowemftgOb84BkW+32SjbNmvPM+X1kozn6VODY=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=qyV2CUbIzUuu0tFVtk0liO+U74SnLYbeZQ1Cxq9GIfU9TLNeb8js7BcWeO5uRP0qo\n\tqPmW2kwrEhvMBuxi1jTTVTfw8wHzjxRFFALfBBiFyioEsxIN1aU4R70KQbbOAkeLRY\n\t593WakXupQUzObAxJ8EKW1FOE+kdssAZWThdvWZM=","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 22 May 2020 17:54:55 +0300","Message-Id":"<20200522145459.16836-9-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.26.2","In-Reply-To":"<20200522145459.16836-1-laurent.pinchart@ideasonboard.com>","References":"<20200522145459.16836-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH/RFC 07/11] qcam: Replace explicit DRM\n\tFourCCs with 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":"Fri, 22 May 2020 14:55:24 -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>\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 0d68f62ee6d7..ac83d7e6c397 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_BGR888 }, QImage::Format_BGR888 },\n+\t{ libcamera::formats::BGR888, QImage::Format_BGR888 },\n #endif\n-\t{ libcamera::PixelFormat{ DRM_FORMAT_RGB888 }, QImage::Format_RGB888 },\n+\t{ libcamera::formats::RGB888, QImage::Format_RGB888 },\n };\n \n ViewFinder::ViewFinder(QWidget *parent)\n","prefixes":["libcamera-devel","PATCH/RFC","07/11"]}