mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-22 17:51:16 +00:00
Code Issues 1 Projects Releases Wiki Activity

va: refactor dmabuf handle close

Browse source 
Moved the close loop into a function guarded for non-win32 platforms.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7254>
This commit is contained in:
Víctor Manuel Jáquez Leal 2024-07-29 10:29:11 +02:00
parent 080a838fca
commit 8faefccfd5
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -543,6 +543,17 @@ _modifier_found (guint64 modifier, guint64 * modifiers, guint num_modifiers)
return FALSE; return FALSE;
} }
static void
_close_fds (VADRMPRIMESurfaceDescriptor * desc)
{
#ifndef G_OS_WIN32
for (guint32 i = 0; i < desc->num_objects; i++) {
gint fd = desc->objects[i].fd;
close (fd);
}
#endif
}
static gboolean static gboolean
_va_create_surface_and_export_to_dmabuf (GstVaDisplay * display, _va_create_surface_and_export_to_dmabuf (GstVaDisplay * display,
guint usage_hint, guint64 * modifiers, guint num_modifiers, guint usage_hint, guint64 * modifiers, guint num_modifiers,
@ -629,10 +640,7 @@ _va_create_surface_and_export_to_dmabuf (GstVaDisplay * display,
failed: failed:
{ {
/* Free DMAbufs on failure */ /* Free DMAbufs on failure */
for (guint32 i = 0; i < desc.num_objects; i++) { _close_fds (&desc);
gint fd = desc.objects[i].fd;
close (fd);
}
va_destroy_surfaces (display, &surface, 1); va_destroy_surfaces (display, &surface, 1);
return FALSE; return FALSE;
} }
@ -666,10 +674,7 @@ gst_va_dmabuf_get_modifier_for_format (GstVaDisplay * display,
return DRM_FORMAT_MOD_INVALID; return DRM_FORMAT_MOD_INVALID;
/* Close the fds we won't be using */ /* Close the fds we won't be using */
for (guint32 i = 0; i < desc.num_objects; i++) { _close_fds (&desc);
gint fd = desc.objects[i].fd;
close (fd);
}
va_destroy_surfaces (display, &surface, 1); va_destroy_surfaces (display, &surface, 1);
return desc.objects[0].drm_format_modifier; return desc.objects[0].drm_format_modifier;