FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

d3d11: Selected adapter index should be unsigned integer

Browse Source 
If d3d11device was created successfully, the index of adapter
must not be negative value

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1507>
This commit is contained in:
Seungha Yang 2020-08-12 17:02:31 +09:00 committed by GStreamer Merge Bot
parent 76b4de79ca
commit ff9157eef4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/d3d11/gstd3d11utils.c
View File

@ -73,7 +73,7 @@ gst_d3d11_handle_set_context (GstElement * element, GstContext * context,
if (g_strcmp0 (context_type, GST_D3D11_DEVICE_HANDLE_CONTEXT_TYPE) == 0) { if (g_strcmp0 (context_type, GST_D3D11_DEVICE_HANDLE_CONTEXT_TYPE) == 0) {
const GstStructure *str; const GstStructure *str;
GstD3D11Device *other_device = NULL; GstD3D11Device *other_device = NULL;
gint other_adapter = 0; guint other_adapter = 0;
/* If we had device already, will not replace it */ /* If we had device already, will not replace it */
if (*device) if (*device)
@ -82,8 +82,8 @@ gst_d3d11_handle_set_context (GstElement * element, GstContext * context,
str = gst_context_get_structure (context); str = gst_context_get_structure (context);
if (gst_structure_get (str, "device", GST_TYPE_D3D11_DEVICE, if (gst_structure_get (str, "device", GST_TYPE_D3D11_DEVICE,
&other_device, "adapter", G_TYPE_INT, &other_adapter, NULL)) { &other_device, "adapter", G_TYPE_UINT, &other_adapter, NULL)) {
if (adapter == -1 || adapter == other_adapter) { if (adapter == -1 || (guint) adapter == other_adapter) {
GST_CAT_DEBUG_OBJECT (GST_CAT_CONTEXT, GST_CAT_DEBUG_OBJECT (GST_CAT_CONTEXT,
element, "Found D3D11 device context"); element, "Found D3D11 device context");
*device = other_device; *device = other_device;
@ -102,7 +102,7 @@ static void
context_set_d3d11_device (GstContext * context, GstD3D11Device * device) context_set_d3d11_device (GstContext * context, GstD3D11Device * device)
{ {
GstStructure *s; GstStructure *s;
gint adapter; guint adapter;
g_return_if_fail (context != NULL); g_return_if_fail (context != NULL);
@ -115,7 +115,7 @@ context_set_d3d11_device (GstContext * context, GstD3D11Device * device)
s = gst_context_writable_structure (context); s = gst_context_writable_structure (context);
gst_structure_set (s, "device", GST_TYPE_D3D11_DEVICE, gst_structure_set (s, "device", GST_TYPE_D3D11_DEVICE,
device, "adapter", G_TYPE_INT, adapter, NULL); device, "adapter", G_TYPE_UINT, adapter, NULL);
} }
/** /**