From: Thibault Saunier Date: Fri, 20 Jun 2014 09:10:45 +0000 (+0200) Subject: gl:glvideomixer: Add the Compositor in the element metadata class X-Git-Tag: 1.19.3~511^2~1294^2~369 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1f1283b4d8bdd71e4ee70ab339bccde3525214da;p=platform%2Fupstream%2Fgstreamer.git gl:glvideomixer: Add the Compositor in the element metadata class So it is possible to pick one compositing element from the registry --- diff --git a/ext/gl/gstglvideomixer.c b/ext/gl/gstglvideomixer.c index b2ff400..5a5d7a2 100644 --- a/ext/gl/gstglvideomixer.c +++ b/ext/gl/gstglvideomixer.c @@ -257,7 +257,7 @@ gst_gl_video_mixer_class_init (GstGLVideoMixerClass * klass) gobject_class->get_property = gst_gl_video_mixer_get_property; 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 "); 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; } pad = (GstGLVideoMixerPad *) frame->pad; - in_width = - GST_VIDEO_INFO_WIDTH (&GST_VIDEO_AGGREGATOR_PAD (pad)->info); - in_height = - GST_VIDEO_INFO_HEIGHT (&GST_VIDEO_AGGREGATOR_PAD (pad)->info); + in_width = GST_VIDEO_INFO_WIDTH (&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) { GST_DEBUG ("skipping texture:%u frame:%p width:%u height %u",