{"id":4013,"url":"https://patchwork.libcamera.org/api/patches/4013/?format=json","web_url":"https://patchwork.libcamera.org/patch/4013/","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":"<20200610130339.22998-1-laurent.pinchart@ideasonboard.com>","date":"2020-06-10T13:03:39","name":"[libcamera-devel,v2.1,6/7] libcamera: pipeline: Replace explicit DRM FourCCs with libcamera formats","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"7857170c1cb594a69d7a03036075a0d82244ef2c","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/4013/mbox/","series":[{"id":983,"url":"https://patchwork.libcamera.org/api/series/983/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=983","date":"2020-06-10T13:03:39","name":null,"version":1,"mbox":"https://patchwork.libcamera.org/series/983/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/4013/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/4013/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 03107600F6\n\tfor ;\n\tWed, 10 Jun 2020 15:04:03 +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 2D4CF29E\n\tfor ;\n\tWed, 10 Jun 2020 15:04:03 +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=\"fW0futP7\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1591794243;\n\tbh=gLEEy3ZTIjTMeelLNu7gQNiQqNGSxtyT5OlEaiC58+c=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=fW0futP7JGB0+6AY8GyXAgK0IBWySqto81n2KUa6icXG8G6LmSu4LmsLF7Eyu9AsK\n\tANGdJw+4nI7VT4eHC3rjJez/xfsiydP8zSGNx4G4SbMlT42jLoyuVti8eGJGGLOkVr\n\tT1JDbMQo7EZORJPvfT3CPc78GgSf8SdzelHrBYMk=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 10 Jun 2020 16:03:39 +0300","Message-Id":"<20200610130339.22998-1-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20200609232323.29628-7-laurent.pinchart@ideasonboard.com>","References":"<20200609232323.29628-7-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2.1 6/7] libcamera: pipeline: Replace\n\texplicit DRM FourCCs with libcamera formats","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Wed, 10 Jun 2020 13:04:04 -0000"},"content":"Use the new pixel format constants to replace usage of macros from\ndrm_fourcc.h.\n\nThe IPU3 pipeline handler still uses DRM FourCCs for IPU3-specific\nformats that are not defined in the libcamera public API.\n\nSigned-off-by: Laurent Pinchart \n---\nChanges since v2:\n\n- Drop include drm_fourcc.h from IPU3 pipeline handler\n\nChanges since v1:\n\n- Use formats::S[RGB]{4}_IPU3 in the IPU3 pipeline handler\n---\n src/libcamera/pipeline/ipu3/ipu3.cpp | 17 +++++++++--------\n .../pipeline/raspberrypi/raspberrypi.cpp | 10 +++++-----\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 19 ++++++++++---------\n src/libcamera/pipeline/vimc/vimc.cpp | 11 ++++++-----\n 4 files changed, 30 insertions(+), 27 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex b805fea71c2d..f0428b1baed4 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -14,6 +14,7 @@\n #include \n \n #include \n+#include \n #include \n #include \n \n@@ -34,10 +35,10 @@ LOG_DEFINE_CATEGORY(IPU3)\n class IPU3CameraData;\n \n static const std::map sensorMbusToPixel = {\n-\t{ MEDIA_BUS_FMT_SBGGR10_1X10, PixelFormat(DRM_FORMAT_SBGGR10, IPU3_FORMAT_MOD_PACKED) },\n-\t{ MEDIA_BUS_FMT_SGBRG10_1X10, PixelFormat(DRM_FORMAT_SGBRG10, IPU3_FORMAT_MOD_PACKED) },\n-\t{ MEDIA_BUS_FMT_SGRBG10_1X10, PixelFormat(DRM_FORMAT_SGRBG10, IPU3_FORMAT_MOD_PACKED) },\n-\t{ MEDIA_BUS_FMT_SRGGB10_1X10, PixelFormat(DRM_FORMAT_SRGGB10, IPU3_FORMAT_MOD_PACKED) },\n+\t{ MEDIA_BUS_FMT_SBGGR10_1X10, formats::SBGGR10_IPU3 },\n+\t{ MEDIA_BUS_FMT_SGBRG10_1X10, formats::SGBRG10_IPU3 },\n+\t{ MEDIA_BUS_FMT_SGRBG10_1X10, formats::SGRBG10_IPU3 },\n+\t{ MEDIA_BUS_FMT_SRGGB10_1X10, formats::SRGGB10_IPU3 },\n };\n \n class ImgUDevice\n@@ -261,7 +262,7 @@ IPU3CameraConfiguration::IPU3CameraConfiguration(Camera *camera,\n void IPU3CameraConfiguration::adjustStream(StreamConfiguration &cfg, bool scale)\n {\n \t/* The only pixel format the driver supports is NV12. */\n-\tcfg.pixelFormat = PixelFormat(DRM_FORMAT_NV12);\n+\tcfg.pixelFormat = formats::NV12;\n \n \tif (scale) {\n \t\t/*\n@@ -366,7 +367,7 @@ CameraConfiguration::Status IPU3CameraConfiguration::validate()\n \t\tconst Size size = cfg.size;\n \t\tconst IPU3Stream *stream;\n \n-\t\tif (cfg.pixelFormat.modifier() == IPU3_FORMAT_MOD_PACKED)\n+\t\tif (cfg.pixelFormat.modifier())\n \t\t\tstream = &data_->rawStream_;\n \t\telse if (cfg.size == sensorFormat_.size)\n \t\t\tstream = &data_->outStream_;\n@@ -430,7 +431,7 @@ CameraConfiguration *PipelineHandlerIPU3::generateConfiguration(Camera *camera,\n \t\tStreamConfiguration cfg = {};\n \t\tIPU3Stream *stream = nullptr;\n \n-\t\tcfg.pixelFormat = PixelFormat(DRM_FORMAT_NV12);\n+\t\tcfg.pixelFormat = formats::NV12;\n \n \t\tswitch (role) {\n \t\tcase StreamRole::StillCapture:\n@@ -1193,7 +1194,7 @@ int ImgUDevice::configureOutput(ImgUOutput *output,\n \t\treturn 0;\n \n \t*outputFormat = {};\n-\toutputFormat->fourcc = dev->toV4L2PixelFormat(PixelFormat(DRM_FORMAT_NV12));\n+\toutputFormat->fourcc = dev->toV4L2PixelFormat(formats::NV12);\n \toutputFormat->size = cfg.size;\n \toutputFormat->planesCount = 2;\n \ndiff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\nindex 7f23666ea8f4..60985b716833 100644\n--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n@@ -13,12 +13,12 @@\n \n #include \n #include \n+#include \n #include \n #include \n #include \n #include \n \n-#include \n #include \n \n #include \"libcamera/internal/camera_sensor.h\"\n@@ -490,7 +490,7 @@ CameraConfiguration::Status RPiCameraConfiguration::validate()\n \n \t\tif (fmts.find(V4L2PixelFormat::fromPixelFormat(cfgPixFmt, false)) == fmts.end()) {\n \t\t\t/* If we cannot find a native format, use a default one. */\n-\t\t\tcfgPixFmt = PixelFormat(DRM_FORMAT_NV12);\n+\t\t\tcfgPixFmt = formats::NV12;\n \t\t\tstatus = Adjusted;\n \t\t}\n \t}\n@@ -537,20 +537,20 @@ CameraConfiguration *PipelineHandlerRPi::generateConfiguration(Camera *camera,\n \t\t\tbreak;\n \n \t\tcase StreamRole::StillCapture:\n-\t\t\tcfg.pixelFormat = PixelFormat(DRM_FORMAT_NV12);\n+\t\t\tcfg.pixelFormat = formats::NV12;\n \t\t\t/* Return the largest sensor resolution. */\n \t\t\tcfg.size = data->sensor_->resolution();\n \t\t\tcfg.bufferCount = 1;\n \t\t\tbreak;\n \n \t\tcase StreamRole::VideoRecording:\n-\t\t\tcfg.pixelFormat = PixelFormat(DRM_FORMAT_NV12);\n+\t\t\tcfg.pixelFormat = formats::NV12;\n \t\t\tcfg.size = { 1920, 1080 };\n \t\t\tcfg.bufferCount = 4;\n \t\t\tbreak;\n \n \t\tcase StreamRole::Viewfinder:\n-\t\t\tcfg.pixelFormat = PixelFormat(DRM_FORMAT_ARGB8888);\n+\t\t\tcfg.pixelFormat = formats::ARGB8888;\n \t\t\tcfg.size = { 800, 600 };\n \t\t\tcfg.bufferCount = 4;\n \t\t\tbreak;\ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 900f873ab028..e439f3149bce 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -16,6 +16,7 @@\n #include \n #include \n #include \n+#include \n #include \n #include \n #include \n@@ -459,13 +460,13 @@ RkISP1CameraConfiguration::RkISP1CameraConfiguration(Camera *camera,\n CameraConfiguration::Status RkISP1CameraConfiguration::validate()\n {\n \tstatic const std::array formats{\n-\t\tPixelFormat(DRM_FORMAT_YUYV),\n-\t\tPixelFormat(DRM_FORMAT_YVYU),\n-\t\tPixelFormat(DRM_FORMAT_VYUY),\n-\t\tPixelFormat(DRM_FORMAT_NV16),\n-\t\tPixelFormat(DRM_FORMAT_NV61),\n-\t\tPixelFormat(DRM_FORMAT_NV21),\n-\t\tPixelFormat(DRM_FORMAT_NV12),\n+\t\tformats::YUYV,\n+\t\tformats::YVYU,\n+\t\tformats::VYUY,\n+\t\tformats::NV16,\n+\t\tformats::NV61,\n+\t\tformats::NV21,\n+\t\tformats::NV12,\n \t\t/* \\todo Add support for 8-bit greyscale to DRM formats */\n \t};\n \n@@ -487,7 +488,7 @@ CameraConfiguration::Status RkISP1CameraConfiguration::validate()\n \tif (std::find(formats.begin(), formats.end(), cfg.pixelFormat) ==\n \t formats.end()) {\n \t\tLOG(RkISP1, Debug) << \"Adjusting format to NV12\";\n-\t\tcfg.pixelFormat = PixelFormat(DRM_FORMAT_NV12),\n+\t\tcfg.pixelFormat = formats::NV12,\n \t\tstatus = Adjusted;\n \t}\n \n@@ -566,7 +567,7 @@ CameraConfiguration *PipelineHandlerRkISP1::generateConfiguration(Camera *camera\n \t\treturn config;\n \n \tStreamConfiguration cfg{};\n-\tcfg.pixelFormat = PixelFormat(DRM_FORMAT_NV12);\n+\tcfg.pixelFormat = formats::NV12;\n \tcfg.size = data->sensor_->resolution();\n \n \tconfig->addConfiguration(cfg);\ndiff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp\nindex 3881545b8a53..b6530662a9ba 100644\n--- a/src/libcamera/pipeline/vimc/vimc.cpp\n+++ b/src/libcamera/pipeline/vimc/vimc.cpp\n@@ -17,6 +17,7 @@\n #include \n #include \n #include \n+#include \n #include \n #include \n #include \n@@ -108,8 +109,8 @@ private:\n namespace {\n \n static const std::map pixelformats{\n-\t{ PixelFormat(DRM_FORMAT_RGB888), MEDIA_BUS_FMT_BGR888_1X24 },\n-\t{ PixelFormat(DRM_FORMAT_BGR888), MEDIA_BUS_FMT_RGB888_1X24 },\n+\t{ formats::RGB888, MEDIA_BUS_FMT_BGR888_1X24 },\n+\t{ formats::BGR888, MEDIA_BUS_FMT_RGB888_1X24 },\n };\n \n } /* namespace */\n@@ -138,7 +139,7 @@ CameraConfiguration::Status VimcCameraConfiguration::validate()\n \tconst std::vector formats = cfg.formats().pixelformats();\n \tif (std::find(formats.begin(), formats.end(), cfg.pixelFormat) == formats.end()) {\n \t\tLOG(VIMC, Debug) << \"Adjusting format to BGR888\";\n-\t\tcfg.pixelFormat = PixelFormat(DRM_FORMAT_BGR888);\n+\t\tcfg.pixelFormat = formats::BGR888;\n \t\tstatus = Adjusted;\n \t}\n \n@@ -184,7 +185,7 @@ CameraConfiguration *PipelineHandlerVimc::generateConfiguration(Camera *camera,\n \t\t * but it isn't functional within the pipeline.\n \t\t */\n \t\tif (data->media_->version() < KERNEL_VERSION(5, 7, 0)) {\n-\t\t\tif (pixelformat.first != PixelFormat(DRM_FORMAT_BGR888)) {\n+\t\t\tif (pixelformat.first != formats::BGR888) {\n \t\t\t\tLOG(VIMC, Info)\n \t\t\t\t\t<< \"Skipping unsupported pixel format \"\n \t\t\t\t\t<< pixelformat.first.toString();\n@@ -201,7 +202,7 @@ CameraConfiguration *PipelineHandlerVimc::generateConfiguration(Camera *camera,\n \n \tStreamConfiguration cfg(formats);\n \n-\tcfg.pixelFormat = PixelFormat(DRM_FORMAT_BGR888);\n+\tcfg.pixelFormat = formats::BGR888;\n \tcfg.size = { 1920, 1080 };\n \tcfg.bufferCount = 4;\n \n","prefixes":["libcamera-devel","v2.1","6/7"]}