mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

gl: workaround gir warning

Browse source 
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>
This commit is contained in:
Guillaume Desmottes 2020-05-13 14:50:22 +02:00
parent c3e98ad2d0
commit 6a42e2e176
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -927,8 +927,8 @@ gst_gl_filter_decide_allocation (GstBaseTransform * trans, GstQuery * query)
/** /**
* gst_gl_filter_filter_texture: * gst_gl_filter_filter_texture:
* @filter: a #GstGLFilter * @filter: a #GstGLFilter
* @inbuf: an input buffer * @input: an input buffer
* @outbuf: an output buffer * @output: an output buffer
* *
* Calls filter_texture vfunc with correctly mapped #GstGLMemorys * Calls filter_texture vfunc with correctly mapped #GstGLMemorys
* *
@ -937,8 +937,8 @@ gst_gl_filter_decide_allocation (GstBaseTransform * trans, GstQuery * query)
* Since: 1.4 * Since: 1.4
*/ */
gboolean gboolean
gst_gl_filter_filter_texture (GstGLFilter * filter, GstBuffer * inbuf, gst_gl_filter_filter_texture (GstGLFilter * filter, GstBuffer * input,
GstBuffer * outbuf) GstBuffer * output)
{ {
GstGLFilterClass *filter_class; GstGLFilterClass *filter_class;
GstMemory *in_tex, *out_tex; 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); 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)) { GST_MAP_READ | GST_MAP_GL)) {
ret = FALSE; ret = FALSE;
goto inbuf_error; goto inbuf_error;
@ -960,7 +960,7 @@ gst_gl_filter_filter_texture (GstGLFilter * filter, GstBuffer * inbuf,
goto unmap_out_error; 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)) { GST_MAP_WRITE | GST_MAP_GL)) {
ret = FALSE; ret = FALSE;
goto unmap_out_error; goto unmap_out_error;

6
gst-libs/gst/gl/gstglfilter.h
View file

@ -112,7 +112,7 @@ struct _GstGLFilterClass
/*< public >*/ /*< public >*/
gboolean (*set_caps) (GstGLFilter* filter, GstCaps* incaps, GstCaps* outcaps); gboolean (*set_caps) (GstGLFilter* filter, GstCaps* incaps, GstCaps* outcaps);
gboolean (*filter) (GstGLFilter *filter, GstBuffer *inbuf, GstBuffer *outbuf); 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); gboolean (*init_fbo) (GstGLFilter *filter);
GstCaps *(*transform_internal_caps) (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); void gst_gl_filter_add_rgba_pad_templates (GstGLFilterClass *klass);
GST_GL_API GST_GL_API
gboolean gst_gl_filter_filter_texture (GstGLFilter * filter, GstBuffer * inbuf, gboolean gst_gl_filter_filter_texture (GstGLFilter * filter, GstBuffer * input,
GstBuffer * outbuf); GstBuffer * output);
GST_GL_API GST_GL_API
gboolean gst_gl_filter_render_to_target (GstGLFilter *filter, gboolean gst_gl_filter_render_to_target (GstGLFilter *filter,