Patch Detail
Show a patch.
GET /api/patches/3376/?format=api
{ "id": 3376, "url": "https://patchwork.libcamera.org/api/patches/3376/?format=api", "web_url": "https://patchwork.libcamera.org/patch/3376/", "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": "<20200403160623.GA6354@kaaira-HP-Pavilion-Notebook>", "date": "2020-04-03T16:06:23", "name": "[libcamera-devel,v2] libcamera: pixelformats: Replace set of modifiers with single value", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "4cc0483b53ced18764c64182c8d3972200642155", "submitter": { "id": 39, "url": "https://patchwork.libcamera.org/api/people/39/?format=api", "name": "Kaaira Gupta", "email": "kgupta@es.iitr.ac.in" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/3376/mbox/", "series": [ { "id": 795, "url": "https://patchwork.libcamera.org/api/series/795/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=795", "date": "2020-04-03T16:06:23", "name": "[libcamera-devel,v2] libcamera: pixelformats: Replace set of modifiers with single value", "version": 2, "mbox": "https://patchwork.libcamera.org/series/795/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/3376/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/3376/checks/", "tags": {}, "headers": { "Return-Path": "<kgupta@es.iitr.ac.in>", "Received": [ "from mail-pf1-x435.google.com (mail-pf1-x435.google.com\n\t[IPv6:2607:f8b0:4864:20::435])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 93139600FA\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 3 Apr 2020 18:06:33 +0200 (CEST)", "by mail-pf1-x435.google.com with SMTP id u65so3687233pfb.4\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 03 Apr 2020 09:06:33 -0700 (PDT)", "from kaaira-HP-Pavilion-Notebook ([103.113.213.154])\n\tby smtp.gmail.com with ESMTPSA id\n\tq123sm6195631pfb.54.2020.04.03.09.06.28\n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tFri, 03 Apr 2020 09:06:31 -0700 (PDT)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected)\n\theader.d=es-iitr-ac-in.20150623.gappssmtp.com\n\theader.i=@es-iitr-ac-in.20150623.gappssmtp.com header.b=\"XwMTMdVb\"; \n\tdkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=es-iitr-ac-in.20150623.gappssmtp.com; s=20150623;\n\th=date:from:to:subject:message-id:mime-version:content-disposition\n\t:user-agent; bh=zE5knxhcYhCRxnze6uySiNoHusbMBNXrpSYW4s/wq0k=;\n\tb=XwMTMdVbAcmB6+LkDMBeQQk2oz58RvKfU8LxY41cM6GO27z6FNZ87vAxGOj8CQhVY2\n\tRnaUv/+SXH+5jdLymnGttPxH+gMJ+FRTT3qp086pnkZfykFz9X9aXg7p+lUc+aGo9uNd\n\tsV7oQJ1FY95ZgCJaeozj925oNJsn+SigqmswSPfr1+2925Atp//fuwWGlszN3hXOX9nL\n\tLb+7urDQYM/65yPuIrGUZrDlcUjwV+FnzluV5mgJ+Uk/6r2pqK6gGdVG/1YcVWrXdhdc\n\t/Sm9g+oQgqA6GstX1ULYu+Hq/ArRvruFFvfqWhvfdm99ZKbA0P7CNA+DVirUJlpmqsfp\n\t3ZIQ==", "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:subject:message-id:mime-version\n\t:content-disposition:user-agent;\n\tbh=zE5knxhcYhCRxnze6uySiNoHusbMBNXrpSYW4s/wq0k=;\n\tb=OX6GWgR0v6PUiHFY/OGtXh18dNPktIXl2pnrdQpBIHpmylXZRi5KqH5IveaNEN0FP/\n\t4w8/x9UNcWMyK2z7TuMDeLnxOunnt/dV7pbHcddJDSKTpMdITR0WJFNtbaEgz86Vy6IP\n\tDlGsQruAIhE8uT2mXY7fAISd26+fZePLvymU7lps0E92YYu1cSemOmt7H4eA1vLoHPMP\n\tG5tlI2pDfAXJMivA1i5UlgsVKQmmdHCQKpyZTgoM8jTavYMV/FNpBuQf2qHb01czvmGk\n\tsmHfySHN2J1XoX3RXVJ+bl8qv6p0whyLvC62Vsy786qnGpV/VHAM6FSNr7o3Z3XXEWaL\n\tKj5w==", "X-Gm-Message-State": "AGi0PuZWdgax6BDPrjTx+rggghrkH5C5sQN/z92LXnf9eIRm6afi5beD\n\tB4fEq2eZxHKo0zbN8BewNzX/Z58fxWzVcw==", "X-Google-Smtp-Source": "APiQypJAPyXrcyKqiotrYdZUCfobiGxKkFGS7/jWvT/k1tckIk0E1y5q8HKUwhhtm41mlc9QSSP8tg==", "X-Received": "by 2002:a63:7a1e:: with SMTP id v30mr8601570pgc.84.1585929991646;\n\tFri, 03 Apr 2020 09:06:31 -0700 (PDT)", "Date": "Fri, 3 Apr 2020 21:36:23 +0530", "From": "Kaaira Gupta <kgupta@es.iitr.ac.in>", "To": "libcamera-devel@lists.libcamera.org,\n\tKieran Bingham <kieran.bingham@ideasonboard.com>,\n\tHelen Koike <helen.koike@collabora.com>,\n\tVaishali Thakkar <vthakkar@vaishalithakkar.in>", "Message-ID": "<20200403160623.GA6354@kaaira-HP-Pavilion-Notebook>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=us-ascii", "Content-Disposition": "inline", "User-Agent": "Mutt/1.9.4 (2018-02-28)", "Subject": "[libcamera-devel] [PATCH v2] libcamera: pixelformats: Replace set\n\tof modifiers with single value", "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, 03 Apr 2020 16:06:34 -0000" }, "content": "DRM fourccs look like they have a per-plane modifier, but in fact each\nof them should be same. Hence instead of passing a set of modifiers for\neach fourcc in PixelFormat class, we can pass just a single modifier.\nSo, replace the set with a single value.\n\nSigned-off-by: Kaaira Gupta <kgupta@es.iitr.ac.in>\n---\nChanges since v1:\n\t- reformat the code.\n\t- Make commit message more articulate.\n\n include/libcamera/pixelformats.h | 6 +++---\n src/libcamera/pipeline/ipu3/ipu3.cpp | 2 +-\n src/libcamera/pixelformats.cpp | 24 ++++++++++++------------\n 3 files changed, 16 insertions(+), 16 deletions(-)", "diff": "diff --git a/include/libcamera/pixelformats.h b/include/libcamera/pixelformats.h\nindex 9ce6f7f..89966e5 100644\n--- a/include/libcamera/pixelformats.h\n+++ b/include/libcamera/pixelformats.h\n@@ -19,7 +19,7 @@ class PixelFormat\n {\n public:\n \tPixelFormat();\n-\texplicit PixelFormat(uint32_t fourcc, const std::set<uint64_t> &modifiers = {});\n+\texplicit PixelFormat(uint32_t fourcc, uint64_t modifier = 0);\n \n \tbool operator==(const PixelFormat &other) const;\n \tbool operator!=(const PixelFormat &other) const { return !(*this == other); }\n@@ -29,13 +29,13 @@ public:\n \n \toperator uint32_t() const { return fourcc_; }\n \tuint32_t fourcc() const { return fourcc_; }\n-\tconst std::set<uint64_t> &modifiers() const { return modifiers_; }\n+\tuint64_t modifier() const { return modifier_; }\n \n \tstd::string toString() const;\n \n private:\n \tuint32_t fourcc_;\n-\tstd::set<uint64_t> modifiers_;\n+\tuint64_t modifier_;\n };\n \n } /* namespace libcamera */\ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 1e114ca..219b90b 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -365,7 +365,7 @@ CameraConfiguration::Status IPU3CameraConfiguration::validate()\n \t\tconst Size size = cfg.size;\n \t\tconst IPU3Stream *stream;\n \n-\t\tif (cfg.pixelFormat.modifiers().count(IPU3_FORMAT_MOD_PACKED))\n+\t\tif (cfg.pixelFormat.modifier() == IPU3_FORMAT_MOD_PACKED)\n \t\t\tstream = &data_->rawStream_;\n \t\telse if (cfg.size == sensorFormat_.size)\n \t\t\tstream = &data_->outStream_;\ndiff --git a/src/libcamera/pixelformats.cpp b/src/libcamera/pixelformats.cpp\nindex 87557d9..1330dc5 100644\n--- a/src/libcamera/pixelformats.cpp\n+++ b/src/libcamera/pixelformats.cpp\n@@ -19,9 +19,9 @@ namespace libcamera {\n * \\brief libcamera image pixel format\n *\n * The PixelFormat type describes the format of images in the public libcamera\n- * API. It stores a FourCC value as a 32-bit unsigned integer and a set of\n- * modifiers. The FourCC and modifiers values are defined in the Linux kernel\n- * DRM/KMS API (see linux/drm_fourcc.h).\n+ * API. It stores a FourCC value as a 32-bit unsigned integer and a modifier.\n+ * The FourCC and modifier values are defined in the Linux kernel DRM/KMS API\n+ * (see linux/drm_fourcc.h).\n */\n \n /**\n@@ -36,12 +36,12 @@ PixelFormat::PixelFormat()\n }\n \n /**\n- * \\brief Construct a PixelFormat from a DRM FourCC and a set of modifiers\n+ * \\brief Construct a PixelFormat from a DRM FourCC and a modifier\n * \\param[in] fourcc A DRM FourCC\n- * \\param[in] modifiers A set of DRM FourCC modifiers\n+ * \\param[in] modifier A DRM FourCC modifier\n */\n-PixelFormat::PixelFormat(uint32_t fourcc, const std::set<uint64_t> &modifiers)\n-\t: fourcc_(fourcc), modifiers_(modifiers)\n+PixelFormat::PixelFormat(uint32_t fourcc, uint64_t modifier)\n+\t: fourcc_(fourcc), modifier_(modifier)\n {\n }\n \n@@ -51,7 +51,7 @@ PixelFormat::PixelFormat(uint32_t fourcc, const std::set<uint64_t> &modifiers)\n */\n bool PixelFormat::operator==(const PixelFormat &other) const\n {\n-\treturn fourcc_ == other.fourcc() && modifiers_ == other.modifiers_;\n+\treturn fourcc_ == other.fourcc() && modifier_ == other.modifier_;\n }\n \n /**\n@@ -70,7 +70,7 @@ bool PixelFormat::operator<(const PixelFormat &other) const\n \t\treturn true;\n \tif (fourcc_ > other.fourcc_)\n \t\treturn false;\n-\treturn modifiers_ < modifiers_;\n+\treturn modifier_ < other.modifier_;\n }\n \n /**\n@@ -97,9 +97,9 @@ bool PixelFormat::operator<(const PixelFormat &other) const\n */\n \n /**\n- * \\fn PixelFormat::modifiers() const\n- * \\brief Retrieve the pixel format modifiers\n- * \\return Set of DRM modifiers\n+ * \\fn PixelFormat::modifier() const\n+ * \\brief Retrieve the pixel format modifier\n+ * \\return DRM modifier\n */\n \n /**\n", "prefixes": [ "libcamera-devel", "v2" ] }