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

d3d11memory: Allow null GstD3D11Allocator to alloc methods

Browse source 
Similar to gst_allocator_alloc(), use default GstD3D11Allocator
when caller passes null allocator object

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2843>
This commit is contained in:
Seungha Yang 2022-08-05 22:23:52 +09:00
parent 74f56632c3
commit 21e5c33797
1 changed files with 30 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
subprojects/gst-plugins-bad/gst-libs/gst/d3d11/gstd3d11memory.cpp
View file

@ -31,7 +31,7 @@
GST_DEBUG_CATEGORY_STATIC (gst_d3d11_allocator_debug); GST_DEBUG_CATEGORY_STATIC (gst_d3d11_allocator_debug);
#define GST_CAT_DEFAULT gst_d3d11_allocator_debug #define GST_CAT_DEFAULT gst_d3d11_allocator_debug
static GstAllocator *_d3d11_memory_allocator; static GstD3D11Allocator *_d3d11_memory_allocator;
GType GType
gst_d3d11_allocation_flags_get_type (void) gst_d3d11_allocation_flags_get_type (void)
@ -652,10 +652,12 @@ gst_d3d11_memory_init_once (void)
"Direct3D11 Texture Allocator"); "Direct3D11 Texture Allocator");
_d3d11_memory_allocator = _d3d11_memory_allocator =
(GstAllocator *) g_object_new (GST_TYPE_D3D11_ALLOCATOR, NULL); (GstD3D11Allocator *) g_object_new (GST_TYPE_D3D11_ALLOCATOR, NULL);
gst_object_ref_sink (_d3d11_memory_allocator); gst_object_ref_sink (_d3d11_memory_allocator);
gst_object_ref (_d3d11_memory_allocator);
gst_allocator_register (GST_D3D11_MEMORY_NAME, _d3d11_memory_allocator); gst_allocator_register (GST_D3D11_MEMORY_NAME,
GST_ALLOCATOR_CAST (_d3d11_memory_allocator));
} GST_D3D11_CALL_ONCE_END; } GST_D3D11_CALL_ONCE_END;
} }
@ -1600,8 +1602,8 @@ gst_d3d11_allocator_alloc_internal (GstD3D11Allocator * self,
/** /**
* gst_d3d11_allocator_alloc: * gst_d3d11_allocator_alloc:
* @allocator: a #GstD3D11Allocator * @allocator: (transfer none) (allow-none): a #GstD3D11Allocator
* @device: a #GstD3D11Device * @device: (transfer none): a #GstD3D11Device
* @desc: a D3D11_TEXTURE2D_DESC struct * @desc: a D3D11_TEXTURE2D_DESC struct
* *
* Returns: a newly allocated #GstD3D11Memory with given parameters. * Returns: a newly allocated #GstD3D11Memory with given parameters.
@ -1614,6 +1616,11 @@ gst_d3d11_allocator_alloc (GstD3D11Allocator * allocator,
{ {
GstMemory *mem; GstMemory *mem;
if (!allocator) {
gst_d3d11_memory_init_once ();
allocator = _d3d11_memory_allocator;
}
g_return_val_if_fail (GST_IS_D3D11_ALLOCATOR (allocator), NULL); g_return_val_if_fail (GST_IS_D3D11_ALLOCATOR (allocator), NULL);
g_return_val_if_fail (GST_IS_D3D11_DEVICE (device), NULL); g_return_val_if_fail (GST_IS_D3D11_DEVICE (device), NULL);
g_return_val_if_fail (desc != NULL, NULL); g_return_val_if_fail (desc != NULL, NULL);
@ -1633,8 +1640,8 @@ gst_d3d11_allocator_alloc (GstD3D11Allocator * allocator,
/** /**
* gst_d3d11_allocator_alloc_buffer: * gst_d3d11_allocator_alloc_buffer:
* @allocator: a #GstD3D11Allocator * @allocator: (transfer none) (allow-none): a #GstD3D11Allocator
* @device: a #GstD3D11Device * @device: (transfer none): a #GstD3D11Device
* @desc: a D3D11_BUFFER_DESC struct * @desc: a D3D11_BUFFER_DESC struct
* *
* Returns: a newly allocated #GstD3D11Memory with given parameters. * Returns: a newly allocated #GstD3D11Memory with given parameters.
@ -1650,6 +1657,11 @@ gst_d3d11_allocator_alloc_buffer (GstD3D11Allocator * allocator,
ID3D11Device *device_handle; ID3D11Device *device_handle;
HRESULT hr; HRESULT hr;
if (!allocator) {
gst_d3d11_memory_init_once ();
allocator = _d3d11_memory_allocator;
}
g_return_val_if_fail (GST_IS_D3D11_ALLOCATOR (allocator), nullptr); g_return_val_if_fail (GST_IS_D3D11_ALLOCATOR (allocator), nullptr);
g_return_val_if_fail (GST_IS_D3D11_DEVICE (device), nullptr); g_return_val_if_fail (GST_IS_D3D11_DEVICE (device), nullptr);
g_return_val_if_fail (desc != nullptr, nullptr); g_return_val_if_fail (desc != nullptr, nullptr);
@ -1686,8 +1698,8 @@ gst_d3d11_allocator_alloc_buffer (GstD3D11Allocator * allocator,
/** /**
* gst_d3d11_allocator_alloc_wrapped: * gst_d3d11_allocator_alloc_wrapped:
* @allocator: a #GstD3D11Allocator * @allocator: (transfer none) (allow-none): a #GstD3D11Allocator
* @device: a #GstD3D11Device * @device: (transfer none): a #GstD3D11Device
* @texture: a ID3D11Texture2D * @texture: a ID3D11Texture2D
* @size: CPU accessible memory size * @size: CPU accessible memory size
* @user_data: (allow-none): user data * @user_data: (allow-none): user data
@ -1721,6 +1733,11 @@ gst_d3d11_allocator_alloc_wrapped (GstD3D11Allocator * allocator,
ID3D11Texture2D *tex = nullptr; ID3D11Texture2D *tex = nullptr;
HRESULT hr; HRESULT hr;
if (!allocator) {
gst_d3d11_memory_init_once ();
allocator = _d3d11_memory_allocator;
}
g_return_val_if_fail (GST_IS_D3D11_ALLOCATOR (allocator), nullptr); g_return_val_if_fail (GST_IS_D3D11_ALLOCATOR (allocator), nullptr);
g_return_val_if_fail (GST_IS_D3D11_DEVICE (device), nullptr); g_return_val_if_fail (GST_IS_D3D11_DEVICE (device), nullptr);
g_return_val_if_fail (texture != nullptr, nullptr); g_return_val_if_fail (texture != nullptr, nullptr);
@ -1926,9 +1943,8 @@ gst_d3d11_pool_allocator_start (GstD3D11PoolAllocator * self)
GstMemory *mem; GstMemory *mem;
priv->texture->AddRef (); priv->texture->AddRef ();
mem = mem = gst_d3d11_allocator_alloc_wrapped_internal (_d3d11_memory_allocator,
gst_d3d11_allocator_alloc_wrapped_internal (GST_D3D11_ALLOCATOR_CAST self->device, &priv->desc, priv->texture);
(_d3d11_memory_allocator), self->device, &priv->desc, priv->texture);
if (i == 0) { if (i == 0) {
if (!gst_d3d11_memory_update_size (mem)) { if (!gst_d3d11_memory_update_size (mem)) {
@ -2187,9 +2203,8 @@ gst_d3d11_pool_allocator_alloc (GstD3D11PoolAllocator * self, GstMemory ** mem)
/* increment the allocation counter */ /* increment the allocation counter */
g_atomic_int_add (&priv->cur_mems, 1); g_atomic_int_add (&priv->cur_mems, 1);
new_mem = new_mem = gst_d3d11_allocator_alloc_internal (_d3d11_memory_allocator,
gst_d3d11_allocator_alloc_internal (GST_D3D11_ALLOCATOR_CAST self->device, &priv->desc, nullptr);
(_d3d11_memory_allocator), self->device, &priv->desc, nullptr);
if (!new_mem) { if (!new_mem) {
GST_ERROR_OBJECT (self, "Failed to allocate new memory"); GST_ERROR_OBJECT (self, "Failed to allocate new memory");
g_atomic_int_add (&priv->cur_mems, -1); g_atomic_int_add (&priv->cur_mems, -1);