mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-22 17:51:16 +00:00
vaallocator: Do not try derive image for d3d backend
Current codes try derive image in _update_image_info first, if derive returns no error, the va_allocator->info is the one from derived image, but in va_map_unlocked, we disable derive manner for d3d backend because it doesn't seem to work, this will cause issue for d3d path, i.e. possibly using derived info in va_get_image to do mapping... This patch disables derive image for d3d backend in _update_image_info, to ensure we only use info from va_create_image for d3d path. Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5495>
This commit is contained in:
parent
03717697d9
commit
38e8896887
1 changed files with 10 additions and 5 deletions
|
@ -1322,6 +1322,14 @@ _update_image_info (GstVaAllocator * va_allocator)
|
|||
GST_VIDEO_INFO_WIDTH (&va_allocator->info),
|
||||
GST_VIDEO_INFO_HEIGHT (&va_allocator->info));
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
/* XXX: Derived image is problematic for D3D backend */
|
||||
if (va_allocator->feat_use_derived != GST_VA_FEATURE_DISABLED) {
|
||||
GST_INFO_OBJECT (va_allocator, "Disable image derive on Windows.");
|
||||
va_allocator->feat_use_derived = GST_VA_FEATURE_DISABLED;
|
||||
}
|
||||
va_allocator->use_derived = FALSE;
|
||||
#endif
|
||||
/* Try derived first, but different formats can never derive */
|
||||
if (va_allocator->feat_use_derived != GST_VA_FEATURE_DISABLED
|
||||
&& va_allocator->surface_format == va_allocator->img_format) {
|
||||
|
@ -1391,10 +1399,7 @@ _va_map_unlocked (GstVaMemory * mem, GstMapFlags flags)
|
|||
mem->mapped_data = &mem->surface;
|
||||
goto success;
|
||||
}
|
||||
#ifdef G_OS_WIN32
|
||||
/* XXX: Derived image doesn't seem to work for D3D backend */
|
||||
use_derived = FALSE;
|
||||
#else
|
||||
|
||||
if (va_allocator->feat_use_derived == GST_VA_FEATURE_AUTO) {
|
||||
switch (gst_va_display_get_implementation (display)) {
|
||||
case GST_VA_IMPLEMENTATION_INTEL_I965:
|
||||
|
@ -1417,7 +1422,7 @@ _va_map_unlocked (GstVaMemory * mem, GstMapFlags flags)
|
|||
} else {
|
||||
use_derived = va_allocator->use_derived;
|
||||
}
|
||||
#endif
|
||||
|
||||
info = &va_allocator->info;
|
||||
|
||||
if (!va_ensure_image (display, mem->surface, info, &mem->image, use_derived))
|
||||
|
|
Loading…
Reference in a new issue