{"id":2748,"url":"https://patchwork.libcamera.org/api/1.1/patches/2748/?format=json","web_url":"https://patchwork.libcamera.org/patch/2748/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200129033210.278800-15-nicolas@ndufresne.ca>","date":"2020-01-29T03:32:01","name":"[libcamera-devel,v1,14/23] gst: utils: Add StreamConfiguration helpers","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"69928e05b936de5342c922dce229b13cc8596722","submitter":{"id":30,"url":"https://patchwork.libcamera.org/api/1.1/people/30/?format=json","name":"Nicolas Dufresne","email":"nicolas@ndufresne.ca"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/2748/mbox/","series":[{"id":648,"url":"https://patchwork.libcamera.org/api/1.1/series/648/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=648","date":"2020-01-29T03:31:47","name":"GStreamer Element for libcamera","version":1,"mbox":"https://patchwork.libcamera.org/series/648/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/2748/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2748/checks/","tags":{},"headers":{"Return-Path":"","Received":["from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 633B7608D4\n\tfor ;\n\tWed, 29 Jan 2020 04:35:34 +0100 (CET)","from nicolas-tpx395.localdomain (unknown\n\t[IPv6:2002:c0de:c115:0:66fc:8b:2a38:8313])\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 53DCF28EA9F;\n\tWed, 29 Jan 2020 03:35:33 +0000 (GMT)"],"From":"Nicolas Dufresne ","To":"libcamera-devel@lists.libcamera.org","Cc":"Nicolas Dufresne ","Date":"Tue, 28 Jan 2020 22:32:01 -0500","Message-Id":"<20200129033210.278800-15-nicolas@ndufresne.ca>","X-Mailer":"git-send-email 2.24.1","In-Reply-To":"<20200129033210.278800-1-nicolas@ndufresne.ca>","References":"<20200129033210.278800-1-nicolas@ndufresne.ca>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v1 14/23] gst: utils: Add\n\tStreamConfiguration helpers","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Wed, 29 Jan 2020 03:35:35 -0000"},"content":"From: Nicolas Dufresne \n\nThis add helpers to deal with the conversion from StreamConfiguration\nto caps and vis-versa. This is needed to implement caps negotiation.\n\nSigned-off-by: Nicolas Dufresne \n---\n src/gstreamer/gstlibcamera-utils.cpp | 61 ++++++++++++++++++++++++++++\n src/gstreamer/gstlibcamera-utils.h | 3 ++\n 2 files changed, 64 insertions(+)","diff":"diff --git a/src/gstreamer/gstlibcamera-utils.cpp b/src/gstreamer/gstlibcamera-utils.cpp\nindex 2540be0..d9b217a 100644\n--- a/src/gstreamer/gstlibcamera-utils.cpp\n+++ b/src/gstreamer/gstlibcamera-utils.cpp\n@@ -41,6 +41,18 @@ drm_to_gst_format(guint drm_fourcc)\n \treturn GST_VIDEO_FORMAT_UNKNOWN;\n }\n \n+static inline 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 (guint i = 0; i < FORMAT_MAP_SIZE; i++)\n+\t\tif (format_map[i].gst_format == gst_format)\n+\t\t\treturn format_map[i].drm_fourcc;\n+\treturn DRM_FORMAT_INVALID;\n+}\n+\n static GstStructure *\n bare_structure_from_fourcc(guint fourcc)\n {\n@@ -100,3 +112,52 @@ 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 NULL);\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/* The 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+\tgst_structure_get_int(s, \"width\", (gint *)&stream_cfg.size.width);\n+\tgst_structure_get_int(s, \"height\", (gint *)&stream_cfg.size.height);\n+}\ndiff --git a/src/gstreamer/gstlibcamera-utils.h b/src/gstreamer/gstlibcamera-utils.h\nindex 528dc2c..91cfdcd 100644\n--- a/src/gstreamer/gstlibcamera-utils.h\n+++ b/src/gstreamer/gstlibcamera-utils.h\n@@ -16,5 +16,8 @@\n #define GST_OBJECT_LOCKER(obj) g_autoptr(GMutexLocker) locker = g_mutex_locker_new(GST_OBJECT_GET_LOCK(obj))\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 #endif /* __GST_LIBCAMERA_UTILS_H_ */\n","prefixes":["libcamera-devel","v1","14/23"]}