From 3cccd77d5dcb0cf21d486acd56bcf61197aabf3a Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Mon, 20 Oct 2014 10:34:27 +1100 Subject: [PATCH] videoaggregator: operate on caps rather than video info Otherwise the CapsFeatures will be lost along with the possibility of multiple output types and formats. https://bugzilla.gnome.org/show_bug.cgi?id=738129 --- ext/gl/gstglmixer.c | 96 ++++++++++++++++++++++++++++++++++++++++ ext/gl/gstglmixer.h | 1 + ext/gl/gstglvideomixer.c | 26 +++++++---- 3 files changed, 114 insertions(+), 9 deletions(-) diff --git a/ext/gl/gstglmixer.c b/ext/gl/gstglmixer.c index 0a299db88a..37aa8f0b43 100644 --- a/ext/gl/gstglmixer.c +++ b/ext/gl/gstglmixer.c @@ -36,6 +36,10 @@ #include "gstglmixer.h" +#if GST_GL_HAVE_PLATFORM_EGL +#include +#endif + #define gst_gl_mixer_parent_class parent_class G_DEFINE_ABSTRACT_TYPE (GstGLMixer, gst_gl_mixer, GST_TYPE_VIDEO_AGGREGATOR); static gboolean gst_gl_mixer_do_bufferpool (GstGLMixer * mix, @@ -559,6 +563,98 @@ gst_gl_mixer_query_caps (GstPad * pad, GstAggregator * agg, GstQuery * query) return TRUE; } +static GstCaps * +gst_gl_mixer_set_caps_features (const GstCaps * caps, + const gchar * feature_name) +{ + GstCaps *tmp = gst_caps_copy (caps); + guint n = gst_caps_get_size (tmp); + guint i = 0; + + for (i = 0; i < n; i++) { + GstCapsFeatures *features = gst_caps_get_features (tmp, i); + if (features) { + guint n_f = gst_caps_features_get_size (features); + guint j = 0; + for (j = 0; j < n_f; j++) { + gst_caps_features_remove_id (features, + gst_caps_features_get_nth_id (features, j)); + } + } + + gst_caps_features_add (features, feature_name); + gst_caps_set_simple (tmp, "format", G_TYPE_STRING, "RGBA", NULL); + } + + return tmp; +} + +/* copies the given caps */ +static GstCaps * +gst_gl_mixer_caps_remove_format_info (GstCaps * caps) +{ + GstStructure *st; + GstCapsFeatures *f; + gint i, n; + GstCaps *res; + + res = gst_caps_new_empty (); + + n = gst_caps_get_size (caps); + for (i = 0; i < n; i++) { + st = gst_caps_get_structure (caps, i); + f = gst_caps_get_features (caps, i); + + /* If this is already expressed by the existing caps + * skip this structure */ + if (i > 0 && gst_caps_is_subset_structure_full (res, st, f)) + continue; + + st = gst_structure_copy (st); + /* Only remove format info for the cases when we can actually convert */ + if (!gst_caps_features_is_any (f) + && gst_caps_features_is_equal (f, + GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY)) + gst_structure_remove_fields (st, "format", "colorimetry", "chroma-site", + "width", "height", NULL); + + gst_caps_append_structure_full (res, st, gst_caps_features_copy (f)); + } + + return res; +} + +GstCaps * +gst_gl_mixer_update_caps (GstGLMixer * mix, GstCaps * caps) +{ + GstCaps *result = NULL; + GstCaps *glcaps = gst_gl_mixer_set_caps_features (caps, + GST_CAPS_FEATURE_MEMORY_GL_MEMORY); +#if GST_GL_HAVE_PLATFORM_EGL + GstCaps *eglcaps = gst_gl_mixer_set_caps_features (caps, + GST_CAPS_FEATURE_MEMORY_EGL_IMAGE); +#endif + GstCaps *uploadcaps = gst_gl_mixer_set_caps_features (caps, + GST_CAPS_FEATURE_META_GST_VIDEO_GL_TEXTURE_UPLOAD_META); + GstCaps *raw_caps = + gst_caps_from_string (GST_VIDEO_CAPS_MAKE (GST_GL_COLOR_CONVERT_FORMATS)); + + result = gst_caps_new_empty (); + + result = gst_caps_merge (result, glcaps); +#if GST_GL_HAVE_PLATFORM_EGL + result = gst_caps_merge (result, eglcaps); +#endif + result = gst_caps_merge (result, uploadcaps); + result = gst_caps_merge (result, raw_caps); + + result = gst_caps_merge (result, gst_gl_mixer_caps_remove_format_info (caps)); + + GST_DEBUG_OBJECT (mix, "returning %" GST_PTR_FORMAT, result); + + return result; +} + static gboolean gst_gl_mixer_src_query (GstAggregator * agg, GstQuery * query) { diff --git a/ext/gl/gstglmixer.h b/ext/gl/gstglmixer.h index 5ea246ba5e..f25c30a32f 100644 --- a/ext/gl/gstglmixer.h +++ b/ext/gl/gstglmixer.h @@ -92,6 +92,7 @@ struct _GstGLMixerFrameData GType gst_gl_mixer_get_type(void); gboolean gst_gl_mixer_process_textures (GstGLMixer * mix, GstBuffer * outbuf); +GstCaps * gst_gl_mixer_update_caps (GstGLMixer * mix, GstCaps * caps); G_END_DECLS #endif /* __GST_GL_MIXER_H__ */ diff --git a/ext/gl/gstglvideomixer.c b/ext/gl/gstglvideomixer.c index 16843be090..39e17ae21d 100644 --- a/ext/gl/gstglvideomixer.c +++ b/ext/gl/gstglvideomixer.c @@ -65,7 +65,7 @@ static void gst_gl_video_mixer_set_property (GObject * object, guint prop_id, static void gst_gl_video_mixer_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec); -static gboolean _update_info (GstVideoAggregator * vagg, GstVideoInfo * info); +static GstCaps *_update_caps (GstVideoAggregator * vagg, GstCaps * caps); static void gst_gl_video_mixer_reset (GstGLMixer * mixer); static gboolean gst_gl_video_mixer_init_shader (GstGLMixer * mixer, GstCaps * outcaps); @@ -335,7 +335,7 @@ gst_gl_video_mixer_class_init (GstGLVideoMixerClass * klass) GST_GL_MIXER_CLASS (klass)->process_textures = gst_gl_video_mixer_process_textures; - vagg_class->update_info = _update_info; + vagg_class->update_caps = _update_caps; agg_class->sinkpads_type = GST_TYPE_GL_VIDEO_MIXER_PAD; } @@ -380,12 +380,17 @@ gst_gl_video_mixer_get_property (GObject * object, guint prop_id, } } -static gboolean -_update_info (GstVideoAggregator * vagg, GstVideoInfo * info) +static GstCaps * +_update_caps (GstVideoAggregator * vagg, GstCaps * caps) { GList *l; gint best_width = -1, best_height = -1; - gboolean ret = FALSE; + GstVideoInfo info; + GstCaps *ret = NULL; + int i; + + caps = gst_caps_make_writable (caps); + gst_video_info_from_caps (&info, caps); GST_OBJECT_LOCK (vagg); for (l = GST_ELEMENT (vagg)->sinkpads; l; l = l->next) { @@ -417,10 +422,13 @@ _update_info (GstVideoAggregator * vagg, GstVideoInfo * info) } GST_OBJECT_UNLOCK (vagg); - if (best_width > 0 && best_height > 0) { - info->width = best_width; - info->height = best_height; - ret = TRUE; + ret = gst_gl_mixer_update_caps (GST_GL_MIXER (vagg), caps); + + for (i = 0; i < gst_caps_get_size (ret); i++) { + GstStructure *s = gst_caps_get_structure (ret, i); + + gst_structure_set (s, "width", G_TYPE_INT, best_width, "height", G_TYPE_INT, + best_height, NULL); } return ret;