Patch Detail
Show a patch.
GET /api/patches/382/?format=api
{ "id": 382, "url": "https://patchwork.libcamera.org/api/patches/382/?format=api", "web_url": "https://patchwork.libcamera.org/patch/382/", "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": "<20190125153340.2744-4-niklas.soderlund@ragnatech.se>", "date": "2019-01-25T15:33:36", "name": "[libcamera-devel,v2,3/7] libcamera: pipelines: add method to retrieve streams", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "aff54b2642ffff3d621490927b12a4a0c69b4a6a", "submitter": { "id": 5, "url": "https://patchwork.libcamera.org/api/people/5/?format=api", "name": "Niklas Söderlund", "email": "niklas.soderlund@ragnatech.se" }, "delegate": { "id": 16, "url": "https://patchwork.libcamera.org/api/users/16/?format=api", "username": "neg", "first_name": "Niklas", "last_name": "Söderlund", "email": "niklas.soderlund@ragnatech.se" }, "mbox": "https://patchwork.libcamera.org/patch/382/mbox/", "series": [ { "id": 132, "url": "https://patchwork.libcamera.org/api/series/132/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=132", "date": "2019-01-25T15:33:33", "name": "libcamera: add basic support for Streams and format configuration", "version": 2, "mbox": "https://patchwork.libcamera.org/series/132/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/382/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/382/checks/", "tags": {}, "headers": { "Return-Path": "<niklas.soderlund@ragnatech.se>", "Received": [ "from bin-mail-out-05.binero.net (bin-mail-out-05.binero.net\n\t[195.74.38.228])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 03D4F60C83\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 25 Jan 2019 16:33:52 +0100 (CET)", "from bismarck.berto.se (unknown [89.233.230.99])\n\tby bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA\n\tid 9d929c62-20b6-11e9-874f-005056917f90;\n\tFri, 25 Jan 2019 16:33:51 +0100 (CET)" ], "X-Halon-ID": "9d929c62-20b6-11e9-874f-005056917f90", "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, 25 Jan 2019 16:33:36 +0100", "Message-Id": "<20190125153340.2744-4-niklas.soderlund@ragnatech.se>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20190125153340.2744-1-niklas.soderlund@ragnatech.se>", "References": "<20190125153340.2744-1-niklas.soderlund@ragnatech.se>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v2 3/7] libcamera: pipelines: add method\n\tto retrieve streams", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.23", "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, 25 Jan 2019 15:33:53 -0000" }, "content": "A Camera object needs to be able to inquire its responsible\nPipelineHandler for which streams it supports. Add and implement such an\ninterface to the PipelineHandler base class and all pipeline handler\nimplementations.\n\nSigned-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n---\n src/libcamera/include/pipeline_handler.h | 3 +++\n src/libcamera/pipeline/ipu3/ipu3.cpp | 12 ++++++++++++\n src/libcamera/pipeline/uvcvideo.cpp | 12 ++++++++++++\n src/libcamera/pipeline/vimc.cpp | 12 ++++++++++++\n src/libcamera/pipeline_handler.cpp | 12 ++++++++++++\n 5 files changed, 51 insertions(+)", "diff": "diff --git a/src/libcamera/include/pipeline_handler.h b/src/libcamera/include/pipeline_handler.h\nindex 0db84217089e692a..f92cc5b5fa5e777b 100644\n--- a/src/libcamera/include/pipeline_handler.h\n+++ b/src/libcamera/include/pipeline_handler.h\n@@ -17,6 +17,7 @@ namespace libcamera {\n class CameraManager;\n class DeviceEnumerator;\n class MediaDevice;\n+class Stream;\n \n class Camera;\n class CameraData\n@@ -38,6 +39,8 @@ public:\n \tPipelineHandler(CameraManager *manager);\n \tvirtual ~PipelineHandler();\n \n+\tvirtual std::vector<Stream> streams(const Camera *camera) const = 0;\n+\n \tvirtual bool match(DeviceEnumerator *enumerator) = 0;\n \n protected:\ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex d74655d037728feb..5c35c7a53b9347a3 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -9,6 +9,7 @@\n #include <vector>\n \n #include <libcamera/camera.h>\n+#include <libcamera/stream.h>\n \n #include \"device_enumerator.h\"\n #include \"log.h\"\n@@ -27,6 +28,8 @@ public:\n \tPipelineHandlerIPU3(CameraManager *manager);\n \t~PipelineHandlerIPU3();\n \n+\tstd::vector<Stream> streams(const Camera *camera) const;\n+\n \tbool match(DeviceEnumerator *enumerator);\n \n private:\n@@ -60,6 +63,15 @@ PipelineHandlerIPU3::~PipelineHandlerIPU3()\n \t\timgu_->release();\n }\n \n+std::vector<Stream> PipelineHandlerIPU3::streams(const Camera *camera) const\n+{\n+\tstd::vector<Stream> streams;\n+\n+\tstreams.push_back(Stream(0));\n+\n+\treturn streams;\n+}\n+\n bool PipelineHandlerIPU3::match(DeviceEnumerator *enumerator)\n {\n \tDeviceMatch cio2_dm(\"ipu3-cio2\");\ndiff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp\nindex c51e8bc1f2c2bf25..e1f023245b8e63dd 100644\n--- a/src/libcamera/pipeline/uvcvideo.cpp\n+++ b/src/libcamera/pipeline/uvcvideo.cpp\n@@ -6,6 +6,7 @@\n */\n \n #include <libcamera/camera.h>\n+#include <libcamera/stream.h>\n \n #include \"device_enumerator.h\"\n #include \"media_device.h\"\n@@ -20,6 +21,8 @@ public:\n \tPipelineHandlerUVC(CameraManager *manager);\n \t~PipelineHandlerUVC();\n \n+\tstd::vector<Stream> streams(const Camera *camera) const;\n+\n \tbool match(DeviceEnumerator *enumerator);\n \n private:\n@@ -41,6 +44,15 @@ PipelineHandlerUVC::~PipelineHandlerUVC()\n \t\tmedia_->release();\n }\n \n+std::vector<Stream> PipelineHandlerUVC::streams(const Camera *camera) const\n+{\n+\tstd::vector<Stream> streams;\n+\n+\tstreams.push_back(Stream(0));\n+\n+\treturn streams;\n+}\n+\n bool PipelineHandlerUVC::match(DeviceEnumerator *enumerator)\n {\n \tDeviceMatch dm(\"uvcvideo\");\ndiff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp\nindex f58a97d51619515d..a96ec9f431361a32 100644\n--- a/src/libcamera/pipeline/vimc.cpp\n+++ b/src/libcamera/pipeline/vimc.cpp\n@@ -6,6 +6,7 @@\n */\n \n #include <libcamera/camera.h>\n+#include <libcamera/stream.h>\n \n #include \"device_enumerator.h\"\n #include \"media_device.h\"\n@@ -19,6 +20,8 @@ public:\n \tPipeHandlerVimc(CameraManager *manager);\n \t~PipeHandlerVimc();\n \n+\tstd::vector<Stream> streams(const Camera *camera) const;\n+\n \tbool match(DeviceEnumerator *enumerator);\n \n private:\n@@ -36,6 +39,15 @@ PipeHandlerVimc::~PipeHandlerVimc()\n \t\tmedia_->release();\n }\n \n+std::vector<Stream> PipeHandlerVimc::streams(const Camera *camera) const\n+{\n+\tstd::vector<Stream> streams;\n+\n+\tstreams.push_back(Stream(0));\n+\n+\treturn streams;\n+}\n+\n bool PipeHandlerVimc::match(DeviceEnumerator *enumerator)\n {\n \tDeviceMatch dm(\"vimc\");\ndiff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp\nindex 4d5344988cfe8aa2..a825e7bf882d23c2 100644\n--- a/src/libcamera/pipeline_handler.cpp\n+++ b/src/libcamera/pipeline_handler.cpp\n@@ -84,6 +84,18 @@ PipelineHandler::~PipelineHandler()\n \tcameraData_.clear();\n };\n \n+/**\n+ * \\fn PipelineHandler::streams(const Camera *camera)\n+ * \\brief Retrive a array of all streams the camera provides\n+ * \\param[in] camera The camera to retrieve streams from\n+ *\n+ * This function is the interface to extract information about streams from a\n+ * PipelineHandler.\n+ *\n+ * \\return A array of streams from the camera or a empty list if \\a camera\n+ * is not part of the PipelineHandler.\n+ */\n+\n /**\n * \\fn PipelineHandler::match(DeviceEnumerator *enumerator)\n * \\brief Match media devices and create camera instances\n", "prefixes": [ "libcamera-devel", "v2", "3/7" ] }