[{"id":5164,"web_url":"https://patchwork.libcamera.org/comment/5164/","msgid":"<20200610143333.GE192296@oden.dyn.berto.se>","date":"2020-06-10T14:33:33","subject":"Re: [libcamera-devel] [PATCH v2 3/7] qcam: Replace explicit DRM\n\tFourCCs with libcamera formats","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Laurent,\n\nThanks for your work.\n\nOn 2020-06-10 02:23:19 +0300, Laurent Pinchart wrote:\n> Use the new pixel format constants to replace usage of macros from\n> drm_fourcc.h.\n> \n> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n\nReviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n\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(-)\n> \n> diff --git a/src/qcam/dng_writer.cpp b/src/qcam/dng_writer.cpp\n> index 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,\n> diff --git a/src/qcam/format_converter.cpp b/src/qcam/format_converter.cpp\n> index 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>  \n> diff --git a/src/qcam/viewfinder.cpp b/src/qcam/viewfinder.cpp\n> index 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> -- \n> Regards,\n> \n> Laurent Pinchart\n> \n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"<niklas.soderlund@ragnatech.se>","Received":["from mail-lf1-x144.google.com (mail-lf1-x144.google.com\n\t[IPv6:2a00:1450:4864:20::144])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 62A34600F7\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 10 Jun 2020 16:33:35 +0200 (CEST)","by mail-lf1-x144.google.com with SMTP id e125so1607980lfd.1\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 10 Jun 2020 07:33:35 -0700 (PDT)","from localhost (h-209-203.A463.priv.bahnhof.se. [155.4.209.203])\n\tby smtp.gmail.com with ESMTPSA id\n\ty3sm5043359ljk.39.2020.06.10.07.33.33\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 10 Jun 2020 07:33:33 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected)\n\theader.d=ragnatech-se.20150623.gappssmtp.com\n\theader.i=@ragnatech-se.20150623.gappssmtp.com header.b=\"WyC0hCYX\"; \n\tdkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=ragnatech-se.20150623.gappssmtp.com; s=20150623;\n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:content-transfer-encoding:in-reply-to;\n\tbh=fO2IgP9o9Rz9YpiBPW5+wvosrqSroh3uEC0e29fIkE4=;\n\tb=WyC0hCYXaXwer+wQ2EDOgBVWSiqZaWHgOe1hjDRivLZrFdMx2MO++g0lmLHNoMhDjU\n\tCrPGTirTVlX8S2+6/XGRN2fwJyYo2AV6e5qMTh08ODWzApQX1fW8nidAPeyeFWXkiyK3\n\tDyUdhfMLGmE1SlMElw3BlaxqYcLtZPP5SvZGAljTqAU9ii1BOyD+fLOdFaawe+H1UZP1\n\tqg095kSbFzsxwEXUpUDHH0FOxoNh7rFCc5ZIchmApuCKEFnqbpHVDy/p7pLyH0KtoZ7d\n\t31+HZH6Z/9BeAeKs5D2p3qRtJApXWoJB9xhRxBqWJYFcq3CmhvnVeqBC8THzSs1mZW7i\n\tzV3w==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:content-transfer-encoding\n\t:in-reply-to;\n\tbh=fO2IgP9o9Rz9YpiBPW5+wvosrqSroh3uEC0e29fIkE4=;\n\tb=J5gCjMSW0EvRi2Df9ab0MaOSfP8aN4FVrwNRnFJaKRDv49DLDxJ3+4JfybkPqrydch\n\tyCWGq8oFPop2EjBD9lyv6QMCEa2VszDvPgIv+uelMNVN9Bbw5VtD3c/PHAUu7j7HhNwC\n\tZ2R77bniTc/Me/58IsJHW52WfNl1OkLjsWodxD9RH5PWRxlBZiv0jz6RP5rfXCDJ9Qg9\n\tL4zrKsfWQn/lBGQPE1nli+YMB6xhduSaCN1AjjHdhLoRFbYpB9cYRuwEhvks8SVS61zt\n\t1swei7M8snd176St3y56Tm6tsDhqtyzLFUVGPhldtbSyBQMEDuxib16pENZyN7kCa3D2\n\tobow==","X-Gm-Message-State":"AOAM531U6LqsrTmxjNqExVGpFURsW8JWAcZJjB1RxJDcfzSQkybcoCdk\n\tFVFlnyMyPCTC9qCYO3vTmb2JdBn+npE=","X-Google-Smtp-Source":"ABdhPJyYp4PNxdbtwlV+EPoWKkQ8cRwQWhnKrFHQjHqDgWiF5ialGrMujfPWe/UXepOh45mExicLpQ==","X-Received":"by 2002:a05:6512:3111:: with SMTP id\n\tn17mr1898813lfb.137.1591799614667; \n\tWed, 10 Jun 2020 07:33:34 -0700 (PDT)","Date":"Wed, 10 Jun 2020 16:33:33 +0200","From":"Niklas =?iso-8859-1?q?S=F6derlund?= <niklas.soderlund@ragnatech.se>","To":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20200610143333.GE192296@oden.dyn.berto.se>","References":"<20200609232323.29628-1-laurent.pinchart@ideasonboard.com>\n\t<20200609232323.29628-4-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=iso-8859-1","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20200609232323.29628-4-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v2 3/7] 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":"Wed, 10 Jun 2020 14:33:35 -0000"}}]