From 5341d9ae9fcc78c90562423b30a8fdf0b97351f3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?= Date: Tue, 10 May 2016 16:14:48 +0200 Subject: [PATCH] plugins: remove gst_vaapi_plugin_base_set_pool_config() This function helper make sense for GStreamer 1.2, but it is not helpful for greater version since the validation is already done in the API implementation. Thus, it is removed. --- gst/vaapi/gstvaapipluginbase.c | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/gst/vaapi/gstvaapipluginbase.c b/gst/vaapi/gstvaapipluginbase.c index b302557..9a9d08b 100644 --- a/gst/vaapi/gstvaapipluginbase.c +++ b/gst/vaapi/gstvaapipluginbase.c @@ -623,17 +623,6 @@ error_pool_config: } } -static inline gboolean -gst_vaapi_plugin_base_set_pool_config (GstBufferPool * pool, - const gchar * option) -{ - GstStructure *config; - - config = gst_buffer_pool_get_config (pool); - gst_buffer_pool_config_add_option (config, option); - return gst_buffer_pool_set_config (pool, config); -} - /** * gst_vaapi_plugin_base_decide_allocation: * @plugin: a #GstVaapiPluginBase @@ -746,26 +735,28 @@ gst_vaapi_plugin_base_decide_allocation (GstVaapiPluginBase * plugin, goto config_failed; } + config = gst_buffer_pool_get_config (pool); + /* Check whether GstVideoMeta, or GstVideoAlignment, is needed (raw video) */ if (has_video_meta) { - if (!gst_vaapi_plugin_base_set_pool_config (pool, - GST_BUFFER_POOL_OPTION_VIDEO_META)) - goto config_failed; + gst_buffer_pool_config_add_option (config, + GST_BUFFER_POOL_OPTION_VIDEO_META); } else if (has_video_alignment) { - if (!gst_vaapi_plugin_base_set_pool_config (pool, - GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT)) - goto config_failed; + gst_buffer_pool_config_add_option (config, + GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT); } /* GstVideoGLTextureUploadMeta (OpenGL) */ #if (USE_GLX || USE_EGL) if (has_texture_upload_meta) { - if (!gst_vaapi_plugin_base_set_pool_config (pool, - GST_BUFFER_POOL_OPTION_VIDEO_GL_TEXTURE_UPLOAD_META)) - goto config_failed; + gst_buffer_pool_config_add_option (config, + GST_BUFFER_POOL_OPTION_VIDEO_GL_TEXTURE_UPLOAD_META); } #endif + if (!gst_buffer_pool_set_config (pool, config)) + goto config_failed; + if (update_pool) gst_query_set_nth_allocation_pool (query, 0, pool, size, min, max); else -- 2.7.4