mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

va: pool: Set the video_alignment after we get image info.

Browse source 
The set_format() of the allocator may change the stride of the
alloc_info. We should update the video_align.stride_align based
on it. Or, we get a warning in gst_video_meta_validate_alignment().

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1698>
This commit is contained in:
He Junyan 2020-10-25 23:13:46 +08:00 committed by GStreamer Merge Bot
parent caf28d8f12
commit d76204d14f
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
sys/va/gstvapool.c
View file

@ -114,7 +114,7 @@ gst_va_pool_set_config (GstBufferPool * pool, GstStructure * config)
vpool->need_alignment = gst_buffer_pool_config_has_option (config, vpool->need_alignment = gst_buffer_pool_config_has_option (config,
GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT); GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT);
if (vpool->need_alignment && vpool->add_videometa) { if (vpool->need_alignment) {
gst_buffer_pool_config_get_video_alignment (config, &video_align); gst_buffer_pool_config_get_video_alignment (config, &video_align);
width += video_align.padding_left + video_align.padding_right; width += video_align.padding_left + video_align.padding_right;
@ -123,8 +123,6 @@ gst_va_pool_set_config (GstBufferPool * pool, GstStructure * config)
/* apply the alignment to the info */ /* apply the alignment to the info */
if (!gst_video_info_align (&caps_info, &video_align)) if (!gst_video_info_align (&caps_info, &video_align))
goto failed_to_align; goto failed_to_align;
gst_buffer_pool_config_set_video_alignment (config, &video_align);
} }
/* update allocation info with aligned size */ /* update allocation info with aligned size */
@ -146,8 +144,24 @@ gst_va_pool_set_config (GstBufferPool * pool, GstStructure * config)
vpool->caps_info = caps_info; vpool->caps_info = caps_info;
vpool->alloc_info = alloc_info; vpool->alloc_info = alloc_info;
/* May adjust the stride alignment based on the real HW alignment */
if (vpool->need_alignment) {
for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&alloc_info); i++) {
gint nth_bit;
nth_bit = g_bit_nth_lsf (GST_VIDEO_INFO_PLANE_STRIDE (&alloc_info, i), 0);
if (nth_bit >= 0)
video_align.stride_align[i] = (1U << nth_bit) - 1;
}
vpool->video_align = video_align; vpool->video_align = video_align;
gst_buffer_pool_config_set_video_alignment (config, &video_align);
} else {
gst_video_alignment_reset (&vpool->video_align);
}
if (gst_caps_is_raw (caps)) { if (gst_caps_is_raw (caps)) {
for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&caps_info); i++) { for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&caps_info); i++) {
if (GST_VIDEO_INFO_PLANE_STRIDE (&orig_info, i) != if (GST_VIDEO_INFO_PLANE_STRIDE (&orig_info, i) !=