{"id":3154,"url":"https://patchwork.libcamera.org/api/1.1/patches/3154/?format=json","web_url":"https://patchwork.libcamera.org/patch/3154/","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":"<20200318033200.3042855-2-niklas.soderlund@ragnatech.se>","date":"2020-03-18T03:31:53","name":"[libcamera-devel,v3,1/8] libcamera: Use PixelFormat instead of unsigned int where appropriate","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"889b49d3c2997603a73234659ea43a05d6fd0b79","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/1.1/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/3154/mbox/","series":[{"id":730,"url":"https://patchwork.libcamera.org/api/1.1/series/730/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=730","date":"2020-03-18T03:31:52","name":"libcamera: PixelFormat: Turn into a class","version":3,"mbox":"https://patchwork.libcamera.org/series/730/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/3154/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/3154/checks/","tags":{},"headers":{"Return-Path":"","Received":["from vsp-unauthed02.binero.net (vsp-unauthed02.binero.net\n\t[195.74.38.227])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 868DE6041A\n\tfor ;\n\tWed, 18 Mar 2020 04:32:36 +0100 (CET)","from bismarck.berto.se (p4fca2392.dip0.t-ipconnect.de\n\t[79.202.35.146]) by bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA\n\tid 1bbc1db1-68c9-11ea-9f85-005056917a89;\n\tWed, 18 Mar 2020 04:32:35 +0100 (CET)"],"X-Halon-ID":"1bbc1db1-68c9-11ea-9f85-005056917a89","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 18 Mar 2020 04:31:53 +0100","Message-Id":"<20200318033200.3042855-2-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20200318033200.3042855-1-niklas.soderlund@ragnatech.se>","References":"<20200318033200.3042855-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 1/8] libcamera: Use PixelFormat instead\n\tof unsigned int where appropriate","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, 18 Mar 2020 03:32:36 -0000"},"content":"Use the PixelFormat instead of unsigned int where a pixel format is to\nbe used. PixelFormat is defined as an unsigned int but is about to be\nturned into a class to add functionality.\n\nThere is no functional change in this patch.\n\nSigned-off-by: Niklas Söderlund \nReviewed-by: Laurent Pinchart \n---\n src/cam/main.cpp | 2 +-\n src/gstreamer/gstlibcamera-utils.cpp | 10 +++++-----\n src/libcamera/pipeline/ipu3/ipu3.cpp | 2 +-\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 2 +-\n src/libcamera/pipeline/uvcvideo.cpp | 4 ++--\n src/libcamera/pipeline/vimc.cpp | 4 ++--\n src/qcam/format_converter.cpp | 2 +-\n src/qcam/format_converter.h | 6 ++++--\n src/qcam/viewfinder.cpp | 2 +-\n src/qcam/viewfinder.h | 6 ++++--\n 10 files changed, 22 insertions(+), 18 deletions(-)","diff":"diff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex ea6f7914839c703e..af516f1cbf23974a 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -303,7 +303,7 @@ int CamApp::infoConfiguration()\n \t\tstd::cout << index << \": \" << cfg.toString() << std::endl;\n \n \t\tconst StreamFormats &formats = cfg.formats();\n-\t\tfor (unsigned int pixelformat : formats.pixelformats()) {\n+\t\tfor (PixelFormat pixelformat : formats.pixelformats()) {\n \t\t\tstd::cout << \" * Pixelformat: 0x\" << std::hex\n \t\t\t\t << std::setw(8) << pixelformat << \" \"\n \t\t\t\t << formats.range(pixelformat).toString()\ndiff --git a/src/gstreamer/gstlibcamera-utils.cpp b/src/gstreamer/gstlibcamera-utils.cpp\nindex 44a993fa6b6f4da1..3b3973bcea3dc759 100644\n--- a/src/gstreamer/gstlibcamera-utils.cpp\n+++ b/src/gstreamer/gstlibcamera-utils.cpp\n@@ -79,16 +79,16 @@ gst_libcamera_stream_formats_to_caps(const StreamFormats &formats)\n {\n \tGstCaps *caps = gst_caps_new_empty();\n \n-\tfor (unsigned int fourcc : formats.pixelformats()) {\n-\t\tg_autoptr(GstStructure) bare_s = bare_structure_from_fourcc(fourcc);\n+\tfor (PixelFormat pixelformat : formats.pixelformats()) {\n+\t\tg_autoptr(GstStructure) bare_s = bare_structure_from_fourcc(pixelformat);\n \n \t\tif (!bare_s) {\n \t\t\tGST_WARNING(\"Unsupported DRM format %\" GST_FOURCC_FORMAT,\n-\t\t\t\t GST_FOURCC_ARGS(fourcc));\n+\t\t\t\t GST_FOURCC_ARGS(pixelformat));\n \t\t\tcontinue;\n \t\t}\n \n-\t\tfor (const Size &size : formats.sizes(fourcc)) {\n+\t\tfor (const Size &size : formats.sizes(pixelformat)) {\n \t\t\tGstStructure *s = gst_structure_copy(bare_s);\n \t\t\tgst_structure_set(s,\n \t\t\t\t\t \"width\", G_TYPE_INT, size.width,\n@@ -97,7 +97,7 @@ gst_libcamera_stream_formats_to_caps(const StreamFormats &formats)\n \t\t\tgst_caps_append_structure(caps, s);\n \t\t}\n \n-\t\tconst SizeRange &range = formats.range(fourcc);\n+\t\tconst SizeRange &range = formats.range(pixelformat);\n \t\tif (range.hStep && range.vStep) {\n \t\t\tGstStructure *s = gst_structure_copy(bare_s);\n \t\t\tGValue val = G_VALUE_INIT;\ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 6b93c50978a76630..0c2a217c9ea8f6ba 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -348,7 +348,7 @@ CameraConfiguration::Status IPU3CameraConfiguration::validate()\n \n \tfor (unsigned int i = 0; i < config_.size(); ++i) {\n \t\tStreamConfiguration &cfg = config_[i];\n-\t\tconst unsigned int pixelFormat = cfg.pixelFormat;\n+\t\tconst PixelFormat pixelFormat = cfg.pixelFormat;\n \t\tconst Size size = cfg.size;\n \t\tconst IPU3Stream *stream;\n \ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 01977ad697a91a44..dec0ad6118241ff1 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -431,7 +431,7 @@ RkISP1CameraConfiguration::RkISP1CameraConfiguration(Camera *camera,\n \n CameraConfiguration::Status RkISP1CameraConfiguration::validate()\n {\n-\tstatic const std::array formats{\n+\tstatic const std::array formats{\n \t\tDRM_FORMAT_YUYV,\n \t\tDRM_FORMAT_YVYU,\n \t\tDRM_FORMAT_VYUY,\ndiff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp\nindex 40cc3ee7d0987ba9..320da2685795c041 100644\n--- a/src/libcamera/pipeline/uvcvideo.cpp\n+++ b/src/libcamera/pipeline/uvcvideo.cpp\n@@ -105,10 +105,10 @@ CameraConfiguration::Status UVCCameraConfiguration::validate()\n \n \tStreamConfiguration &cfg = config_[0];\n \tconst StreamFormats &formats = cfg.formats();\n-\tconst unsigned int pixelFormat = cfg.pixelFormat;\n+\tconst PixelFormat pixelFormat = cfg.pixelFormat;\n \tconst Size size = cfg.size;\n \n-\tconst std::vector pixelFormats = formats.pixelformats();\n+\tconst std::vector pixelFormats = formats.pixelformats();\n \tauto iter = std::find(pixelFormats.begin(), pixelFormats.end(), pixelFormat);\n \tif (iter == pixelFormats.end()) {\n \t\tcfg.pixelFormat = pixelFormats.front();\ndiff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp\nindex eceb16d5586acf09..a30e416e6000bcda 100644\n--- a/src/libcamera/pipeline/vimc.cpp\n+++ b/src/libcamera/pipeline/vimc.cpp\n@@ -104,7 +104,7 @@ private:\n \n namespace {\n \n-constexpr std::array pixelformats{\n+constexpr std::array pixelformats{\n \tDRM_FORMAT_RGB888,\n \tDRM_FORMAT_BGR888,\n \tDRM_FORMAT_BGRA8888,\n@@ -175,7 +175,7 @@ CameraConfiguration *PipelineHandlerVimc::generateConfiguration(Camera *camera,\n \n \tImageFormats formats;\n \n-\tfor (unsigned int pixelformat : pixelformats) {\n+\tfor (PixelFormat pixelformat : pixelformats) {\n \t\t/* The scaler hardcodes a x3 scale-up ratio. */\n \t\tstd::vector sizes{\n \t\t\tSizeRange{ 48, 48, 4096, 2160 }\ndiff --git a/src/qcam/format_converter.cpp b/src/qcam/format_converter.cpp\nindex 4604143419dde1bd..d4a66f381f5a1b78 100644\n--- a/src/qcam/format_converter.cpp\n+++ b/src/qcam/format_converter.cpp\n@@ -27,7 +27,7 @@\n #define CLIP(x)\t\t\tCLAMP(x,0,255)\n #endif\n \n-int FormatConverter::configure(unsigned int format, unsigned int width,\n+int FormatConverter::configure(libcamera::PixelFormat format, unsigned int width,\n \t\t\t unsigned int height)\n {\n \tswitch (format) {\ndiff --git a/src/qcam/format_converter.h b/src/qcam/format_converter.h\nindex 391e6a44d4ba7d4b..ff488b994ade3c3e 100644\n--- a/src/qcam/format_converter.h\n+++ b/src/qcam/format_converter.h\n@@ -9,12 +9,14 @@\n \n #include \n \n+#include \n+\n class QImage;\n \n class FormatConverter\n {\n public:\n-\tint configure(unsigned int format, unsigned int width,\n+\tint configure(libcamera::PixelFormat format, unsigned int width,\n \t\t unsigned int height);\n \n \tvoid convert(const unsigned char *src, size_t size, QImage *dst);\n@@ -31,7 +33,7 @@ private:\n \tvoid convertRGB(const unsigned char *src, unsigned char *dst);\n \tvoid convertYUV(const unsigned char *src, unsigned char *dst);\n \n-\tunsigned int format_;\n+\tlibcamera::PixelFormat format_;\n \tunsigned int width_;\n \tunsigned int height_;\n \ndiff --git a/src/qcam/viewfinder.cpp b/src/qcam/viewfinder.cpp\nindex d51eebb10aef8663..0ebb8edd49efd1b1 100644\n--- a/src/qcam/viewfinder.cpp\n+++ b/src/qcam/viewfinder.cpp\n@@ -44,7 +44,7 @@ QImage ViewFinder::getCurrentImage()\n \treturn image_->copy();\n }\n \n-int ViewFinder::setFormat(unsigned int format, unsigned int width,\n+int ViewFinder::setFormat(libcamera::PixelFormat format, unsigned int width,\n \t\t\t unsigned int height)\n {\n \tint ret;\ndiff --git a/src/qcam/viewfinder.h b/src/qcam/viewfinder.h\nindex 2ba28b60345b0cb3..2668aa4457657ef9 100644\n--- a/src/qcam/viewfinder.h\n+++ b/src/qcam/viewfinder.h\n@@ -10,6 +10,8 @@\n #include \n #include \n \n+#include \n+\n #include \"format_converter.h\"\n \n class QImage;\n@@ -20,7 +22,7 @@ public:\n \tViewFinder(QWidget *parent);\n \t~ViewFinder();\n \n-\tint setFormat(unsigned int format, unsigned int width,\n+\tint setFormat(libcamera::PixelFormat format, unsigned int width,\n \t\t unsigned int height);\n \tvoid display(const unsigned char *rgb, size_t size);\n \n@@ -31,7 +33,7 @@ protected:\n \tQSize sizeHint() const override;\n \n private:\n-\tunsigned int format_;\n+\tlibcamera::PixelFormat format_;\n \tunsigned int width_;\n \tunsigned int height_;\n \n","prefixes":["libcamera-devel","v3","1/8"]}