mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-03 01:02:19 +00:00
Code Issues 1 Projects Releases Wiki Activity

glutils: remove trivial helper function

Browse source 
gst_gl_caps_replace_all_caps_features() is only used in two places and can
be trivially reproduced.
This commit is contained in:
Matthew Waters 2017-01-12 01:57:29 +11:00 committed by Tim-Philipp Müller
parent 0348225001
commit d00a13f01d
4 changed files with 18 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ext/gl/gstglmixer.c
View file

@ -220,15 +220,21 @@ static GstCaps *
_update_caps (GstVideoAggregator * vagg, GstCaps * caps, GstCaps * filter) _update_caps (GstVideoAggregator * vagg, GstCaps * caps, GstCaps * filter)
{ {
GstCaps *tmp; GstCaps *tmp;
guint i, n;
if (filter) { if (filter) {
tmp = gst_caps_intersect (caps, filter); tmp = gst_caps_intersect (caps, filter);
} else { } else {
tmp = caps; tmp = gst_caps_copy (caps);
} }
return gst_gl_caps_replace_all_caps_features (tmp, n = gst_caps_get_size (tmp);
GST_CAPS_FEATURE_MEMORY_GL_MEMORY); for (i = 0; i < n; i++) {
gst_caps_set_features (tmp, i,
gst_caps_features_from_string (GST_CAPS_FEATURE_MEMORY_GL_MEMORY));
}
return tmp;
} }
static GstCaps * static GstCaps *

10
gst-libs/gst/gl/gstglfilter.c
View file

@ -608,7 +608,15 @@ static GstCaps *
gst_gl_filter_set_caps_features (const GstCaps * caps, gst_gl_filter_set_caps_features (const GstCaps * caps,
const gchar * feature_name) const gchar * feature_name)
{ {
GstCaps *ret = gst_gl_caps_replace_all_caps_features (caps, feature_name); GstCaps *ret = gst_caps_copy (caps);
guint n = gst_caps_get_size (ret);
guint i = 0;
for (i = 0; i < n; i++) {
gst_caps_set_features (ret, i,
gst_caps_features_from_string (GST_CAPS_FEATURE_MEMORY_GL_MEMORY));
}
gst_caps_set_simple (ret, "format", G_TYPE_STRING, "RGBA", NULL); gst_caps_set_simple (ret, "format", G_TYPE_STRING, "RGBA", NULL);
return ret; return ret;
} }

16
gst-libs/gst/gl/gstglutils.c
View file

@ -490,22 +490,6 @@ gst_gl_get_plane_start (GstVideoInfo * info, GstVideoAlignment * valign,
return (GST_VIDEO_INFO_PLANE_OFFSET (info, plane)) - plane_start; return (GST_VIDEO_INFO_PLANE_OFFSET (info, plane)) - plane_start;
} }
GstCaps *
gst_gl_caps_replace_all_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++) {
gst_caps_set_features (tmp, i,
gst_caps_features_from_string (feature_name));
}
return tmp;
}
/** /**
* gst_gl_value_get_texture_target_mask: * gst_gl_value_get_texture_target_mask:
* @value: an initialized #GValue of type G_TYPE_STRING * @value: an initialized #GValue of type G_TYPE_STRING

3
gst-libs/gst/gl/gstglutils.h
View file

@ -47,9 +47,6 @@ gsize gst_gl_get_plane_data_size (GstVideoInfo * info, GstVideoAlignment * align
GST_EXPORT GST_EXPORT
gsize gst_gl_get_plane_start (GstVideoInfo * info, GstVideoAlignment * valign, gsize gst_gl_get_plane_start (GstVideoInfo * info, GstVideoAlignment * valign,
guint plane); guint plane);
GST_EXPORT
GstCaps * gst_gl_caps_replace_all_caps_features (const GstCaps * caps,
const gchar * feature_name);
GST_EXPORT GST_EXPORT
gboolean gst_gl_value_set_texture_target_from_mask (GValue * value, gboolean gst_gl_value_set_texture_target_from_mask (GValue * value,