Patch Detail
Show a patch.
GET /api/patches/2914/?format=api
{ "id": 2914, "url": "https://patchwork.libcamera.org/api/patches/2914/?format=api", "web_url": "https://patchwork.libcamera.org/patch/2914/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20200228032913.497826-5-niklas.soderlund@ragnatech.se>", "date": "2020-02-28T03:29:11", "name": "[libcamera-devel,RFC,4/6] libcamera: PixelFormat: Add operations to operate on names", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "73766d86e1dc74ae0e1b9b72b2557dbb8c14b1ef", "submitter": { "id": 5, "url": "https://patchwork.libcamera.org/api/people/5/?format=api", "name": "Niklas Söderlund", "email": "niklas.soderlund@ragnatech.se" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/2914/mbox/", "series": [ { "id": 694, "url": "https://patchwork.libcamera.org/api/series/694/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=694", "date": "2020-02-28T03:29:07", "name": "libcamera: PixelFormat: Turn into a class", "version": 1, "mbox": "https://patchwork.libcamera.org/series/694/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/2914/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/2914/checks/", "tags": {}, "headers": { "Return-Path": "<niklas.soderlund@ragnatech.se>", "Received": [ "from bin-mail-out-06.binero.net (bin-mail-out-06.binero.net\n\t[195.74.38.229])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 0CD826271F\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 28 Feb 2020 04:29:40 +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 8cd1328a-59da-11ea-9f85-005056917a89;\n\tFri, 28 Feb 2020 04:29:39 +0100 (CET)" ], "X-Halon-ID": "8cd1328a-59da-11ea-9f85-005056917a89", "Authorized-sender": "niklas@soderlund.pp.se", "From": "=?utf-8?q?Niklas_S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 28 Feb 2020 04:29:11 +0100", "Message-Id": "<20200228032913.497826-5-niklas.soderlund@ragnatech.se>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20200228032913.497826-1-niklas.soderlund@ragnatech.se>", "References": "<20200228032913.497826-1-niklas.soderlund@ragnatech.se>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [RFC 4/6] libcamera: PixelFormat: Add operations\n\tto operate on names", "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, 28 Feb 2020 03:29:40 -0000" }, "content": "Add a name to each pixel format and extend PixelFormat to be constructed\nfrom a name and to retrieve the name for printing. Make use of the new\nfunctionality to demonstrate it.\n\n- Update the cam utility to read and print the pixel format name instead\n of the fourcc integer number.\n\n- Update log messages to print the name instead of the fourcc integer\n number.\n\nSigned-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n---\n include/libcamera/pixelformats.h | 3 ++\n src/cam/main.cpp | 9 ++---\n src/libcamera/pipeline/uvcvideo.cpp | 4 +-\n src/libcamera/pixelformats.cpp | 58 ++++++++++++++++++++---------\n src/libcamera/stream.cpp | 2 +-\n 5 files changed, 51 insertions(+), 25 deletions(-)", "diff": "diff --git a/include/libcamera/pixelformats.h b/include/libcamera/pixelformats.h\nindex f0951e983192d5e8..8cea3a90ef2cc7ae 100644\n--- a/include/libcamera/pixelformats.h\n+++ b/include/libcamera/pixelformats.h\n@@ -24,6 +24,7 @@ public:\n \tPixelFormat();\n \tPixelFormat(const PixelFormat &other);\n \texplicit PixelFormat(uint32_t drm_fourcc, const std::set<uint32_t> &drm_modifiers);\n+\texplicit PixelFormat(const std::string &name);\n \n \tPixelFormat &operator=(const PixelFormat &other);\n \n@@ -31,6 +32,7 @@ public:\n \tbool operator!=(const PixelFormat &other) const;\n \tbool operator<(const PixelFormat &other) const;\n \n+\tconst std::string &name() const;\n \tuint32_t v4l2() const;\n \tuint32_t fourcc() const;\n \tconst std::set<uint32_t> &modifiers() const;\n@@ -47,6 +49,7 @@ protected:\n private:\n \tconst PixelFormatEntry *fromDRM(uint32_t drm_fourcc, const std::set<uint32_t> &drm_modifiers) const;\n \tconst PixelFormatEntry *fromV4L2(uint32_t v4l2_fourcc) const;\n+\tconst PixelFormatEntry *fromName(const std::string &name) const;\n \n \tconst PixelFormatEntry *format_;\n };\ndiff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex c8ef79daea37d8b6..0a08e362294fc9ee 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -159,7 +159,7 @@ int CamApp::parseOptions(int argc, char *argv[])\n \t\t\t\t ArgumentRequired);\n \tstreamKeyValue.addOption(\"height\", OptionInteger, \"Height in pixels\",\n \t\t\t\t ArgumentRequired);\n-\tstreamKeyValue.addOption(\"pixelformat\", OptionInteger, \"Pixel format\",\n+\tstreamKeyValue.addOption(\"pixelformat\", OptionString, \"Pixel format\",\n \t\t\t\t ArgumentRequired);\n \n \tOptionsParser parser;\n@@ -247,9 +247,9 @@ int CamApp::prepareConfig()\n \t\t\tif (opt.isSet(\"height\"))\n \t\t\t\tcfg.size.height = opt[\"height\"];\n \n-\t\t\t/* TODO: Translate 4CC string to ID. */\n \t\t\tif (opt.isSet(\"pixelformat\"))\n-\t\t\t\tcfg.pixelFormat = PixelFormat(opt[\"pixelformat\"], {});\n+\t\t\t\tcfg.pixelFormat =\n+\t\t\t\t\tPixelFormat(opt[\"pixelformat\"].toString());\n \t\t}\n \t}\n \n@@ -282,8 +282,7 @@ int CamApp::infoConfiguration()\n \n \t\tconst StreamFormats &formats = cfg.formats();\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.fourcc() << \" \"\n+\t\t\tstd::cout << \" * Pixelformat: \" << pixelformat.name() << \" \"\n \t\t\t\t << formats.range(pixelformat).toString()\n \t\t\t\t << std::endl;\n \ndiff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp\nindex 5f3e52f691aaeae4..75fbfe1eb9145424 100644\n--- a/src/libcamera/pipeline/uvcvideo.cpp\n+++ b/src/libcamera/pipeline/uvcvideo.cpp\n@@ -115,8 +115,8 @@ CameraConfiguration::Status UVCCameraConfiguration::validate()\n \tif (iter == pixelFormats.end()) {\n \t\tcfg.pixelFormat = pixelFormats.front();\n \t\tLOG(UVC, Debug)\n-\t\t\t<< \"Adjusting pixel format from \" << pixelFormat.fourcc()\n-\t\t\t<< \" to \" << cfg.pixelFormat.fourcc();\n+\t\t\t<< \"Adjusting pixel format from \" << pixelFormat.name()\n+\t\t\t<< \" to \" << cfg.pixelFormat.name();\n \t\tstatus = Adjusted;\n \t}\n \ndiff --git a/src/libcamera/pixelformats.cpp b/src/libcamera/pixelformats.cpp\nindex b2aacbc39b9ca16a..70f41d86a23baceb 100644\n--- a/src/libcamera/pixelformats.cpp\n+++ b/src/libcamera/pixelformats.cpp\n@@ -35,6 +35,7 @@ LOG_DEFINE_CATEGORY(PixelFormats)\n */\n \n struct PixelFormatEntry {\n+\tstd::string name;\n \tuint32_t v4l2;\n \tuint32_t drm;\n \tstd::set<uint32_t> modifiers;\n@@ -42,27 +43,27 @@ struct PixelFormatEntry {\n \n static const std::vector<PixelFormatEntry> pixelFormats = {\n \t/* Invalid format, important to be first in list. */\n-\t{ .v4l2 = 0,\t\t\t.drm = DRM_FORMAT_INVALID,\t.modifiers = {} },\n+\t{ .name = \"INVALID\",\t.v4l2 = 0,\t\t\t.drm = DRM_FORMAT_INVALID,\t.modifiers = {} },\n \t/* RGB formats. */\n-\t{ .v4l2 = V4L2_PIX_FMT_RGB24,\t.drm = DRM_FORMAT_BGR888,\t.modifiers = {} },\n-\t{ .v4l2 = V4L2_PIX_FMT_BGR24,\t.drm = DRM_FORMAT_RGB888,\t.modifiers = {} },\n-\t{ .v4l2 = V4L2_PIX_FMT_ARGB32,\t.drm = DRM_FORMAT_BGRA8888,\t.modifiers = {} },\n+\t{ .name = \"RGR888\",\t.v4l2 = V4L2_PIX_FMT_RGB24,\t.drm = DRM_FORMAT_BGR888,\t.modifiers = {} },\n+\t{ .name = \"RGB888\",\t.v4l2 = V4L2_PIX_FMT_BGR24,\t.drm = DRM_FORMAT_RGB888,\t.modifiers = {} },\n+\t{ .name = \"BGRA8888\",\t.v4l2 = V4L2_PIX_FMT_ARGB32,\t.drm = DRM_FORMAT_BGRA8888,\t.modifiers = {} },\n \t/* YUV packed formats. */\n-\t{ .v4l2 = V4L2_PIX_FMT_YUYV,\t.drm = DRM_FORMAT_YUYV,\t\t.modifiers = {} },\n-\t{ .v4l2 = V4L2_PIX_FMT_YVYU,\t.drm = DRM_FORMAT_YVYU,\t\t.modifiers = {} },\n-\t{ .v4l2 = V4L2_PIX_FMT_UYVY,\t.drm = DRM_FORMAT_UYVY,\t\t.modifiers = {} },\n-\t{ .v4l2 = V4L2_PIX_FMT_VYUY,\t.drm = DRM_FORMAT_VYUY,\t\t.modifiers = {} },\n+\t{ .name = \"YUYV\",\t.v4l2 = V4L2_PIX_FMT_YUYV,\t.drm = DRM_FORMAT_YUYV,\t\t.modifiers = {} },\n+\t{ .name = \"YVYU\",\t.v4l2 = V4L2_PIX_FMT_YVYU,\t.drm = DRM_FORMAT_YVYU,\t\t.modifiers = {} },\n+\t{ .name = \"UYVY\",\t.v4l2 = V4L2_PIX_FMT_UYVY,\t.drm = DRM_FORMAT_UYVY,\t\t.modifiers = {} },\n+\t{ .name = \"VYUY\",\t.v4l2 = V4L2_PIX_FMT_VYUY,\t.drm = DRM_FORMAT_VYUY,\t\t.modifiers = {} },\n \t/* YUY planar formats. */\n-\t{ .v4l2 = V4L2_PIX_FMT_NV16,\t.drm = DRM_FORMAT_NV16,\t\t.modifiers = {} },\n-\t{ .v4l2 = V4L2_PIX_FMT_NV16M,\t.drm = DRM_FORMAT_NV16,\t\t.modifiers = {} },\n-\t{ .v4l2 = V4L2_PIX_FMT_NV61,\t.drm = DRM_FORMAT_NV61,\t\t.modifiers = {} },\n-\t{ .v4l2 = V4L2_PIX_FMT_NV61M,\t.drm = DRM_FORMAT_NV61,\t\t.modifiers = {} },\n-\t{ .v4l2 = V4L2_PIX_FMT_NV12,\t.drm = DRM_FORMAT_NV12,\t\t.modifiers = {} },\n-\t{ .v4l2 = V4L2_PIX_FMT_NV12M,\t.drm = DRM_FORMAT_NV12,\t\t.modifiers = {} },\n-\t{ .v4l2 = V4L2_PIX_FMT_NV21,\t.drm = DRM_FORMAT_NV21,\t\t.modifiers = {} },\n-\t{ .v4l2 = V4L2_PIX_FMT_NV21M,\t.drm = DRM_FORMAT_NV21,\t\t.modifiers = {} },\n+\t{ .name = \"NV16\",\t.v4l2 = V4L2_PIX_FMT_NV16,\t.drm = DRM_FORMAT_NV16,\t\t.modifiers = {} },\n+\t{ .name = \"NV16M\",\t.v4l2 = V4L2_PIX_FMT_NV16M,\t.drm = DRM_FORMAT_NV16,\t\t.modifiers = {} },\n+\t{ .name = \"NV61\",\t.v4l2 = V4L2_PIX_FMT_NV61,\t.drm = DRM_FORMAT_NV61,\t\t.modifiers = {} },\n+\t{ .name = \"NV61M\",\t.v4l2 = V4L2_PIX_FMT_NV61M,\t.drm = DRM_FORMAT_NV61,\t\t.modifiers = {} },\n+\t{ .name = \"NV12\",\t.v4l2 = V4L2_PIX_FMT_NV12,\t.drm = DRM_FORMAT_NV12,\t\t.modifiers = {} },\n+\t{ .name = \"NV12M\",\t.v4l2 = V4L2_PIX_FMT_NV12M,\t.drm = DRM_FORMAT_NV12,\t\t.modifiers = {} },\n+\t{ .name = \"NV21\",\t.v4l2 = V4L2_PIX_FMT_NV21,\t.drm = DRM_FORMAT_NV21,\t\t.modifiers = {} },\n+\t{ .name = \"NV21M\",\t.v4l2 = V4L2_PIX_FMT_NV21M,\t.drm = DRM_FORMAT_NV21,\t\t.modifiers = {} },\n \t/* Compressed formats. */\n-\t{ .v4l2 = V4L2_PIX_FMT_MJPEG,\t.drm = DRM_FORMAT_MJPEG,\t.modifiers = {} },\n+\t{ .name = \"MJPEG\",\t.v4l2 = V4L2_PIX_FMT_MJPEG,\t.drm = DRM_FORMAT_MJPEG,\t.modifiers = {} },\n };\n \n PixelFormat::PixelFormat()\n@@ -85,6 +86,11 @@ PixelFormat::PixelFormat(uint32_t v4l2_fourcc)\n {\n }\n \n+PixelFormat::PixelFormat(const std::string &name)\n+\t: format_(fromName(name))\n+{\n+}\n+\n PixelFormat &PixelFormat::operator=(const PixelFormat &other)\n {\n \tformat_ = other.format_;\n@@ -107,6 +113,11 @@ bool PixelFormat::operator<(const PixelFormat &other) const\n \treturn format_ > other.format_;\n }\n \n+const std::string &PixelFormat::name() const\n+{\n+\treturn format_->name;\n+}\n+\n uint32_t PixelFormat::v4l2() const\n {\n \treturn format_->v4l2;\n@@ -149,4 +160,17 @@ const PixelFormatEntry *PixelFormat::fromV4L2(uint32_t v4l2_fourcc) const\n \treturn &pixelFormats[0];\n }\n \n+const PixelFormatEntry *PixelFormat::fromName(const std::string &name) const\n+{\n+\tfor (const PixelFormatEntry &entry : pixelFormats)\n+\t\tif (entry.name == name)\n+\t\t\treturn &entry;\n+\n+\tLOG(PixelFormats, Error)\n+\t\t<< \"Unsupported name for pixel format \"\n+\t\t<< name;\n+\n+\treturn &pixelFormats[0];\n+}\n+\n } /* namespace libcamera */\ndiff --git a/src/libcamera/stream.cpp b/src/libcamera/stream.cpp\nindex dbce550ca8d0b7b1..e82ffd8f3b211925 100644\n--- a/src/libcamera/stream.cpp\n+++ b/src/libcamera/stream.cpp\n@@ -348,7 +348,7 @@ StreamConfiguration::StreamConfiguration(const StreamFormats &formats)\n std::string StreamConfiguration::toString() const\n {\n \tstd::stringstream ss;\n-\tss << size.toString() << \"-\" << utils::hex(pixelFormat.fourcc());\n+\tss << size.toString() << \"-\" << pixelFormat.name();\n \treturn ss.str();\n }\n \n", "prefixes": [ "libcamera-devel", "RFC", "4/6" ] }