gl: workaround gir warning

The gir generator wrongly assume that the vfunc
GstGLFilterClass.filter() and the method gst_gl_filter_filter_texture()
are related. As a result it complains about not matching argument names.

Workaround this by naming both of their arguments input and output.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/664>

diff --git a/gst-libs/gst/gl/gstglfilter.c b/gst-libs/gst/gl/gstglfilter.c
index d555e4b..edb12b2 100644 (file)
--- a/gst-libs/gst/gl/gstglfilter.c
+++ b/gst-libs/gst/gl/gstglfilter.c
@@ -927,8 +927,8 @@ gst_gl_filter_decide_allocation (GstBaseTransform * trans, GstQuery * query)
 /**
  * gst_gl_filter_filter_texture:
  * @filter: a #GstGLFilter
- * @inbuf: an input buffer
- * @outbuf: an output buffer
+ * @input: an input buffer
+ * @output: an output buffer
  *
  * Calls filter_texture vfunc with correctly mapped #GstGLMemorys
  *
@@ -937,8 +937,8 @@ gst_gl_filter_decide_allocation (GstBaseTransform * trans, GstQuery * query)
  * Since: 1.4
  */
 gboolean
-gst_gl_filter_filter_texture (GstGLFilter * filter, GstBuffer * inbuf,
-    GstBuffer * outbuf)
+gst_gl_filter_filter_texture (GstGLFilter * filter, GstBuffer * input,
+    GstBuffer * output)
 {
   GstGLFilterClass *filter_class;
   GstMemory *in_tex, *out_tex;
@@ -947,7 +947,7 @@ gst_gl_filter_filter_texture (GstGLFilter * filter, GstBuffer * inbuf,
 
   filter_class = GST_GL_FILTER_GET_CLASS (filter);
 
-  if (!gst_video_frame_map (&gl_frame, &filter->in_info, inbuf,
+  if (!gst_video_frame_map (&gl_frame, &filter->in_info, input,
           GST_MAP_READ | GST_MAP_GL)) {
     ret = FALSE;
     goto inbuf_error;
@@ -960,7 +960,7 @@ gst_gl_filter_filter_texture (GstGLFilter * filter, GstBuffer * inbuf,
     goto unmap_out_error;
   }
 
-  if (!gst_video_frame_map (&out_frame, &filter->out_info, outbuf,
+  if (!gst_video_frame_map (&out_frame, &filter->out_info, output,
           GST_MAP_WRITE | GST_MAP_GL)) {
     ret = FALSE;
     goto unmap_out_error;

diff --git a/gst-libs/gst/gl/gstglfilter.h b/gst-libs/gst/gl/gstglfilter.h
index 5e5322d..7f8108a 100644 (file)
--- a/gst-libs/gst/gl/gstglfilter.h
+++ b/gst-libs/gst/gl/gstglfilter.h
@@ -112,7 +112,7 @@ struct _GstGLFilterClass
   /*< public >*/
   gboolean (*set_caps)          (GstGLFilter* filter, GstCaps* incaps, GstCaps* outcaps);
   gboolean (*filter)            (GstGLFilter *filter, GstBuffer *inbuf, GstBuffer *outbuf);
-  gboolean (*filter_texture)    (GstGLFilter *filter, GstGLMemory *in_tex, GstGLMemory *out_tex);
+  gboolean (*filter_texture)    (GstGLFilter *filter, GstGLMemory *input, GstGLMemory *output);
   gboolean (*init_fbo)          (GstGLFilter *filter);
 
   GstCaps *(*transform_internal_caps) (GstGLFilter *filter,
@@ -126,8 +126,8 @@ GST_GL_API
 void gst_gl_filter_add_rgba_pad_templates (GstGLFilterClass *klass);
 
 GST_GL_API
-gboolean gst_gl_filter_filter_texture (GstGLFilter * filter, GstBuffer * inbuf,
-                                       GstBuffer * outbuf);
+gboolean gst_gl_filter_filter_texture (GstGLFilter * filter, GstBuffer * input,
+                                       GstBuffer * output);
 
 GST_GL_API
 gboolean gst_gl_filter_render_to_target             (GstGLFilter *filter,