mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-18 07:47:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "glvideomixer: need update output geometry after src caps reconfigure"

Browse source 
This reverts commit d6e538dc56.
This commit is contained in:
Matthew Waters 2017-09-21 11:59:22 +10:00 committed by Tim-Philipp Müller
parent 60eeef12a0
commit 9fbd1930b7
2 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
ext/gl/gstglvideomixer.c
View file

@ -1076,7 +1076,6 @@ _fixate_caps (GstAggregator * agg, GstCaps * caps)
best_fps_d = fps_d;
}
}
mix->output_geo_changed = TRUE;
GST_OBJECT_UNLOCK (vagg);
if (best_fps_n <= 0 || best_fps_d <= 0 || best_fps == 0.0) {
@ -1086,14 +1085,10 @@ _fixate_caps (GstAggregator * agg, GstCaps * caps)
}
s = gst_caps_get_structure (ret, 0);
if (!gst_structure_fixate_field_nearest_int (s, "width", best_width))
gst_structure_set (s, "width", G_TYPE_INT, best_width, NULL);
if (!gst_structure_fixate_field_nearest_int (s, "height", best_height))
gst_structure_set (s, "height", G_TYPE_INT, best_height, NULL);
if (!gst_structure_fixate_field_nearest_fraction (s, "framerate", best_fps_n,
best_fps_d))
gst_structure_set (s, "framerate", GST_TYPE_FRACTION, best_fps_n,
best_fps_d, NULL);
gst_structure_fixate_field_nearest_int (s, "width", best_width);
gst_structure_fixate_field_nearest_int (s, "height", best_height);
gst_structure_fixate_field_nearest_fraction (s, "framerate", best_fps_n,
best_fps_d);
ret = gst_caps_fixate (ret);
return ret;
@ -1488,8 +1483,7 @@ gst_gl_video_mixer_callback (gpointer stuff)
_init_vbo_indices (video_mixer);
if (video_mixer->output_geo_changed || pad->geometry_change
|| !pad->vertex_buffer) {
if (pad->geometry_change || !pad->vertex_buffer) {
gint pad_width, pad_height;
gfloat w, h;
@ -1557,7 +1551,6 @@ gst_gl_video_mixer_callback (gpointer stuff)
walk = g_list_next (walk);
}
video_mixer->output_geo_changed = FALSE;
GST_OBJECT_UNLOCK (video_mixer);
gl->DisableVertexAttribArray (attr_position_loc);

2
ext/gl/gstglvideomixer.h
View file

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