From ab0ef1abdf53e257f7628f2d264adc80038f3bcb Mon Sep 17 00:00:00 2001 From: Timo Rothenpieler Date: Fri, 27 Sep 2019 19:09:11 +0200 Subject: [PATCH] avcodec/nvenc: make use of new GetLastErrorString function Signed-off-by: Timo Rothenpieler --- libavcodec/nvenc.c | 18 ++++++++++++++---- libavcodec/nvenc.h | 1 + 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 2de2bfdacb..bbb43ddad8 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -110,13 +110,23 @@ static int nvenc_map_error(NVENCSTATUS err, const char **desc) return AVERROR_UNKNOWN; } -static int nvenc_print_error(void *log_ctx, NVENCSTATUS err, +static int nvenc_print_error(AVCodecContext *avctx, NVENCSTATUS err, const char *error_string) { const char *desc; - int ret; - ret = nvenc_map_error(err, &desc); - av_log(log_ctx, AV_LOG_ERROR, "%s: %s (%d)\n", error_string, desc, err); + const char *details = "(no details)"; + int ret = nvenc_map_error(err, &desc); + +#ifdef NVENC_HAVE_GETLASTERRORSTRING + NvencContext *ctx = avctx->priv_data; + NV_ENCODE_API_FUNCTION_LIST *p_nvenc = &ctx->nvenc_dload_funcs.nvenc_funcs; + + if (p_nvenc && ctx->nvencoder) + details = p_nvenc->nvEncGetLastErrorString(ctx->nvencoder); +#endif + + av_log(avctx, AV_LOG_ERROR, "%s: %s (%d): %s\n", error_string, desc, err, details); + return ret; } diff --git a/libavcodec/nvenc.h b/libavcodec/nvenc.h index cdba998ffd..a269bd97bb 100644 --- a/libavcodec/nvenc.h +++ b/libavcodec/nvenc.h @@ -58,6 +58,7 @@ typedef void ID3D11Device; #if NVENCAPI_CHECK_VERSION(9, 1) #define NVENC_HAVE_MULTIPLE_REF_FRAMES #define NVENC_HAVE_CUSTREAM_PTR +#define NVENC_HAVE_GETLASTERRORSTRING #endif typedef struct NvencSurface