{"id":2246,"url":"https://patchwork.libcamera.org/api/1.1/patches/2246/?format=json","web_url":"https://patchwork.libcamera.org/patch/2246/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20191027234312.35284-9-jacopo@jmondi.org>","date":"2019-10-27T23:43:10","name":"[libcamera-devel,08/10] libcamera: pipeline: Use PixelFormat for application formats","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"6d6703e2cc3914bdb9f3911c1af39ec14c3503c3","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/1.1/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/2246/mbox/","series":[{"id":559,"url":"https://patchwork.libcamera.org/api/1.1/series/559/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=559","date":"2019-10-27T23:43:02","name":"libcamera: Use DRM_FORMAT_* fourcc codes","version":1,"mbox":"https://patchwork.libcamera.org/series/559/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/2246/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2246/checks/","tags":{},"headers":{"Return-Path":"","Received":["from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net\n\t[217.70.183.200])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 447E161517\n\tfor ;\n\tMon, 28 Oct 2019 00:41:29 +0100 (CET)","from uno.localdomain (143.121.2.93.rev.sfr.net [93.2.121.143])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay7-d.mail.gandi.net (Postfix) with ESMTPSA id D1CAD20002;\n\tSun, 27 Oct 2019 23:41:28 +0000 (UTC)"],"X-Originating-IP":"93.2.121.143","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 28 Oct 2019 00:43:10 +0100","Message-Id":"<20191027234312.35284-9-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.23.0","In-Reply-To":"<20191027234312.35284-1-jacopo@jmondi.org>","References":"<20191027234312.35284-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 08/10] libcamera: pipeline: Use\n\tPixelFormat for application 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":"Sun, 27 Oct 2019 23:41:29 -0000"},"content":"Use the newly defined PixelFormat, which uses the DRM_FORMAT_* fourcc\nfor image formats provided to applications.\n\nSigned-off-by: Jacopo Mondi \n---\n src/libcamera/pipeline/ipu3/ipu3.cpp | 7 ++++---\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 25 ++++++++++++------------\n src/libcamera/pipeline/uvcvideo.cpp | 4 ++--\n src/libcamera/pipeline/vimc.cpp | 15 +++++++-------\n 4 files changed, 27 insertions(+), 24 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 8d3ad568d16e..1c5fccf69428 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -10,6 +10,7 @@\n #include \n #include \n \n+#include \n #include \n \n #include \n@@ -249,7 +250,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 = V4L2_PIX_FMT_NV12;\n+\tcfg.pixelFormat = DRM_FORMAT_NV12;\n \n \tif (scale) {\n \t\t/*\n@@ -404,7 +405,7 @@ CameraConfiguration *PipelineHandlerIPU3::generateConfiguration(Camera *camera,\n \t\tStreamConfiguration cfg = {};\n \t\tIPU3Stream *stream = nullptr;\n \n-\t\tcfg.pixelFormat = V4L2_PIX_FMT_NV12;\n+\t\tcfg.pixelFormat = DRM_FORMAT_NV12;\n \n \t\tswitch (role) {\n \t\tcase StreamRole::StillCapture:\n@@ -1121,7 +1122,7 @@ int ImgUDevice::configureOutput(ImgUOutput *output,\n \t\treturn 0;\n \n \tV4L2DeviceFormat outputFormat = {};\n-\toutputFormat.fourcc = V4L2_PIX_FMT_NV12;\n+\toutputFormat.fourcc = dev->toV4L2Fourcc(DRM_FORMAT_NV12);\n \toutputFormat.size = cfg.size;\n \toutputFormat.planesCount = 2;\n \ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 7a28b03b8d38..b21cf92435e7 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -11,6 +11,7 @@\n #include \n #include \n \n+#include \n #include \n \n #include \n@@ -434,14 +435,14 @@ RkISP1CameraConfiguration::RkISP1CameraConfiguration(Camera *camera,\n CameraConfiguration::Status RkISP1CameraConfiguration::validate()\n {\n \tstatic const std::array formats{\n-\t\tV4L2_PIX_FMT_YUYV,\n-\t\tV4L2_PIX_FMT_YVYU,\n-\t\tV4L2_PIX_FMT_VYUY,\n-\t\tV4L2_PIX_FMT_NV16,\n-\t\tV4L2_PIX_FMT_NV61,\n-\t\tV4L2_PIX_FMT_NV21,\n-\t\tV4L2_PIX_FMT_NV12,\n-\t\tV4L2_PIX_FMT_GREY,\n+\t\tDRM_FORMAT_YUYV,\n+\t\tDRM_FORMAT_YVYU,\n+\t\tDRM_FORMAT_VYUY,\n+\t\tDRM_FORMAT_NV16,\n+\t\tDRM_FORMAT_NV61,\n+\t\tDRM_FORMAT_NV21,\n+\t\tDRM_FORMAT_NV12,\n+\t\t/* \\todo Add support for 8-bit greyscale to DRM formats */\n \t};\n \n \tconst CameraSensor *sensor = data_->sensor_;\n@@ -462,7 +463,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 = V4L2_PIX_FMT_NV12;\n+\t\tcfg.pixelFormat = DRM_FORMAT_NV12,\n \t\tstatus = Adjusted;\n \t}\n \n@@ -541,7 +542,7 @@ CameraConfiguration *PipelineHandlerRkISP1::generateConfiguration(Camera *camera\n \t\treturn config;\n \n \tStreamConfiguration cfg{};\n-\tcfg.pixelFormat = V4L2_PIX_FMT_NV12;\n+\tcfg.pixelFormat = DRM_FORMAT_NV12;\n \tcfg.size = data->sensor_->resolution();\n \n \tconfig->addConfiguration(cfg);\n@@ -623,7 +624,7 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)\n \tLOG(RkISP1, Debug) << \"ISP output pad configured with \" << format.toString();\n \n \tV4L2DeviceFormat outputFormat = {};\n-\toutputFormat.fourcc = cfg.pixelFormat;\n+\toutputFormat.fourcc = video_->toV4L2Fourcc(cfg.pixelFormat);\n \toutputFormat.size = cfg.size;\n \toutputFormat.planesCount = 2;\n \n@@ -632,7 +633,7 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)\n \t\treturn ret;\n \n \tif (outputFormat.size != cfg.size ||\n-\t outputFormat.fourcc != cfg.pixelFormat) {\n+\t outputFormat.fourcc != video_->toV4L2Fourcc(cfg.pixelFormat)) {\n \t\tLOG(RkISP1, Error)\n \t\t\t<< \"Unable to configure capture in \" << cfg.toString();\n \t\treturn -EINVAL;\ndiff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp\nindex fae0ffc4de30..45448d6f8c05 100644\n--- a/src/libcamera/pipeline/uvcvideo.cpp\n+++ b/src/libcamera/pipeline/uvcvideo.cpp\n@@ -176,7 +176,7 @@ int PipelineHandlerUVC::configure(Camera *camera, CameraConfiguration *config)\n \tint ret;\n \n \tV4L2DeviceFormat format = {};\n-\tformat.fourcc = cfg.pixelFormat;\n+\tformat.fourcc = data->video_->toV4L2Fourcc(cfg.pixelFormat);\n \tformat.size = cfg.size;\n \n \tret = data->video_->setFormat(&format);\n@@ -184,7 +184,7 @@ int PipelineHandlerUVC::configure(Camera *camera, CameraConfiguration *config)\n \t\treturn ret;\n \n \tif (format.size != cfg.size ||\n-\t format.fourcc != cfg.pixelFormat)\n+\t format.fourcc != data->video_->toV4L2Fourcc(cfg.pixelFormat))\n \t\treturn -EINVAL;\n \n \tcfg.setStream(&data->stream_);\ndiff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp\nindex c16ae4cb76b5..e6ab6a085824 100644\n--- a/src/libcamera/pipeline/vimc.cpp\n+++ b/src/libcamera/pipeline/vimc.cpp\n@@ -10,6 +10,7 @@\n #include \n #include \n \n+#include \n #include \n \n #include \n@@ -106,9 +107,9 @@ private:\n namespace {\n \n constexpr std::array pixelformats{\n-\tV4L2_PIX_FMT_BGR24,\n-\tV4L2_PIX_FMT_RGB24,\n-\tV4L2_PIX_FMT_ARGB32,\n+\tDRM_FORMAT_RGB888,\n+\tDRM_FORMAT_BGR888,\n+\tDRM_FORMAT_BGRA8888,\n };\n \n } /* namespace */\n@@ -137,7 +138,7 @@ CameraConfiguration::Status VimcCameraConfiguration::validate()\n \tif (std::find(pixelformats.begin(), pixelformats.end(), cfg.pixelFormat) ==\n \t pixelformats.end()) {\n \t\tLOG(VIMC, Debug) << \"Adjusting format to RGB24\";\n-\t\tcfg.pixelFormat = V4L2_PIX_FMT_RGB24;\n+\t\tcfg.pixelFormat = DRM_FORMAT_BGR888;\n \t\tstatus = Adjusted;\n \t}\n \n@@ -186,7 +187,7 @@ CameraConfiguration *PipelineHandlerVimc::generateConfiguration(Camera *camera,\n \n \tStreamConfiguration cfg(formats.data());\n \n-\tcfg.pixelFormat = V4L2_PIX_FMT_RGB24;\n+\tcfg.pixelFormat = DRM_FORMAT_BGR888;\n \tcfg.size = { 1920, 1080 };\n \tcfg.bufferCount = 4;\n \n@@ -231,7 +232,7 @@ int PipelineHandlerVimc::configure(Camera *camera, CameraConfiguration *config)\n \t\treturn ret;\n \n \tV4L2DeviceFormat format = {};\n-\tformat.fourcc = cfg.pixelFormat;\n+\tformat.fourcc = data->video_->toV4L2Fourcc(cfg.pixelFormat);\n \tformat.size = cfg.size;\n \n \tret = data->video_->setFormat(&format);\n@@ -239,7 +240,7 @@ int PipelineHandlerVimc::configure(Camera *camera, CameraConfiguration *config)\n \t\treturn ret;\n \n \tif (format.size != cfg.size ||\n-\t format.fourcc != cfg.pixelFormat)\n+\t format.fourcc != data->video_->toV4L2Fourcc(cfg.pixelFormat))\n \t\treturn -EINVAL;\n \n \t/*\n","prefixes":["libcamera-devel","08/10"]}