mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-09 17:05:52 +00:00
Code Issues 1 Projects Releases Wiki Activity

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

Browse source 
The command line such as:
  gst-launch-1.0 -vf filesrc location=1.264 ! h264parse !
  vah264dec ! varenderD129postproc ! fakesink
The decoder here gets the allocation proposal from the vpp which is
on another GPU device. The allocator and pool belong to other display
and should not be used in the decoder.

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 17:08:12 +08:00
parent 3875c420f7
commit a8330686cb
1 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
subprojects/gst-plugins-bad/sys/va/gstvabasedec.c
View file

@ -283,12 +283,22 @@ _decide_allocation_for_video_crop (GstVideoDecoder * decoder,
guint size = 0, min, max; guint size = 0, min, max;
GstVaBaseDec *base = GST_VA_BASE_DEC (decoder); GstVaBaseDec *base = GST_VA_BASE_DEC (decoder);
gboolean ret = TRUE; gboolean ret = TRUE;
gboolean dont_use_other_pool = FALSE;
GstCaps *va_caps = NULL; GstCaps *va_caps = NULL;
/* If others provide a valid allocator, just use it. */ /* If others provide a valid allocator, just use it. */
if (gst_query_get_n_allocation_params (query) > 0) { if (gst_query_get_n_allocation_params (query) > 0) {
gst_query_parse_nth_allocation_param (query, 0, &other_allocator, gst_query_parse_nth_allocation_param (query, 0, &other_allocator,
&other_params); &other_params);
GstVaDisplay *display;
display = gst_va_allocator_peek_display (other_allocator);
/* We should not use allocator and pool from other display. */
if (display != base->display) {
gst_clear_object (&other_allocator);
dont_use_other_pool = TRUE;
}
update_allocator = TRUE; update_allocator = TRUE;
} else { } else {
gst_allocation_params_init (&other_params); gst_allocation_params_init (&other_params);
@ -298,6 +308,8 @@ _decide_allocation_for_video_crop (GstVideoDecoder * decoder,
if (gst_query_get_n_allocation_pools (query) > 0) { if (gst_query_get_n_allocation_pools (query) > 0) {
gst_query_parse_nth_allocation_pool (query, 0, &other_pool, &size, &min, gst_query_parse_nth_allocation_pool (query, 0, &other_pool, &size, &min,
&max); &max);
if (dont_use_other_pool)
gst_clear_object (&other_pool);
min += base->min_buffers; min += base->min_buffers;
size = MAX (size, GST_VIDEO_INFO_SIZE (info)); size = MAX (size, GST_VIDEO_INFO_SIZE (info));
@ -479,6 +491,7 @@ gst_va_base_dec_decide_allocation (GstVideoDecoder * decoder, GstQuery * query)
guint size = 0, min, max; guint size = 0, min, max;
gboolean update_pool = FALSE, update_allocator = FALSE; gboolean update_pool = FALSE, update_allocator = FALSE;
gboolean has_videometa, has_video_crop_meta; gboolean has_videometa, has_video_crop_meta;
gboolean dont_use_other_pool = FALSE;
gboolean ret = TRUE; gboolean ret = TRUE;
g_assert (base->min_buffers > 0); g_assert (base->min_buffers > 0);
@ -506,13 +519,20 @@ gst_va_base_dec_decide_allocation (GstVideoDecoder * decoder, 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 != base->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 {
gst_allocation_params_init (&other_params); gst_allocation_params_init (&other_params);
@ -528,6 +548,8 @@ gst_va_base_dec_decide_allocation (GstVideoDecoder * decoder, 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);
} }
} }