From 7f61ad79389fcd28c82f068701c3fff18bc3e4b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?= Date: Sun, 2 Feb 2020 18:04:35 +0100 Subject: [PATCH] vaapivideobufferpool: dmabuf implies allocator Some code can be optimized since only if the dmabuf allocator is set, the internal flag of dmabuf is TRUE, thus there's no need to evaluate the allocator address. --- gst/vaapi/gstvaapivideobufferpool.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/gst/vaapi/gstvaapivideobufferpool.c b/gst/vaapi/gstvaapivideobufferpool.c index d99f306e84..013766d8dc 100644 --- a/gst/vaapi/gstvaapivideobufferpool.c +++ b/gst/vaapi/gstvaapivideobufferpool.c @@ -190,7 +190,7 @@ gst_vaapi_video_buffer_pool_set_config (GstBufferPool * pool, /* dmabuf allocator can change its parameters: no need to create a * new one */ - if (allocator && priv->use_dmabuf_memory) { + if (priv->use_dmabuf_memory) { gst_allocator_set_vaapi_video_info (allocator, &new_allocation_vinfo, surface_alloc_flags); } else { @@ -200,14 +200,9 @@ gst_vaapi_video_buffer_pool_set_config (GstBufferPool * pool, /* create a new allocator if needed */ if (!allocator) { - if (priv->use_dmabuf_memory) { - allocator = gst_vaapi_dmabuf_allocator_new (priv->display, - &new_allocation_vinfo, /* FIXME: */ 0, GST_PAD_SRC); - } else { - allocator = gst_vaapi_video_allocator_new (priv->display, - &new_allocation_vinfo, surface_alloc_flags, 0); - } - + /* if no allocator set, let's create a VAAPI one */ + allocator = gst_vaapi_video_allocator_new (priv->display, + &new_allocation_vinfo, surface_alloc_flags, 0); if (!allocator) goto error_no_allocator;