mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-02 06:31:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

va: compositor: Do not use allocator and pool from other display.

Browse source 
Just like the va decoder, the compositor should not use allocator
and pool from other display. Also, when importing the input buffer,
if it is from other display, we should fallback to memory copy.

Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1167
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3322>
This commit is contained in:
He Junyan 2022-11-04 21:26:23 +08:00
parent b9b211c1d1
commit d51b29b1dc
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
subprojects/gst-plugins-bad/sys/va/gstvacompositor.c
View file

@ -656,6 +656,7 @@ gst_va_compositor_decide_allocation (GstAggregator * agg, GstQuery * query)
GstVideoInfo info; GstVideoInfo info;
guint min, max, size = 0, usage_hint = VA_SURFACE_ATTRIB_USAGE_HINT_VPP_WRITE; guint min, max, size = 0, usage_hint = VA_SURFACE_ATTRIB_USAGE_HINT_VPP_WRITE;
gboolean update_pool, update_allocator, has_videometa, copy_frames; gboolean update_pool, update_allocator, has_videometa, copy_frames;
gboolean dont_use_other_pool = FALSE;
gst_query_parse_allocation (query, &caps, NULL); gst_query_parse_allocation (query, &caps, NULL);
@ -668,13 +669,20 @@ gst_va_compositor_decide_allocation (GstAggregator * agg, GstQuery * query)
} }
if (gst_query_get_n_allocation_params (query) > 0) { if (gst_query_get_n_allocation_params (query) > 0) {
GstVaDisplay *display;
gst_query_parse_nth_allocation_param (query, 0, &allocator, &other_params); gst_query_parse_nth_allocation_param (query, 0, &allocator, &other_params);
if (allocator && !(GST_IS_VA_DMABUF_ALLOCATOR (allocator) display = gst_va_allocator_peek_display (allocator);
|| GST_IS_VA_ALLOCATOR (allocator))) { if (!display) {
/* save the allocator for the other pool */ /* save the allocator for the other pool */
other_allocator = allocator; other_allocator = allocator;
allocator = NULL; allocator = NULL;
} else if (display != self->display) {
/* The allocator and pool belong to other display, we should not use. */
gst_clear_object (&allocator);
dont_use_other_pool = TRUE;
} }
update_allocator = TRUE; update_allocator = TRUE;
} else { } else {
update_allocator = FALSE; update_allocator = FALSE;
@ -689,6 +697,8 @@ gst_va_compositor_decide_allocation (GstAggregator * agg, GstQuery * query)
"may need other pool for copy frames %" GST_PTR_FORMAT, pool); "may need other pool for copy frames %" GST_PTR_FORMAT, pool);
other_pool = pool; other_pool = pool;
pool = NULL; pool = NULL;
} else if (dont_use_other_pool) {
gst_clear_object (&pool);
} }
} }
@ -911,7 +921,8 @@ _try_import_buffer (GstVaCompositor * self, GstVideoInfo * info,
gboolean ret; gboolean ret;
surface = gst_va_buffer_get_surface (inbuf); surface = gst_va_buffer_get_surface (inbuf);
if (surface != VA_INVALID_ID) if (surface != VA_INVALID_ID &&
(gst_va_buffer_peek_display (inbuf) == self->display))
return TRUE; return TRUE;
g_rec_mutex_lock (&GST_VA_SHARED_LOCK); g_rec_mutex_lock (&GST_VA_SHARED_LOCK);