mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 09:10:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

gl:glvideomixer: Add the Compositor in the element metadata class

Browse source 
So it is possible to pick one compositing element from the registry
This commit is contained in:
Thibault Saunier 2014-06-20 11:10:45 +02:00 committed by Tim-Philipp Müller
parent 30a9ef3768
commit 097373ed19
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ext/gl/gstglvideomixer.c
View file

@ -257,7 +257,7 @@ gst_gl_video_mixer_class_init (GstGLVideoMixerClass * klass)
gobject_class->get_property = gst_gl_video_mixer_get_property; gobject_class->get_property = gst_gl_video_mixer_get_property;
gst_element_class_set_metadata (element_class, "OpenGL video_mixer", gst_element_class_set_metadata (element_class, "OpenGL video_mixer",
"Filter/Effect/Video", "OpenGL video_mixer", "Filter/Effect/Video/Compositor", "OpenGL video_mixer",
"Julien Isorce <julien.isorce@gmail.com>"); "Julien Isorce <julien.isorce@gmail.com>");
GST_GL_MIXER_CLASS (klass)->set_caps = gst_gl_video_mixer_init_shader; GST_GL_MIXER_CLASS (klass)->set_caps = gst_gl_video_mixer_init_shader;
@ -401,10 +401,8 @@ gst_gl_video_mixer_callback (gpointer stuff)
continue; continue;
} }
pad = (GstGLVideoMixerPad *) frame->pad; pad = (GstGLVideoMixerPad *) frame->pad;
in_width = in_width = GST_VIDEO_INFO_WIDTH (&GST_VIDEO_AGGREGATOR_PAD (pad)->info);
GST_VIDEO_INFO_WIDTH (&GST_VIDEO_AGGREGATOR_PAD (pad)->info); in_height = GST_VIDEO_INFO_HEIGHT (&GST_VIDEO_AGGREGATOR_PAD (pad)->info);
in_height =
GST_VIDEO_INFO_HEIGHT (&GST_VIDEO_AGGREGATOR_PAD (pad)->info);
if (!frame->texture || in_width <= 0 || in_height <= 0) { if (!frame->texture || in_width <= 0 || in_height <= 0) {
GST_DEBUG ("skipping texture:%u frame:%p width:%u height %u", GST_DEBUG ("skipping texture:%u frame:%p width:%u height %u",