Commit fabdcd1d authored by Matthew Waters's avatar Matthew Waters 🐨

glvideomixer: wire up the alpha pad property

parent ec7df977
...@@ -81,11 +81,12 @@ static const gchar *video_mixer_v_src = ...@@ -81,11 +81,12 @@ static const gchar *video_mixer_v_src =
/* fragment source */ /* fragment source */
static const gchar *video_mixer_f_src = static const gchar *video_mixer_f_src =
"uniform sampler2D texture; \n" "uniform sampler2D texture; \n"
"uniform float alpha;\n"
"varying vec2 v_texCoord; \n" "varying vec2 v_texCoord; \n"
"void main() \n" "void main() \n"
"{ \n" "{ \n"
" vec4 rgba = texture2D( texture, v_texCoord );\n" " vec4 rgba = texture2D( texture, v_texCoord );\n"
" gl_FragColor = vec4(rgba.rgb, 1.0);\n" " gl_FragColor = vec4(rgba.rgb, rgba.a * alpha);\n"
"} \n"; "} \n";
#define GST_TYPE_GL_VIDEO_MIXER_PAD (gst_gl_video_mixer_pad_get_type()) #define GST_TYPE_GL_VIDEO_MIXER_PAD (gst_gl_video_mixer_pad_get_type())
...@@ -153,6 +154,7 @@ enum ...@@ -153,6 +154,7 @@ enum
static void static void
gst_gl_video_mixer_pad_init (GstGLVideoMixerPad * pad) gst_gl_video_mixer_pad_init (GstGLVideoMixerPad * pad)
{ {
pad->alpha = 1.0;
} }
static void static void
...@@ -448,9 +450,9 @@ gst_gl_video_mixer_callback (gpointer stuff) ...@@ -448,9 +450,9 @@ gst_gl_video_mixer_callback (gpointer stuff)
v_vertices[5] = v_vertices[10] = v_vertices[0] + 2.0f * w; v_vertices[5] = v_vertices[10] = v_vertices[0] + 2.0f * w;
/* bottom-right */ /* bottom-right */
v_vertices[11] = v_vertices[16] = v_vertices[1] + 2.0f * h; v_vertices[11] = v_vertices[16] = v_vertices[1] + 2.0f * h;
GST_TRACE ("processing texture:%u dimensions:%ux%u, at %f,%f %fx%f", in_tex, GST_TRACE ("processing texture:%u dimensions:%ux%u, at %f,%f %fx%f with "
in_width, in_height, v_vertices[0], v_vertices[1], v_vertices[5], "alpha", in_tex, in_width, in_height, v_vertices[0], v_vertices[1],
v_vertices[11]); v_vertices[5], v_vertices[11], pad->alpha);
gl->VertexAttribPointer (attr_position_loc, 3, GL_FLOAT, gl->VertexAttribPointer (attr_position_loc, 3, GL_FLOAT,
GL_FALSE, 5 * sizeof (GLfloat), &v_vertices[0]); GL_FALSE, 5 * sizeof (GLfloat), &v_vertices[0]);
...@@ -461,12 +463,14 @@ gst_gl_video_mixer_callback (gpointer stuff) ...@@ -461,12 +463,14 @@ gst_gl_video_mixer_callback (gpointer stuff)
gl->EnableVertexAttribArray (attr_position_loc); gl->EnableVertexAttribArray (attr_position_loc);
gl->EnableVertexAttribArray (attr_texture_loc); gl->EnableVertexAttribArray (attr_texture_loc);
gl->BlendFunc (GL_SRC_COLOR, GL_ONE_MINUS_SRC_COLOR); gl->BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE,
gl->BlendEquation (GL_FUNC_ADD); GL_ZERO);
gl->BlendEquationSeparate (GL_FUNC_ADD, GL_FUNC_ADD);
gl->ActiveTexture (GL_TEXTURE0); gl->ActiveTexture (GL_TEXTURE0);
gl->BindTexture (GL_TEXTURE_2D, in_tex); gl->BindTexture (GL_TEXTURE_2D, in_tex);
gst_gl_shader_set_uniform_1i (video_mixer->shader, "texture", 0); gst_gl_shader_set_uniform_1i (video_mixer->shader, "texture", 0);
gst_gl_shader_set_uniform_1f (video_mixer->shader, "alpha", pad->alpha);
gl->DrawElements (GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, indices); gl->DrawElements (GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, indices);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment