Return specific error on CUDA OOM

ad-astra-video · Feb 25, 2024 · 57ff63c · 57ff63c
1 parent 002167b
commit 57ff63c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/libavutil/cuda_check.h b/libavutil/cuda_check.h
@@ -22,6 +22,11 @@
 
 #include "compat/cuda/dynlink_loader.h"
 #include "error.h"
+/*
+ * Defined in the driver API
+ * https://docs.nvidia.com/cuda/cuda-driver-api/group__CUDA__TYPES.html
+ */
+#define CUDA_ERROR_OUT_OF_MEMORY 2
 
 typedef CUresult CUDAAPI cuda_check_GetErrorName(CUresult error, const char** pstr);
 typedef CUresult CUDAAPI cuda_check_GetErrorString(CUresult error, const char** pstr);
@@ -49,6 +54,9 @@ static inline int ff_cuda_check(void *avctx,
         av_log(avctx, AV_LOG_ERROR, " -> %s: %s", err_name, err_string);
     av_log(avctx, AV_LOG_ERROR, "\n");
 
+    if (err == CUDA_ERROR_OUT_OF_MEMORY)
+        return AVERROR(ENOMEM);
+
     return AVERROR_EXTERNAL;
 }
 

diff --git a/libavutil/hwcontext_cuda.c b/libavutil/hwcontext_cuda.c
@@ -456,7 +456,8 @@ static int cuda_device_create(AVHWDeviceContext *device_ctx,
 
     ret = cuda_context_init(device_ctx, flags);
     if (ret < 0) {
-        ret = AVERROR_UNKNOWN;
+        if (ret == AVERROR_EXTERNAL)
+            ret = AVERROR_UNKNOWN;
         goto error;
     }