mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-18 20:25:25 +00:00
Code Issues 1 Projects Releases Wiki Activity

vaapivideobufferpool: remove allocation_vinfo private attribute

Browse source 
There is no need to keep this attribute internally since it is
already managed by the allocator.

https://bugzilla.gnome.org/show_bug.cgi?id=783599
This commit is contained in:
Víctor Manuel Jáquez Leal 2017-06-09 17:00:40 +02:00
parent 60158c3d6b
commit bd0209228b
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gst/vaapi/gstvaapivideobufferpool.c
View file

@ -44,7 +44,6 @@ enum
struct _GstVaapiVideoBufferPoolPrivate struct _GstVaapiVideoBufferPoolPrivate
{ {
GstVideoInfo allocation_vinfo;
GstAllocator *allocator; GstAllocator *allocator;
GstVideoInfo vmeta_vinfo; GstVideoInfo vmeta_vinfo;
GstVaapiDisplay *display; GstVaapiDisplay *display;
@ -181,8 +180,8 @@ gst_vaapi_video_buffer_pool_set_config (GstBufferPool * pool,
} }
/* reset or update the allocator if video resolution changed */ /* reset or update the allocator if video resolution changed */
if (gst_video_info_changed (&priv->allocation_vinfo, &new_allocation_vinfo) if (allocator_vinfo
|| gst_video_info_changed (allocator_vinfo, &new_allocation_vinfo)) { && gst_video_info_changed (allocator_vinfo, &new_allocation_vinfo)) {
gst_object_replace ((GstObject **) & priv->allocator, NULL); gst_object_replace ((GstObject **) & priv->allocator, NULL);
if (allocator && priv->use_dmabuf_memory) { if (allocator && priv->use_dmabuf_memory) {
@ -192,7 +191,6 @@ gst_vaapi_video_buffer_pool_set_config (GstBufferPool * pool,
allocator = NULL; allocator = NULL;
} }
} }
priv->allocation_vinfo = new_allocation_vinfo;
if (!gst_buffer_pool_config_has_option (config, if (!gst_buffer_pool_config_has_option (config,
GST_BUFFER_POOL_OPTION_VAAPI_VIDEO_META)) GST_BUFFER_POOL_OPTION_VAAPI_VIDEO_META))
@ -231,7 +229,7 @@ gst_vaapi_video_buffer_pool_set_config (GstBufferPool * pool,
negotiated_vinfo = negotiated_vinfo =
gst_allocator_get_vaapi_negotiated_video_info (priv->allocator); gst_allocator_get_vaapi_negotiated_video_info (priv->allocator);
priv->vmeta_vinfo = (negotiated_vinfo) ? priv->vmeta_vinfo = (negotiated_vinfo) ?
*negotiated_vinfo : priv->allocation_vinfo; *negotiated_vinfo : new_allocation_vinfo;
if (GST_VIDEO_INFO_SIZE (&priv->vmeta_vinfo) != size) { if (GST_VIDEO_INFO_SIZE (&priv->vmeta_vinfo) != size) {
gst_buffer_pool_config_set_params (config, caps, gst_buffer_pool_config_set_params (config, caps,
@ -247,10 +245,10 @@ gst_vaapi_video_buffer_pool_set_config (GstBufferPool * pool,
priv->options |= GST_VAAPI_VIDEO_BUFFER_POOL_OPTION_VIDEO_META; priv->options |= GST_VAAPI_VIDEO_BUFFER_POOL_OPTION_VIDEO_META;
} else { } else {
gint i; gint i;
for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&priv->allocation_vinfo); i++) { for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&new_allocation_vinfo); i++) {
if (GST_VIDEO_INFO_PLANE_OFFSET (&priv->allocation_vinfo, i) != if (GST_VIDEO_INFO_PLANE_OFFSET (&new_allocation_vinfo, i) !=
GST_VIDEO_INFO_PLANE_OFFSET (&priv->vmeta_vinfo, i) || GST_VIDEO_INFO_PLANE_OFFSET (&priv->vmeta_vinfo, i) ||
GST_VIDEO_INFO_PLANE_STRIDE (&priv->allocation_vinfo, i) != GST_VIDEO_INFO_PLANE_STRIDE (&new_allocation_vinfo, i) !=
GST_VIDEO_INFO_PLANE_STRIDE (&priv->vmeta_vinfo, i)) { GST_VIDEO_INFO_PLANE_STRIDE (&priv->vmeta_vinfo, i)) {
priv->options |= GST_VAAPI_VIDEO_BUFFER_POOL_OPTION_VIDEO_META; priv->options |= GST_VAAPI_VIDEO_BUFFER_POOL_OPTION_VIDEO_META;
gst_buffer_pool_config_add_option (config, gst_buffer_pool_config_add_option (config,
@ -525,8 +523,6 @@ gst_vaapi_video_buffer_pool_init (GstVaapiVideoBufferPool * pool)
GST_VAAPI_VIDEO_BUFFER_POOL_GET_PRIVATE (pool); GST_VAAPI_VIDEO_BUFFER_POOL_GET_PRIVATE (pool);
pool->priv = priv; pool->priv = priv;
gst_video_info_init (&priv->allocation_vinfo);
} }
GstBufferPool * GstBufferPool *