mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

d3d11memory: Move to GArray to store texture-array status

Browse source 
The size D3D11_REQ_TEXTURE2D_ARRAY_AXIS_DIMENSION is 2048
which is too large in practice especially for a texture
of dpb

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1712>
This commit is contained in:
Seungha Yang 2020-10-04 23:39:05 +09:00
parent bcd43acd42
commit 04376397eb
1 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
sys/d3d11/gstd3d11memory.c
View file

@ -184,9 +184,9 @@ G_DEFINE_BOXED_TYPE_WITH_CODE (GstD3D11AllocationParams,
struct _GstD3D11AllocatorPrivate struct _GstD3D11AllocatorPrivate
{ {
/* parent textrure when array typed memory is used */ /* parent texture when array typed memory is used */
ID3D11Texture2D *texture; ID3D11Texture2D *texture;
guint8 array_in_use[D3D11_REQ_TEXTURE2D_ARRAY_AXIS_DIMENSION]; GArray *array_in_use;
GMutex lock; GMutex lock;
GCond cond; GCond cond;
@ -440,10 +440,12 @@ gst_d3d11_allocator_free (GstAllocator * allocator, GstMemory * mem)
GstD3D11Memory *dmem = (GstD3D11Memory *) mem; GstD3D11Memory *dmem = (GstD3D11Memory *) mem;
gint i; gint i;
g_mutex_lock (&priv->lock); if (priv->array_in_use) {
priv->array_in_use[dmem->subresource_index] = 0; g_mutex_lock (&priv->lock);
g_cond_broadcast (&priv->cond); g_array_index (priv->array_in_use, guint8, dmem->subresource_index) = 0;
g_mutex_unlock (&priv->lock); g_cond_broadcast (&priv->cond);
g_mutex_unlock (&priv->lock);
}
for (i = 0; i < GST_VIDEO_MAX_PLANES; i++) { for (i = 0; i < GST_VIDEO_MAX_PLANES; i++) {
if (dmem->render_target_view[i]) if (dmem->render_target_view[i])
@ -492,6 +494,8 @@ gst_d3d11_allocator_finalize (GObject * object)
g_mutex_clear (&priv->lock); g_mutex_clear (&priv->lock);
g_cond_clear (&priv->cond); g_cond_clear (&priv->cond);
g_clear_pointer (&priv->array_in_use, g_array_unref);
G_OBJECT_CLASS (parent_class)->finalize (object); G_OBJECT_CLASS (parent_class)->finalize (object);
} }
@ -762,8 +766,14 @@ gst_d3d11_allocator_alloc (GstD3D11Allocator * allocator,
return NULL; return NULL;
} }
if (!priv->array_in_use) {
priv->array_in_use = g_array_sized_new (FALSE,
TRUE, sizeof (guint8), desc->ArraySize);
g_array_set_size (priv->array_in_use, desc->ArraySize);
}
for (i = 0; i < desc->ArraySize; i++) { for (i = 0; i < desc->ArraySize; i++) {
if (priv->array_in_use[i] == 0) { if (!g_array_index (priv->array_in_use, guint8, i)) {
index_to_use = i; index_to_use = i;
break; break;
} }
@ -776,7 +786,7 @@ gst_d3d11_allocator_alloc (GstD3D11Allocator * allocator,
goto do_again; goto do_again;
} }
priv->array_in_use[index_to_use] = 1; g_array_index (priv->array_in_use, guint8, index_to_use) = 1;
g_mutex_unlock (&priv->lock); g_mutex_unlock (&priv->lock);