diff --git a/subprojects/gst-docs/symbols/symbol_index.json b/subprojects/gst-docs/symbols/symbol_index.json index caa1232bdf..362e40a7e2 100644 --- a/subprojects/gst-docs/symbols/symbol_index.json +++ b/subprojects/gst-docs/symbols/symbol_index.json @@ -19449,23 +19449,6 @@ "GstVulkanCommandPool.pool", "GstVulkanCommandPool.queue", "GstVulkanCommandPoolClass.parent_class", - "GstVulkanDecoder", - "GstVulkanDecoder.codec", - "GstVulkanDecoder.dedicated_dpb", - "GstVulkanDecoder.input_buffer", - "GstVulkanDecoder.layered_buffer", - "GstVulkanDecoder.layered_dpb", - "GstVulkanDecoder.parent", - "GstVulkanDecoder.profile", - "GstVulkanDecoder.queue", - "GstVulkanDecoderClass.parent", - "GstVulkanDecoderPicture", - "GstVulkanDecoderPicture.dpb", - "GstVulkanDecoderPicture.img_view_out", - "GstVulkanDecoderPicture.img_view_ref", - "GstVulkanDecoderPicture.out", - "GstVulkanDecoderPicture.refs", - "GstVulkanDecoderPicture.slice_offs", "GstVulkanDescriptorCache", "GstVulkanDescriptorCache.parent", "GstVulkanDescriptorCache.pool", @@ -44795,22 +44778,6 @@ "gst_vulkan_command_pool_lock", "gst_vulkan_command_pool_unlock", "gst_vulkan_create_shader", - "gst_vulkan_decoder_append_slice", - "gst_vulkan_decoder_caps", - "gst_vulkan_decoder_create_dpb_pool", - "gst_vulkan_decoder_decode", - "gst_vulkan_decoder_flush", - "gst_vulkan_decoder_is_started", - "gst_vulkan_decoder_out_format", - "gst_vulkan_decoder_picture_create_view", - "gst_vulkan_decoder_picture_init", - "gst_vulkan_decoder_picture_release", - "gst_vulkan_decoder_profile_caps", - "gst_vulkan_decoder_start", - "gst_vulkan_decoder_stop", - "gst_vulkan_decoder_update_video_session_parameters", - "gst_vulkan_decoder_update_ycbcr_sampler", - "gst_vulkan_decoder_wait", "gst_vulkan_descriptor_cache_acquire", "gst_vulkan_descriptor_cache_new", "gst_vulkan_descriptor_pool_create", diff --git a/subprojects/gst-plugins-bad/ext/vulkan/vkh264dec.c b/subprojects/gst-plugins-bad/ext/vulkan/vkh264dec.c index c35558c815..92d4988009 100644 --- a/subprojects/gst-plugins-bad/ext/vulkan/vkh264dec.c +++ b/subprojects/gst-plugins-bad/ext/vulkan/vkh264dec.c @@ -26,6 +26,7 @@ #include #include +#include "gst/vulkan/gstvkdecoder-private.h" #include "gstvulkanelements.h" typedef struct _GstVulkanH264Decoder GstVulkanH264Decoder; diff --git a/subprojects/gst-plugins-bad/ext/vulkan/vkh265dec.c b/subprojects/gst-plugins-bad/ext/vulkan/vkh265dec.c index 2efcff3974..b73fab01d4 100644 --- a/subprojects/gst-plugins-bad/ext/vulkan/vkh265dec.c +++ b/subprojects/gst-plugins-bad/ext/vulkan/vkh265dec.c @@ -25,6 +25,7 @@ #include #include +#include "gst/vulkan/gstvkdecoder-private.h" #include "gstvulkanelements.h" diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkdecoder.c b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkdecoder-private.c similarity index 99% rename from subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkdecoder.c rename to subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkdecoder-private.c index d5cbe5d6e7..b3e68f3fbe 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkdecoder.c +++ b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkdecoder-private.c @@ -22,7 +22,7 @@ #include "config.h" #endif -#include "gstvkdecoder.h" +#include "gstvkdecoder-private.h" #include "gstvkoperation.h" #include "gstvkphysicaldevice-private.h" diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkdecoder.h b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkdecoder-private.h similarity index 100% rename from subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkdecoder.h rename to subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkdecoder-private.h diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkqueue.c b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkqueue.c index 0a9caa3034..31a818dd9f 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkqueue.c +++ b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkqueue.c @@ -23,6 +23,9 @@ #endif #include "gstvkqueue.h" +#if GST_VULKAN_HAVE_VIDEO_EXTENSIONS +#include "gstvkdecoder-private.h" +#endif /** * SECTION:vkqueue diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkqueue.h b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkqueue.h index 5dff8fa8ec..e8aee04ab2 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkqueue.h +++ b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkqueue.h @@ -23,9 +23,6 @@ #include #include -#if GST_VULKAN_HAVE_VIDEO_EXTENSIONS -#include -#endif #define GST_TYPE_VULKAN_QUEUE (gst_vulkan_queue_get_type()) #define GST_VULKAN_QUEUE(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_TYPE_VULKAN_QUEUE, GstVulkanQueue)) diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/meson.build b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/meson.build index cb719bdd2d..910001a0a3 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/meson.build +++ b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/meson.build @@ -333,12 +333,9 @@ static StdVideoH265PictureParameterSet h265_pps; endif if have_vk_video vulkan_conf.set('GST_VULKAN_HAVE_VIDEO_EXTENSIONS', 1) - vulkan_priv_sources += files('gstvkvideo-private.c') - vulkan_sources += files( - 'gstvkdecoder.c', - ) - vulkan_headers += files( - 'gstvkdecoder.h' + vulkan_priv_sources += files( + 'gstvkvideo-private.c', + 'gstvkdecoder-private.c', ) elif get_option('vulkan-video').enabled() error('Vulkan Video extensions headers not found') @@ -501,4 +498,3 @@ if enabled_vulkan_winsys.contains('wayland') sources : vulkan_wayland_gir) meson.override_dependency('gstreamer-vulkan-wayland-1.0', gstvulkanwayland_dep) endif - diff --git a/subprojects/gst-plugins-bad/tests/check/libs/vkvideodecode.c b/subprojects/gst-plugins-bad/tests/check/libs/vkvideodecode.c index 2a536eba38..e71f92a261 100644 --- a/subprojects/gst-plugins-bad/tests/check/libs/vkvideodecode.c +++ b/subprojects/gst-plugins-bad/tests/check/libs/vkvideodecode.c @@ -26,6 +26,8 @@ #include #include +#include "gst/vulkan/gstvkdecoder-private.h" + static GstVulkanInstance *instance; static GstVulkanDevice *device; static GstVulkanQueue *video_queue = NULL;