Patch Detail
Show a patch.
GET /api/patches/2887/?format=api
{ "id": 2887, "url": "https://patchwork.libcamera.org/api/patches/2887/?format=api", "web_url": "https://patchwork.libcamera.org/patch/2887/", "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": "<20200227200407.490616-6-nicolas.dufresne@collabora.com>", "date": "2020-02-27T20:03:45", "name": "[libcamera-devel,v2,05/27] gst: Add pads to the source", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "14989f90e9c4e54d5d1961777340e3ec46e460c7", "submitter": { "id": 31, "url": "https://patchwork.libcamera.org/api/people/31/?format=api", "name": "Nicolas Dufresne", "email": "nicolas.dufresne@collabora.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/2887/mbox/", "series": [ { "id": 693, "url": "https://patchwork.libcamera.org/api/series/693/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=693", "date": "2020-02-27T20:03:40", "name": "GStreamer Element for libcamera", "version": 2, "mbox": "https://patchwork.libcamera.org/series/693/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/2887/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/2887/checks/", "tags": {}, "headers": { "Return-Path": "<nicolas.dufresne@collabora.com>", "Received": [ "from bhuna.collabora.co.uk (bhuna.collabora.co.uk\n\t[IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 23274626FF\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 27 Feb 2020 21:04:20 +0100 (CET)", "from [127.0.0.1] (localhost [127.0.0.1])\n\t(Authenticated sender: nicolas) with ESMTPSA id A513529654A" ], "From": "Nicolas Dufresne <nicolas.dufresne@collabora.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 27 Feb 2020 15:03:45 -0500", "Message-Id": "<20200227200407.490616-6-nicolas.dufresne@collabora.com>", "X-Mailer": "git-send-email 2.24.1", "In-Reply-To": "<20200227200407.490616-1-nicolas.dufresne@collabora.com>", "References": "<20200227200407.490616-1-nicolas.dufresne@collabora.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v2 05/27] gst: Add pads to the source", "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": "Thu, 27 Feb 2020 20:04:21 -0000" }, "content": "This simply adds the boiler plate for pads on the source element. The\ndesign is that we have one pad, called \"src\", that will always be\npresent, and then more pads can be requested prior in READY or less\nstate. Initially pads have one property \"stream-role\" that let you\ndecide which role this pad will have.\n\nSigned-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>\n---\n src/gstreamer/gstlibcamerapad.cpp | 101 ++++++++++++++++++++++++++++++\n src/gstreamer/gstlibcamerapad.h | 19 ++++++\n src/gstreamer/gstlibcamerasrc.cpp | 19 ++++++\n src/gstreamer/meson.build | 1 +\n 4 files changed, 140 insertions(+)\n create mode 100644 src/gstreamer/gstlibcamerapad.cpp\n create mode 100644 src/gstreamer/gstlibcamerapad.h", "diff": "diff --git a/src/gstreamer/gstlibcamerapad.cpp b/src/gstreamer/gstlibcamerapad.cpp\nnew file mode 100644\nindex 0000000..6212c3b\n--- /dev/null\n+++ b/src/gstreamer/gstlibcamerapad.cpp\n@@ -0,0 +1,101 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2019, Collabora Ltd.\n+ * Author: Nicolas Dufresne <nicolas.dufresne@collabora.com>\n+ *\n+ * gstlibcamerapad.cpp - GStreamer Capture Pad\n+ */\n+\n+#include \"gstlibcamerapad.h\"\n+#include \"gstlibcamera-utils.h\"\n+\n+#include <libcamera/stream.h>\n+\n+using namespace libcamera;\n+\n+struct _GstLibcameraPad {\n+\tGstPad parent;\n+\tStreamRole role;\n+};\n+\n+enum {\n+\tPROP_0,\n+\tPROP_STREAM_ROLE\n+};\n+\n+G_DEFINE_TYPE(GstLibcameraPad, gst_libcamera_pad, GST_TYPE_PAD);\n+\n+static void\n+gst_libcamera_pad_set_property(GObject *object, guint prop_id,\n+\t\t\t const GValue *value, GParamSpec *pspec)\n+{\n+\tauto *self = GST_LIBCAMERA_PAD(object);\n+\tGLibLocker lock(GST_OBJECT(self));\n+\n+\tswitch (prop_id) {\n+\tcase PROP_STREAM_ROLE:\n+\t\tself->role = (StreamRole)g_value_get_enum(value);\n+\t\tbreak;\n+\tdefault:\n+\t\tG_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);\n+\t\tbreak;\n+\t}\n+}\n+\n+static void\n+gst_libcamera_pad_get_property(GObject *object, guint prop_id, GValue *value,\n+\t\t\t GParamSpec *pspec)\n+{\n+\tauto *self = GST_LIBCAMERA_PAD(object);\n+\tGLibLocker lock(GST_OBJECT(self));\n+\n+\tswitch (prop_id) {\n+\tcase PROP_STREAM_ROLE:\n+\t\tg_value_set_enum(value, self->role);\n+\t\tbreak;\n+\tdefault:\n+\t\tG_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);\n+\t\tbreak;\n+\t}\n+}\n+\n+static void\n+gst_libcamera_pad_init(GstLibcameraPad *self)\n+{\n+}\n+\n+static GType\n+gst_libcamera_stream_role_get_type(void)\n+{\n+\tstatic GType type = 0;\n+\tstatic const GEnumValue values[] = {\n+\t\t{ StillCapture, \"libcamera::StillCapture\", \"still-capture\" },\n+\t\t{ VideoRecording, \"libcamera::VideoRecording\", \"video-recording\" },\n+\t\t{ Viewfinder, \"libcamera::Viewfinder\", \"view-finder\" },\n+\t\t{ 0, NULL, NULL }\n+\t};\n+\n+\tif (!type)\n+\t\ttype = g_enum_register_static(\"GstLibcameraStreamRole\", values);\n+\n+\treturn type;\n+}\n+\n+static void\n+gst_libcamera_pad_class_init(GstLibcameraPadClass *klass)\n+{\n+\tauto *object_class = G_OBJECT_CLASS(klass);\n+\n+\tobject_class->set_property = gst_libcamera_pad_set_property;\n+\tobject_class->get_property = gst_libcamera_pad_get_property;\n+\n+\tauto *spec = g_param_spec_enum(\"stream-role\", \"Stream Role\",\n+\t\t\t\t \"The selected stream role\",\n+\t\t\t\t gst_libcamera_stream_role_get_type(),\n+\t\t\t\t VideoRecording,\n+\t\t\t\t (GParamFlags)(GST_PARAM_MUTABLE_READY\n+\t\t\t\t\t | G_PARAM_CONSTRUCT\n+\t\t\t\t\t\t | G_PARAM_READWRITE\n+\t\t\t\t\t\t | G_PARAM_STATIC_STRINGS));\n+\tg_object_class_install_property(object_class, PROP_STREAM_ROLE, spec);\n+}\ndiff --git a/src/gstreamer/gstlibcamerapad.h b/src/gstreamer/gstlibcamerapad.h\nnew file mode 100644\nindex 0000000..2e745f1\n--- /dev/null\n+++ b/src/gstreamer/gstlibcamerapad.h\n@@ -0,0 +1,19 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2019, Collabora Ltd.\n+ * Author: Nicolas Dufresne <nicolas.dufresne@collabora.com>\n+ *\n+ * gstlibcamerapad.h - GStreamer Capture Element\n+ */\n+\n+#include <gst/gst.h>\n+\n+#ifndef __GST_LIBCAMERA_PAD_H__\n+#define __GST_LIBCAMERA_PAD_H__\n+\n+#define GST_TYPE_LIBCAMERA_PAD gst_libcamera_pad_get_type()\n+G_DECLARE_FINAL_TYPE(GstLibcameraPad, gst_libcamera_pad,\n+\t\t GST_LIBCAMERA, PAD, GstPad)\n+\n+\n+#endif /* __GST_LIBCAMERA_PAD_H__ */\ndiff --git a/src/gstreamer/gstlibcamerasrc.cpp b/src/gstreamer/gstlibcamerasrc.cpp\nindex 3807503..085c489 100644\n--- a/src/gstreamer/gstlibcamerasrc.cpp\n+++ b/src/gstreamer/gstlibcamerasrc.cpp\n@@ -6,6 +6,7 @@\n * gstlibcamerasrc.cpp - GStreamer Capture Element\n */\n \n+#include \"gstlibcamerapad.h\"\n #include \"gstlibcamerasrc.h\"\n \n struct _GstLibcameraSrc {\n@@ -14,6 +15,18 @@ struct _GstLibcameraSrc {\n \n G_DEFINE_TYPE(GstLibcameraSrc, gst_libcamera_src, GST_TYPE_ELEMENT);\n \n+#define TEMPLATE_CAPS GST_STATIC_CAPS(\"video/x-raw; image/jpeg\")\n+\n+/* For the simple case, we have a src pad that is always present. */\n+GstStaticPadTemplate src_template = {\n+\t\"src\", GST_PAD_SRC, GST_PAD_ALWAYS, TEMPLATE_CAPS\n+};\n+\n+/* More pads can be requested in state < PAUSED */\n+GstStaticPadTemplate request_src_template = {\n+\t\"src_%s\", GST_PAD_SRC, GST_PAD_REQUEST, TEMPLATE_CAPS\n+};\n+\n static void\n gst_libcamera_src_init(GstLibcameraSrc *self)\n {\n@@ -28,4 +41,10 @@ gst_libcamera_src_class_init(GstLibcameraSrcClass *klass)\n \t\t\t\t \"libcamera Source\", \"Source/Video\",\n \t\t\t\t \"Linux Camera source using libcamera\",\n \t\t\t\t \"Nicolas Dufresne