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

cuda: Report device open error

Browse source 
Call gst_cuda_result() with CUDA_ERROR_NO_DEVICE error code if
we could not open device, so that application can catch the error

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6006>
This commit is contained in:
Seungha Yang 2024-01-29 23:25:35 +09:00 committed by GStreamer Marge Bot
parent cd6d62ddf0
commit 51162acc31
5 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
girs/CudaGst-1.0.gir
View file

@ -489,6 +489,8 @@ and/or use gtk-doc annotations. -->
<source-position filename="../subprojects/gst-plugins-bad/gst-libs/gst/cuda/stub/cuda.h"/> <source-position filename="../subprojects/gst-plugins-bad/gst-libs/gst/cuda/stub/cuda.h"/>
<member name="success" value="0" c:identifier="CUDA_SUCCESS"> <member name="success" value="0" c:identifier="CUDA_SUCCESS">
</member> </member>
<member name="error_no_device" value="100" c:identifier="CUDA_ERROR_NO_DEVICE">
</member>
<member name="error_already_mapped" value="208" c:identifier="CUDA_ERROR_ALREADY_MAPPED"> <member name="error_already_mapped" value="208" c:identifier="CUDA_ERROR_ALREADY_MAPPED">
</member> </member>
<member name="error_not_supported" value="801" c:identifier="CUDA_ERROR_NOT_SUPPORTED"> <member name="error_not_supported" value="801" c:identifier="CUDA_ERROR_NOT_SUPPORTED">

1
subprojects/gst-plugins-bad/gst-libs/gst/cuda/stub/cuda.h
View file

@ -39,6 +39,7 @@ typedef gint CUdevice;
typedef enum typedef enum
{ {
CUDA_SUCCESS = 0, CUDA_SUCCESS = 0,
CUDA_ERROR_NO_DEVICE = 100,
CUDA_ERROR_ALREADY_MAPPED = 208, CUDA_ERROR_ALREADY_MAPPED = 208,
CUDA_ERROR_NOT_SUPPORTED = 801, CUDA_ERROR_NOT_SUPPORTED = 801,
} CUresult; } CUresult;

8
subprojects/gst-plugins-bad/sys/nvcodec/gstnvbaseenc.c
View file

@ -460,7 +460,13 @@ gst_nv_base_enc_open_encode_session (GstNvBaseEnc * nvenc)
params.deviceType = NV_ENC_DEVICE_TYPE_CUDA; params.deviceType = NV_ENC_DEVICE_TYPE_CUDA;
nv_ret = NvEncOpenEncodeSessionEx (&params, &nvenc->encoder); nv_ret = NvEncOpenEncodeSessionEx (&params, &nvenc->encoder);
return nv_ret == NV_ENC_SUCCESS; if (nv_ret != NV_ENC_SUCCESS) {
/* Report error to abort if GST_CUDA_CRITICAL_ERRORS is configured */
gst_cuda_result (CUDA_ERROR_NO_DEVICE);
return FALSE;
}
return TRUE;
} }
static gboolean static gboolean

2
subprojects/gst-plugins-bad/sys/nvcodec/gstnvencobject.cpp
View file

@ -173,6 +173,8 @@ GstNvEncObject::CreateInstance (GstElement * client, GstObject * device,
status = NvEncOpenEncodeSessionEx (params, &session); status = NvEncOpenEncodeSessionEx (params, &session);
if (!NVENC_IS_SUCCESS (status, nullptr)) { if (!NVENC_IS_SUCCESS (status, nullptr)) {
GST_ERROR_OBJECT (device, "NvEncOpenEncodeSessionEx failed"); GST_ERROR_OBJECT (device, "NvEncOpenEncodeSessionEx failed");
/* Report error to abort if GST_CUDA_CRITICAL_ERRORS is configured */
gst_cuda_result (CUDA_ERROR_NO_DEVICE);
return nullptr; return nullptr;
} }

3
subprojects/gst-plugins-bad/sys/nvcodec/plugin.c
View file

@ -121,6 +121,9 @@ plugin_init (GstPlugin * plugin)
CuGetErrorString (cuda_ret, &err_desc); CuGetErrorString (cuda_ret, &err_desc);
GST_ERROR ("Failed to init cuda, cuInit ret: 0x%x: %s: %s", GST_ERROR ("Failed to init cuda, cuInit ret: 0x%x: %s: %s",
(int) cuda_ret, err_name, err_desc); (int) cuda_ret, err_name, err_desc);
/* to abort if GST_CUDA_CRITICAL_ERRORS is configured */
gst_cuda_result (CUDA_ERROR_NO_DEVICE);
return TRUE; return TRUE;
} }