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

glvidemixer: need reconfigure output gemotry after caps renegotiated

Browse source
This commit is contained in:
Haihua Hu 2017-09-20 20:00:03 +08:00 committed by Tim-Philipp Müller
parent 9fbd1930b7
commit 29973b7d6c
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ext/gl/gstglvideomixer.c
View file

@ -1161,6 +1161,9 @@ gst_gl_video_mixer_init_shader (GstGLMixer * mixer, GstCaps * outcaps)
if (video_mixer->shader) if (video_mixer->shader)
gst_object_unref (video_mixer->shader); gst_object_unref (video_mixer->shader);
/* need reconfigure output geometry */
video_mixer->output_geo_change = TRUE;
return gst_gl_context_gen_shader (GST_GL_BASE_MIXER (mixer)->context, return gst_gl_context_gen_shader (GST_GL_BASE_MIXER (mixer)->context,
gst_gl_shader_string_vertex_mat4_vertex_transform, gst_gl_shader_string_vertex_mat4_vertex_transform,
video_mixer_f_src, &video_mixer->shader); video_mixer_f_src, &video_mixer->shader);
@ -1483,7 +1486,8 @@ gst_gl_video_mixer_callback (gpointer stuff)
_init_vbo_indices (video_mixer); _init_vbo_indices (video_mixer);
if (pad->geometry_change || !pad->vertex_buffer) { if (video_mixer->output_geo_change
|| pad->geometry_change || !pad->vertex_buffer) {
gint pad_width, pad_height; gint pad_width, pad_height;
gfloat w, h; gfloat w, h;
@ -1551,6 +1555,8 @@ gst_gl_video_mixer_callback (gpointer stuff)
walk = g_list_next (walk); walk = g_list_next (walk);
} }
video_mixer->output_geo_change = FALSE;
GST_OBJECT_UNLOCK (video_mixer); GST_OBJECT_UNLOCK (video_mixer);
gl->DisableVertexAttribArray (attr_position_loc); gl->DisableVertexAttribArray (attr_position_loc);

2
ext/gl/gstglvideomixer.h
View file

@ -126,6 +126,8 @@ struct _GstGLVideoMixer
GLuint vbo_indices; GLuint vbo_indices;
GLuint checker_vbo; GLuint checker_vbo;
GstGLMemory *out_tex; GstGLMemory *out_tex;
gboolean output_geo_change;
}; };
struct _GstGLVideoMixerClass struct _GstGLVideoMixerClass