diff options
| author | Nicolas Dufresne <nicolas.dufresne@collabora.com> | 2015-08-20 17:27:34 -0700 |
|---|---|---|
| committer | Nicolas Dufresne <nicolas.dufresne@collabora.com> | 2015-08-22 22:15:36 -0700 |
| commit | 206638c4398a58f373f069ae2150a056458cc592 (patch) | |
| tree | e75759b9110264ea3033266d4905233344fdae6a /gst-libs | |
| parent | 98457cb6ea7fc22834603546baef07264bffa296 (diff) | |
| download | gstreamer-plugins-bad-206638c4398a58f373f069ae2150a056458cc592.tar.gz | |
gl: Let base transform relay the meta api for us
During allocation query, when this element is not passthrough, it must
relay the overlay compostion meta and it's parameters. Fortunatly, base
transform can do this for us.
https://bugzilla.gnome.org/show_bug.cgi?id=753850
Diffstat (limited to 'gst-libs')
| -rw-r--r-- | gst-libs/gst/gl/gstglbasefilter.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/gst-libs/gst/gl/gstglbasefilter.c b/gst-libs/gst/gl/gstglbasefilter.c index 68cc114c7..8538644ff 100644 --- a/gst-libs/gst/gl/gstglbasefilter.c +++ b/gst-libs/gst/gl/gstglbasefilter.c @@ -69,8 +69,6 @@ static gboolean gst_gl_base_filter_start (GstBaseTransform * bt); static gboolean gst_gl_base_filter_stop (GstBaseTransform * bt); static gboolean gst_gl_base_filter_decide_allocation (GstBaseTransform * trans, GstQuery * query); -static gboolean gst_gl_base_filter_propose_allocation (GstBaseTransform * trans, - GstQuery * decide_query, GstQuery * query); /* GstGLContextThreadFunc */ static void gst_gl_base_filter_gl_start (GstGLContext * context, gpointer data); @@ -95,8 +93,6 @@ gst_gl_base_filter_class_init (GstGLBaseFilterClass * klass) GST_BASE_TRANSFORM_CLASS (klass)->stop = gst_gl_base_filter_stop; GST_BASE_TRANSFORM_CLASS (klass)->decide_allocation = gst_gl_base_filter_decide_allocation; - GST_BASE_TRANSFORM_CLASS (klass)->propose_allocation = - gst_gl_base_filter_propose_allocation; element_class->set_context = gst_gl_base_filter_set_context; element_class->change_state = gst_gl_base_filter_change_state; @@ -365,7 +361,8 @@ gst_gl_base_filter_decide_allocation (GstBaseTransform * trans, goto error; } - return TRUE; + return GST_BASE_TRANSFORM_CLASS (parent_class)->decide_allocation (trans, + query); context_error: { @@ -381,13 +378,6 @@ error: } } -static gboolean -gst_gl_base_filter_propose_allocation (GstBaseTransform * trans, - GstQuery * decide_query, GstQuery * query) -{ - return FALSE; -} - static GstStateChangeReturn gst_gl_base_filter_change_state (GstElement * element, GstStateChange transition) |