Patch Detail
Show a patch.
GET /api/patches/11086/?format=api
{ "id": 11086, "url": "https://patchwork.libcamera.org/api/patches/11086/?format=api", "web_url": "https://patchwork.libcamera.org/patch/11086/", "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": "<20210131224702.8838-8-laurent.pinchart@ideasonboard.com>", "date": "2021-01-31T22:46:49", "name": "[libcamera-devel,07/20] libcamera: pipeline: simple: converter: Replace open() with isValid()", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "2028a4aad6c54c32ae5ad2ddb0b1f5b514b3093b", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": { "id": 14, "url": "https://patchwork.libcamera.org/api/users/14/?format=api", "username": "pinchartl", "first_name": "Laurent", "last_name": "Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "mbox": "https://patchwork.libcamera.org/patch/11086/mbox/", "series": [ { "id": 1633, "url": "https://patchwork.libcamera.org/api/series/1633/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1633", "date": "2021-01-31T22:46:42", "name": "[libcamera-devel,01/20] libcamera: pipeline: simple: Manage converter with std::unique_ptr<>", "version": 1, "mbox": "https://patchwork.libcamera.org/series/1633/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/11086/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/11086/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "X-Original-To": "parsemail@patchwork.libcamera.org", "Delivered-To": "parsemail@patchwork.libcamera.org", "Received": [ "from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 9ECDDBD808\n\tfor <parsemail@patchwork.libcamera.org>;\n\tSun, 31 Jan 2021 22:47:38 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4B511683F5;\n\tSun, 31 Jan 2021 23:47:38 +0100 (CET)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7EEF2683E7\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSun, 31 Jan 2021 23:47:30 +0100 (CET)", "from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id F4017145B; \n\tSun, 31 Jan 2021 23:47:29 +0100 (CET)" ], "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"E8zaFpn/\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1612133250;\n\tbh=G9q7k/ellxmM5flEfJJTPlrdY8qbq6/u+UXrzKmEW5o=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=E8zaFpn/yAh65Uol+dv8Nqt3HAUwT2gCkE88V4J7copkLQICUXj6ab33mZv3RTKyH\n\tFiD4FWEqgYAFpJYyFXM2jwdLDV9KYaKPLkBYXFvcGY5dm7TymJiDxAeg8vo2j41zzh\n\te3TFuyySqANTcdhZJYTBtk9vqdlOzHQ3MjGjf3Kg=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Mon, 1 Feb 2021 00:46:49 +0200", "Message-Id": "<20210131224702.8838-8-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.28.0", "In-Reply-To": "<20210131224702.8838-1-laurent.pinchart@ideasonboard.com>", "References": "<20210131224702.8838-1-laurent.pinchart@ideasonboard.com>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH 07/20] libcamera: pipeline: simple:\n\tconverter: Replace open() with isValid()", "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>", "Cc": "Phi-Bang Nguyen <pnguyen@baylibre.com>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Simplify the SimpleConverter interface by opening the M2M device in the\nconstructor. The explicit call to open() is replaced by a check through\na new isValid() function, and the unused close() function is removed.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/libcamera/pipeline/simple/converter.cpp | 20 ++++++--------------\n src/libcamera/pipeline/simple/converter.h | 3 +--\n src/libcamera/pipeline/simple/simple.cpp | 4 ++--\n 3 files changed, 9 insertions(+), 18 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/simple/converter.cpp b/src/libcamera/pipeline/simple/converter.cpp\nindex 6b3249ea92b0..f782fbc63b09 100644\n--- a/src/libcamera/pipeline/simple/converter.cpp\n+++ b/src/libcamera/pipeline/simple/converter.cpp\n@@ -39,24 +39,16 @@ SimpleConverter::SimpleConverter(MediaDevice *media)\n \n \tm2m_ = std::make_unique<V4L2M2MDevice>((*it)->deviceNode());\n \n+\tint ret = m2m_->open();\n+\tif (ret < 0) {\n+\t\tm2m_.reset();\n+\t\treturn;\n+\t}\n+\n \tm2m_->output()->bufferReady.connect(this, &SimpleConverter::outputBufferReady);\n \tm2m_->capture()->bufferReady.connect(this, &SimpleConverter::captureBufferReady);\n }\n \n-int SimpleConverter::open()\n-{\n-\tif (!m2m_)\n-\t\treturn -ENODEV;\n-\n-\treturn m2m_->open();\n-}\n-\n-void SimpleConverter::close()\n-{\n-\tif (m2m_)\n-\t\tm2m_->close();\n-}\n-\n std::vector<PixelFormat> SimpleConverter::formats(PixelFormat input)\n {\n \tif (!m2m_)\ndiff --git a/src/libcamera/pipeline/simple/converter.h b/src/libcamera/pipeline/simple/converter.h\nindex a1503a6099ff..780bfa8f7832 100644\n--- a/src/libcamera/pipeline/simple/converter.h\n+++ b/src/libcamera/pipeline/simple/converter.h\n@@ -30,8 +30,7 @@ class SimpleConverter\n public:\n \tSimpleConverter(MediaDevice *media);\n \n-\tint open();\n-\tvoid close();\n+\tbool isValid() const { return m2m_ != nullptr; }\n \n \tstd::vector<PixelFormat> formats(PixelFormat input);\n \tSizeRange sizes(const Size &input);\ndiff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex 8c0bca36bbfb..20a4ebca94fd 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -763,9 +763,9 @@ bool SimplePipelineHandler::match(DeviceEnumerator *enumerator)\n \t/* Open the converter, if any. */\n \tif (converter) {\n \t\tconverter_ = std::make_unique<SimpleConverter>(converter);\n-\t\tif (converter_->open() < 0) {\n+\t\tif (!converter_->isValid()) {\n \t\t\tLOG(SimplePipeline, Warning)\n-\t\t\t\t<< \"Failed to open converter, disabling format conversion\";\n+\t\t\t\t<< \"Failed to create converter, disabling format conversion\";\n \t\t\tconverter_.reset();\n \t\t} else {\n \t\t\tconverter_->bufferReady.connect(this, &SimplePipelineHandler::converterDone);\n", "prefixes": [ "libcamera-devel", "07/20" ] }