mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 11:41:09 +00:00
Code Issues 1 Projects Releases Wiki Activity

va:allocator: Let pool alloc_info be consitent with the test order in gst_va_allocator_try

Browse source 
In gst_va_allocator_try, the first try is to use derive_image, if it
succeeds, we should use info from derived image to create bufferpool.
If derive fails, then try create_image and give created image info
to the pool.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5046>
This commit is contained in:
Mengkejiergeli Ba 2023-07-13 16:56:56 +08:00 committed by GStreamer Marge Bot
parent f954d93f27
commit b997f541b2
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
subprojects/gst-plugins-bad/gst-libs/gst/va/gstvaallocator.c
View file

@ -1169,7 +1169,6 @@ struct _GstVaAllocator
guint32 fourcc; guint32 fourcc;
guint32 rt_format; guint32 rt_format;
GstVideoInfo derived_info;
GstVideoInfo info; GstVideoInfo info;
guint usage_hint; guint usage_hint;
@ -1329,9 +1328,7 @@ _update_image_info (GstVaAllocator * va_allocator)
&& va_allocator->surface_format == va_allocator->img_format) { && va_allocator->surface_format == va_allocator->img_format) {
if (va_get_derive_image (va_allocator->display, surface, &image)) { if (va_get_derive_image (va_allocator->display, surface, &image)) {
va_allocator->use_derived = TRUE; va_allocator->use_derived = TRUE;
va_allocator->derived_info = va_allocator->info; goto done;
_update_info (&va_allocator->derived_info, &image);
va_destroy_image (va_allocator->display, image.image_id);
} }
image.image_id = VA_INVALID_ID; /* reset it */ image.image_id = VA_INVALID_ID; /* reset it */
} }
@ -1350,6 +1347,7 @@ _update_image_info (GstVaAllocator * va_allocator)
return FALSE; return FALSE;
} }
done:
_update_info (&va_allocator->info, &image); _update_info (&va_allocator->info, &image);
va_destroy_image (va_allocator->display, image.image_id); va_destroy_image (va_allocator->display, image.image_id);
va_destroy_surfaces (va_allocator->display, &surface, 1); va_destroy_surfaces (va_allocator->display, &surface, 1);
@ -1412,24 +1410,21 @@ _va_map_unlocked (GstVaMemory * mem, GstMapFlags flags)
* problematic */ * problematic */
use_derived = va_allocator->use_derived && !((flags & GST_MAP_READ) use_derived = va_allocator->use_derived && !((flags & GST_MAP_READ)
|| ((flags & GST_MAP_WRITE) || ((flags & GST_MAP_WRITE)
&& GST_VIDEO_INFO_IS_YUV (&va_allocator->derived_info))); && GST_VIDEO_INFO_IS_YUV (&va_allocator->info)));
break; break;
case GST_VA_IMPLEMENTATION_MESA_GALLIUM: case GST_VA_IMPLEMENTATION_MESA_GALLIUM:
/* Reading RGB derived images, with non-standard resolutions, /* Reading RGB derived images, with non-standard resolutions,
* looks like tiled too. TODO(victor): fill a bug in Mesa. */ * looks like tiled too. TODO(victor): fill a bug in Mesa. */
use_derived = va_allocator->use_derived && !((flags & GST_MAP_READ) use_derived = va_allocator->use_derived && !((flags & GST_MAP_READ)
&& GST_VIDEO_INFO_IS_RGB (&va_allocator->derived_info)); && GST_VIDEO_INFO_IS_RGB (&va_allocator->info));
break; break;
default: default:
use_derived = va_allocator->use_derived; use_derived = va_allocator->use_derived;
break; break;
} }
#endif
} }
if (use_derived) #endif
info = &va_allocator->derived_info; info = &va_allocator->info;
else
info = &va_allocator->info;
if (!va_ensure_image (display, mem->surface, info, &mem->image, use_derived)) if (!va_ensure_image (display, mem->surface, info, &mem->image, use_derived))
return NULL; return NULL;