glutils: remove trivial helper function

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
parent 6f4657c464
commit 3fba290979
5 changed files with 18 additions and 24 deletions

View file

@ -1618,7 +1618,6 @@ GstGLUploadPrivate
gst_gl_handle_set_context
gst_gl_handle_context_query
gst_gl_context_check_framebuffer_status
gst_gl_caps_replace_all_caps_features
gst_gl_ensure_element_data
gst_gl_get_plane_data_size
gst_gl_get_plane_start

View file

@ -220,15 +220,21 @@ static GstCaps *
_update_caps (GstVideoAggregator * vagg, GstCaps * caps, GstCaps * filter)
{
GstCaps *tmp;
guint i, n;
if (filter) {
tmp = gst_caps_intersect (caps, filter);
} else {
tmp = caps;
tmp = gst_caps_copy (caps);
}
return gst_gl_caps_replace_all_caps_features (tmp,
GST_CAPS_FEATURE_MEMORY_GL_MEMORY);
n = gst_caps_get_size (tmp);
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 *

View file

@ -608,7 +608,15 @@ static GstCaps *
gst_gl_filter_set_caps_features (const GstCaps * caps,
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);
return ret;
}

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;
}
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:
* @value: an initialized #GValue of type G_TYPE_STRING

View file

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