mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 01:45:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

vulkan/decoder: don't initialize function table once

Browse source 
Since it has to be associated with the device and it gets destroyed when the
decoder is freed.

Now it's created when the decoder starts and it's flagged.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6089>
This commit is contained in:
Víctor Manuel Jáquez Leal 2024-02-07 19:03:56 +01:00 committed by GStreamer Marge Bot
parent bf936fa6c0
commit f0c5a853a6
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkdecoder.c
View file

@ -53,6 +53,8 @@ struct _GstVulkanDecoderPrivate
GstVulkanVideoSession session; GstVulkanVideoSession session;
GstVulkanVideoCapabilities caps; GstVulkanVideoCapabilities caps;
VkVideoFormatPropertiesKHR format; VkVideoFormatPropertiesKHR format;
gboolean vk_populated;
GstVulkanVideoFunctions vk; GstVulkanVideoFunctions vk;
gboolean started; gboolean started;
@ -71,24 +73,25 @@ static GstVulkanHandle *gst_vulkan_decoder_new_video_session_parameters
(GstVulkanDecoder * self, GstVulkanDecoderParameters * params, (GstVulkanDecoder * self, GstVulkanDecoderParameters * params,
GError ** error); GError ** error);
static gpointer static gboolean
_populate_function_table (gpointer data) _populate_function_table (GstVulkanDecoder * self)
{ {
GstVulkanDecoder *self = GST_VULKAN_DECODER (data);
GstVulkanDecoderPrivate *priv = GstVulkanDecoderPrivate *priv =
gst_vulkan_decoder_get_instance_private (self); gst_vulkan_decoder_get_instance_private (self);
GstVulkanInstance *instance; GstVulkanInstance *instance;
gboolean ret = FALSE;
if (priv->vk_populated)
return TRUE;
instance = gst_vulkan_device_get_instance (self->queue->device); instance = gst_vulkan_device_get_instance (self->queue->device);
if (!instance) { if (!instance) {
GST_ERROR_OBJECT (self, "Failed to get instance from the device"); GST_ERROR_OBJECT (self, "Failed to get instance from the device");
return GINT_TO_POINTER (FALSE); return FALSE;
} }
ret = gst_vulkan_video_get_vk_functions (instance, &priv->vk); priv->vk_populated = gst_vulkan_video_get_vk_functions (instance, &priv->vk);
gst_object_unref (instance); gst_object_unref (instance);
return GINT_TO_POINTER (ret); return priv->vk_populated;
} }
static void static void
@ -144,7 +147,6 @@ gst_vulkan_decoder_start (GstVulkanDecoder * self,
}; };
VkVideoSessionCreateInfoKHR session_create; VkVideoSessionCreateInfoKHR session_create;
GstVulkanDecoderParameters empty_params; GstVulkanDecoderParameters empty_params;
static GOnce once = G_ONCE_INIT;
guint i, maxlevel, n_fmts, codec_idx; guint i, maxlevel, n_fmts, codec_idx;
GstVideoFormat format = GST_VIDEO_FORMAT_UNKNOWN; GstVideoFormat format = GST_VIDEO_FORMAT_UNKNOWN;
VkFormat vk_format = VK_FORMAT_UNDEFINED; VkFormat vk_format = VK_FORMAT_UNDEFINED;
@ -160,8 +162,7 @@ gst_vulkan_decoder_start (GstVulkanDecoder * self,
g_assert (self->codec == profile->profile.videoCodecOperation); g_assert (self->codec == profile->profile.videoCodecOperation);
g_once (&once, _populate_function_table, self); if (!_populate_function_table (self)) {
if (GPOINTER_TO_INT (once.retval) == FALSE) {
g_set_error (error, GST_VULKAN_ERROR, VK_ERROR_INITIALIZATION_FAILED, g_set_error (error, GST_VULKAN_ERROR, VK_ERROR_INITIALIZATION_FAILED,
"Couldn't load Vulkan Video functions"); "Couldn't load Vulkan Video functions");
return FALSE; return FALSE;