mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-06 02:32:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

glvideomixer: fix default placement when different sized output

Browse source 
i.e. when expanding from 320x240 to 800x600, the resulting frame should
appear in the top left corner, not the middle.

https://bugzilla.gnome.org/show_bug.cgi?id=794401
This commit is contained in:
Matthew Waters 2018-07-12 12:48:39 +10:00
parent b8442dd6ab
commit e47cf9abe1
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ext/gl/gstglvideomixer.c
View file

@ -461,8 +461,7 @@ static void gst_gl_video_mixer_child_proxy_init (gpointer g_iface,
#define gst_gl_video_mixer_parent_class parent_class
G_DEFINE_TYPE_WITH_CODE (GstGLVideoMixer, gst_gl_video_mixer, GST_TYPE_GL_MIXER,
G_IMPLEMENT_INTERFACE (GST_TYPE_CHILD_PROXY,
gst_gl_video_mixer_child_proxy_init);
DEBUG_INIT);
gst_gl_video_mixer_child_proxy_init); DEBUG_INIT);
static void gst_gl_video_mixer_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec);
@ -1556,12 +1555,14 @@ gst_gl_video_mixer_callback (gpointer stuff)
pad->m_matrix[0] = w;
pad->m_matrix[5] = h;
pad->m_matrix[12] = (gfloat) pad->xpos / (gfloat) out_width;
pad->m_matrix[13] = (gfloat) pad->ypos / (gfloat) out_height;
pad->m_matrix[12] =
2. * (gfloat) pad->xpos / (gfloat) out_width - (1. - w);
pad->m_matrix[13] =
2. * (gfloat) pad->ypos / (gfloat) out_height - (1. - h);
GST_TRACE ("processing texture:%u dimensions:%ux%u, at %f,%f %fx%f with "
"alpha:%f", in_tex, in_width, in_height, v_vertices[0], v_vertices[1],
v_vertices[5], v_vertices[11], pad->alpha);
"alpha:%f", in_tex, in_width, in_height, pad->m_matrix[12],
pad->m_matrix[13], pad->m_matrix[0], pad->m_matrix[5], pad->alpha);
if (!pad->vertex_buffer)
gl->GenBuffers (1, &pad->vertex_buffer);