Patch Detail
Show a patch.
GET /api/1.1/patches/3020/?format=api
{ "id": 3020, "url": "https://patchwork.libcamera.org/api/1.1/patches/3020/?format=api", "web_url": "https://patchwork.libcamera.org/patch/3020/", "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": "<20200306202637.525587-15-nicolas@ndufresne.ca>", "date": "2020-03-06T20:26:24", "name": "[libcamera-devel,v3,14/27] gst: utils: Add StreamConfiguration helpers", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "08d10ae4855ebd7babeb76a11c3ad9213577258d", "submitter": { "id": 30, "url": "https://patchwork.libcamera.org/api/1.1/people/30/?format=api", "name": "Nicolas Dufresne", "email": "nicolas@ndufresne.ca" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/3020/mbox/", "series": [ { "id": 705, "url": "https://patchwork.libcamera.org/api/1.1/series/705/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=705", "date": "2020-03-06T20:26:10", "name": "GStreamer Element for libcamera", "version": 3, "mbox": "https://patchwork.libcamera.org/series/705/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/3020/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/3020/checks/", "tags": {}, "headers": { "Return-Path": "<nicolas@ndufresne.ca>", "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 462EA62899\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 6 Mar 2020 21:27:07 +0100 (CET)", "from nicolas-tpx395.localdomain (unknown [IPv6:2610:98:8005::527])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits))\n\t(No client certificate requested) (Authenticated sender: nicolas)\n\tby bhuna.collabora.co.uk (Postfix) with ESMTPSA id AA8D52970E7;\n\tFri, 6 Mar 2020 20:27:06 +0000 (GMT)" ], "From": "Nicolas Dufresne <nicolas@ndufresne.ca>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Nicolas Dufresne <nicolas.dufresne@collabora.com>,\n\tLaurent Pinchart <laurent.pinchart@ideasonboard.com>", "Date": "Fri, 6 Mar 2020 15:26:24 -0500", "Message-Id": "<20200306202637.525587-15-nicolas@ndufresne.ca>", "X-Mailer": "git-send-email 2.24.1", "In-Reply-To": "<20200306202637.525587-1-nicolas@ndufresne.ca>", "References": "<20200306202637.525587-1-nicolas@ndufresne.ca>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v3 14/27] gst: utils: Add\n\tStreamConfiguration helpers", "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, 06 Mar 2020 20:27:07 -0000" }, "content": "From: Nicolas Dufresne <nicolas.dufresne@collabora.com>\n\nThis adds helpers to deal with the conversion from StreamConfiguration\nto caps and vice-versa. This is needed to implement caps negotiation.\n\nSigned-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/gstreamer/gstlibcamera-utils.cpp | 64 ++++++++++++++++++++++++++++\n src/gstreamer/gstlibcamera-utils.h | 3 ++\n 2 files changed, 67 insertions(+)", "diff": "diff --git a/src/gstreamer/gstlibcamera-utils.cpp b/src/gstreamer/gstlibcamera-utils.cpp\nindex 386ec36..482439a 100644\n--- a/src/gstreamer/gstlibcamera-utils.cpp\n+++ b/src/gstreamer/gstlibcamera-utils.cpp\n@@ -42,6 +42,18 @@ drm_to_gst_format(guint drm_fourcc)\n \treturn GST_VIDEO_FORMAT_UNKNOWN;\n }\n \n+static guint\n+gst_format_to_drm(GstVideoFormat gst_format)\n+{\n+\tif (gst_format == GST_VIDEO_FORMAT_ENCODED)\n+\t\treturn DRM_FORMAT_INVALID;\n+\n+\tfor (const auto &item : format_map)\n+\t\tif (item.gst_format == gst_format)\n+\t\t\treturn item.drm_fourcc;\n+\treturn DRM_FORMAT_INVALID;\n+}\n+\n static GstStructure *\n bare_structure_from_fourcc(guint fourcc)\n {\n@@ -103,3 +115,55 @@ gst_libcamera_stream_formats_to_caps(const StreamFormats &formats)\n \n \treturn caps;\n }\n+\n+GstCaps *\n+gst_libcamera_stream_configuration_to_caps(const StreamConfiguration &stream_cfg)\n+{\n+\tGstCaps *caps = gst_caps_new_empty();\n+\tGstStructure *s = bare_structure_from_fourcc(stream_cfg.pixelFormat);\n+\n+\tgst_structure_set(s,\n+\t\t\t \"width\", G_TYPE_INT, stream_cfg.size.width,\n+\t\t\t \"height\", G_TYPE_INT, stream_cfg.size.height,\n+\t\t\t nullptr);\n+\tgst_caps_append_structure(caps, s);\n+\n+\treturn caps;\n+}\n+\n+void\n+gst_libcamera_configure_stream_from_caps(StreamConfiguration &stream_cfg,\n+\t\t\t\t\t GstCaps *caps)\n+{\n+\tGstVideoFormat gst_format = drm_to_gst_format(stream_cfg.pixelFormat);\n+\n+\t/* First fixate the caps using default configuration value. */\n+\tg_assert(gst_caps_is_writable(caps));\n+\tcaps = gst_caps_truncate(caps);\n+\tGstStructure *s = gst_caps_get_structure(caps, 0);\n+\n+\tgst_structure_fixate_field_nearest_int(s, \"width\", stream_cfg.size.width);\n+\tgst_structure_fixate_field_nearest_int(s, \"height\", stream_cfg.size.height);\n+\n+\tif (gst_structure_has_name(s, \"video/x-raw\")) {\n+\t\tconst gchar *format = gst_video_format_to_string(gst_format);\n+\t\tgst_structure_fixate_field_string(s, \"format\", format);\n+\t}\n+\n+\t/* Then configure the stream with the result. */\n+\tif (gst_structure_has_name(s, \"video/x-raw\")) {\n+\t\tconst gchar *format = gst_structure_get_string(s, \"format\");\n+\t\tgst_format = gst_video_format_from_string(format);\n+\t\tstream_cfg.pixelFormat = gst_format_to_drm(gst_format);\n+\t} else if (gst_structure_has_name(s, \"image/jpeg\")) {\n+\t\tstream_cfg.pixelFormat = DRM_FORMAT_MJPEG;\n+\t} else {\n+\t\tg_critical(\"Unsupported media type: %s\", gst_structure_get_name(s));\n+\t}\n+\n+\tgint width, height;\n+\tgst_structure_get_int(s, \"width\", &width);\n+\tgst_structure_get_int(s, \"height\", &height);\n+\tstream_cfg.size.width = width;\n+\tstream_cfg.size.height = height;\n+}\ndiff --git a/src/gstreamer/gstlibcamera-utils.h b/src/gstreamer/gstlibcamera-utils.h\nindex 562ffe9..cbfb1cc 100644\n--- a/src/gstreamer/gstlibcamera-utils.h\n+++ b/src/gstreamer/gstlibcamera-utils.h\n@@ -15,6 +15,9 @@\n #include <libcamera/stream.h>\n \n GstCaps *gst_libcamera_stream_formats_to_caps(const libcamera::StreamFormats &formats);\n+GstCaps *gst_libcamera_stream_configuration_to_caps(const libcamera::StreamConfiguration &stream_cfg);\n+void gst_libcamera_configure_stream_from_caps(libcamera::StreamConfiguration &stream_cfg,\n+\t\t\t\t\t GstCaps *caps);\n \n /**\n * \\class GLibLocker\n", "prefixes": [ "libcamera-devel", "v3", "14/27" ] }