mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-16 19:25:18 +00:00
vulkan: conceal decoder from public API
Since we don't want to expose video decoding API outside of GStreamer, the header is removed from installation and both source files are renamed as -private. The header must remain in gst-libs because is referred by GstVulkanQueue, which's the decoder factory. Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6723>
This commit is contained in:
parent
547e2899d1
commit
668b395a38
9 changed files with 11 additions and 44 deletions
|
@ -19449,23 +19449,6 @@
|
||||||
"GstVulkanCommandPool.pool",
|
"GstVulkanCommandPool.pool",
|
||||||
"GstVulkanCommandPool.queue",
|
"GstVulkanCommandPool.queue",
|
||||||
"GstVulkanCommandPoolClass.parent_class",
|
"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",
|
||||||
"GstVulkanDescriptorCache.parent",
|
"GstVulkanDescriptorCache.parent",
|
||||||
"GstVulkanDescriptorCache.pool",
|
"GstVulkanDescriptorCache.pool",
|
||||||
|
@ -44795,22 +44778,6 @@
|
||||||
"gst_vulkan_command_pool_lock",
|
"gst_vulkan_command_pool_lock",
|
||||||
"gst_vulkan_command_pool_unlock",
|
"gst_vulkan_command_pool_unlock",
|
||||||
"gst_vulkan_create_shader",
|
"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_acquire",
|
||||||
"gst_vulkan_descriptor_cache_new",
|
"gst_vulkan_descriptor_cache_new",
|
||||||
"gst_vulkan_descriptor_pool_create",
|
"gst_vulkan_descriptor_pool_create",
|
||||||
|
|
|
@ -26,6 +26,7 @@
|
||||||
#include <gst/video/video.h>
|
#include <gst/video/video.h>
|
||||||
#include <gst/vulkan/vulkan.h>
|
#include <gst/vulkan/vulkan.h>
|
||||||
|
|
||||||
|
#include "gst/vulkan/gstvkdecoder-private.h"
|
||||||
#include "gstvulkanelements.h"
|
#include "gstvulkanelements.h"
|
||||||
|
|
||||||
typedef struct _GstVulkanH264Decoder GstVulkanH264Decoder;
|
typedef struct _GstVulkanH264Decoder GstVulkanH264Decoder;
|
||||||
|
|
|
@ -25,6 +25,7 @@
|
||||||
|
|
||||||
#include <gst/video/video.h>
|
#include <gst/video/video.h>
|
||||||
#include <gst/vulkan/vulkan.h>
|
#include <gst/vulkan/vulkan.h>
|
||||||
|
#include "gst/vulkan/gstvkdecoder-private.h"
|
||||||
|
|
||||||
#include "gstvulkanelements.h"
|
#include "gstvulkanelements.h"
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "gstvkdecoder.h"
|
#include "gstvkdecoder-private.h"
|
||||||
|
|
||||||
#include "gstvkoperation.h"
|
#include "gstvkoperation.h"
|
||||||
#include "gstvkphysicaldevice-private.h"
|
#include "gstvkphysicaldevice-private.h"
|
|
@ -23,6 +23,9 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "gstvkqueue.h"
|
#include "gstvkqueue.h"
|
||||||
|
#if GST_VULKAN_HAVE_VIDEO_EXTENSIONS
|
||||||
|
#include "gstvkdecoder-private.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* SECTION:vkqueue
|
* SECTION:vkqueue
|
||||||
|
|
|
@ -23,9 +23,6 @@
|
||||||
|
|
||||||
#include <gst/vulkan/gstvkdevice.h>
|
#include <gst/vulkan/gstvkdevice.h>
|
||||||
#include <gst/vulkan/gstvkcommandpool.h>
|
#include <gst/vulkan/gstvkcommandpool.h>
|
||||||
#if GST_VULKAN_HAVE_VIDEO_EXTENSIONS
|
|
||||||
#include <gst/vulkan/gstvkdecoder.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define GST_TYPE_VULKAN_QUEUE (gst_vulkan_queue_get_type())
|
#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))
|
#define GST_VULKAN_QUEUE(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_TYPE_VULKAN_QUEUE, GstVulkanQueue))
|
||||||
|
|
|
@ -333,12 +333,9 @@ static StdVideoH265PictureParameterSet h265_pps;
|
||||||
endif
|
endif
|
||||||
if have_vk_video
|
if have_vk_video
|
||||||
vulkan_conf.set('GST_VULKAN_HAVE_VIDEO_EXTENSIONS', 1)
|
vulkan_conf.set('GST_VULKAN_HAVE_VIDEO_EXTENSIONS', 1)
|
||||||
vulkan_priv_sources += files('gstvkvideo-private.c')
|
vulkan_priv_sources += files(
|
||||||
vulkan_sources += files(
|
'gstvkvideo-private.c',
|
||||||
'gstvkdecoder.c',
|
'gstvkdecoder-private.c',
|
||||||
)
|
|
||||||
vulkan_headers += files(
|
|
||||||
'gstvkdecoder.h'
|
|
||||||
)
|
)
|
||||||
elif get_option('vulkan-video').enabled()
|
elif get_option('vulkan-video').enabled()
|
||||||
error('Vulkan Video extensions headers not found')
|
error('Vulkan Video extensions headers not found')
|
||||||
|
@ -501,4 +498,3 @@ if enabled_vulkan_winsys.contains('wayland')
|
||||||
sources : vulkan_wayland_gir)
|
sources : vulkan_wayland_gir)
|
||||||
meson.override_dependency('gstreamer-vulkan-wayland-1.0', gstvulkanwayland_dep)
|
meson.override_dependency('gstreamer-vulkan-wayland-1.0', gstvulkanwayland_dep)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -26,6 +26,8 @@
|
||||||
#include <gst/check/gstcheck.h>
|
#include <gst/check/gstcheck.h>
|
||||||
#include <gst/vulkan/vulkan.h>
|
#include <gst/vulkan/vulkan.h>
|
||||||
|
|
||||||
|
#include "gst/vulkan/gstvkdecoder-private.h"
|
||||||
|
|
||||||
static GstVulkanInstance *instance;
|
static GstVulkanInstance *instance;
|
||||||
static GstVulkanDevice *device;
|
static GstVulkanDevice *device;
|
||||||
static GstVulkanQueue *video_queue = NULL;
|
static GstVulkanQueue *video_queue = NULL;
|
||||||
|
|
Loading…
Reference in a new issue