Patch Detail
Show a patch.
GET /api/1.1/patches/3812/?format=api
{ "id": 3812, "url": "https://patchwork.libcamera.org/api/1.1/patches/3812/?format=api", "web_url": "https://patchwork.libcamera.org/patch/3812/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/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": "<20200519032505.17307-2-laurent.pinchart@ideasonboard.com>", "date": "2020-05-19T03:24:58", "name": "[libcamera-devel,1/8] cam: Pass stream roles to Capture class", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": false, "hash": "b94d12691a88de2093edcaca2c9dd50d0a5fdcb8", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/1.1/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": { "id": 14, "url": "https://patchwork.libcamera.org/api/1.1/users/14/?format=api", "username": "pinchartl", "first_name": "Laurent", "last_name": "Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "mbox": "https://patchwork.libcamera.org/patch/3812/mbox/", "series": [ { "id": 912, "url": "https://patchwork.libcamera.org/api/1.1/series/912/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=912", "date": "2020-05-19T03:24:57", "name": "libcamera: Add DRM/KMS viewfinder display to cam", "version": 1, "mbox": "https://patchwork.libcamera.org/series/912/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/3812/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/3812/checks/", "tags": {}, "headers": { "Return-Path": "<laurent.pinchart@ideasonboard.com>", "Received": [ "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 E1BD660E2A\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 19 May 2020 05:25:18 +0200 (CEST)", "from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 770749CD\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 19 May 2020 05:25:18 +0200 (CEST)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"mFCYP7c4\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1589858718;\n\tbh=LOk3AEjLrVVhMAvdxqTcaHifTmaqBlnpgfSeS4tLBqY=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=mFCYP7c4+Xw5aSZnIz8pTjxeOGrdONE6MMZp7LdOKIyEs4v3Fm4+JVnllo0uzOHUS\n\tW0HRRCbJeAs+EZCG2CXRBVHGu9R75Ta+gAuHibcTwDiKPnm00NJH9lJYSo7ZlOgXyr\n\ta6B9e6RYp69RyqBeFY38feOAYsMWcuetTk0s/wfQ=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Tue, 19 May 2020 06:24:58 +0300", "Message-Id": "<20200519032505.17307-2-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.26.2", "In-Reply-To": "<20200519032505.17307-1-laurent.pinchart@ideasonboard.com>", "References": "<20200519032505.17307-1-laurent.pinchart@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH 1/8] cam: Pass stream roles to Capture\n\tclass", "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": "Tue, 19 May 2020 03:25:19 -0000" }, "content": "The stream roles will be needed in the Capture class to verify the\nconfiguration. Store they in the CamApp class and pass them to the\nCapture class constructor.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/cam/capture.cpp | 5 +++--\n src/cam/capture.h | 4 +++-\n src/cam/main.cpp | 9 +++++----\n 3 files changed, 11 insertions(+), 7 deletions(-)", "diff": "diff --git a/src/cam/capture.cpp b/src/cam/capture.cpp\nindex 55fa2dabcee9..b7e06bcc9463 100644\n--- a/src/cam/capture.cpp\n+++ b/src/cam/capture.cpp\n@@ -16,8 +16,9 @@\n \n using namespace libcamera;\n \n-Capture::Capture(std::shared_ptr<Camera> camera, CameraConfiguration *config)\n-\t: camera_(camera), config_(config), writer_(nullptr)\n+Capture::Capture(std::shared_ptr<Camera> camera, CameraConfiguration *config,\n+\t\t const StreamRoles &roles)\n+\t: camera_(camera), config_(config), roles_(roles), writer_(nullptr)\n {\n }\n \ndiff --git a/src/cam/capture.h b/src/cam/capture.h\nindex 9bca5661070e..c0e697b831fb 100644\n--- a/src/cam/capture.h\n+++ b/src/cam/capture.h\n@@ -24,7 +24,8 @@ class Capture\n {\n public:\n \tCapture(std::shared_ptr<libcamera::Camera> camera,\n-\t\tlibcamera::CameraConfiguration *config);\n+\t\tlibcamera::CameraConfiguration *config,\n+\t\tconst libcamera::StreamRoles &roles);\n \n \tint run(EventLoop *loop, const OptionsParser::Options &options);\n private:\n@@ -35,6 +36,7 @@ private:\n \n \tstd::shared_ptr<libcamera::Camera> camera_;\n \tlibcamera::CameraConfiguration *config_;\n+\tlibcamera::StreamRoles roles_;\n \n \tstd::map<libcamera::Stream *, std::string> streamName_;\n \tBufferWriter *writer_;\ndiff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex 2512fe9da782..cdd29d500202 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -47,6 +47,7 @@ private:\n \tOptionsParser::Options options_;\n \tCameraManager *cm_;\n \tstd::shared_ptr<Camera> camera_;\n+\tStreamRoles roles_;\n \tstd::unique_ptr<libcamera::CameraConfiguration> config_;\n \tEventLoop *loop_;\n };\n@@ -194,10 +195,10 @@ int CamApp::parseOptions(int argc, char *argv[])\n \n int CamApp::prepareConfig()\n {\n-\tStreamRoles roles = StreamKeyValueParser::roles(options_[OptStream]);\n+\troles_ = StreamKeyValueParser::roles(options_[OptStream]);\n \n-\tconfig_ = camera_->generateConfiguration(roles);\n-\tif (!config_ || config_->size() != roles.size()) {\n+\tconfig_ = camera_->generateConfiguration(roles_);\n+\tif (!config_ || config_->size() != roles_.size()) {\n \t\tstd::cerr << \"Failed to get default stream configuration\"\n \t\t\t << std::endl;\n \t\treturn -EINVAL;\n@@ -326,7 +327,7 @@ int CamApp::run()\n \t}\n \n \tif (options_.isSet(OptCapture)) {\n-\t\tCapture capture(camera_, config_.get());\n+\t\tCapture capture(camera_, config_.get(), roles_);\n \t\treturn capture.run(loop_, options_);\n \t}\n \n", "prefixes": [ "libcamera-devel", "1/8" ] }