har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avutil/hwcontext_cuda: add option to use current device context

Browse Source 
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
This commit is contained in:
Roman Arzumanyan 2023-09-12 17:31:30 +03:00 committed by Timo Rothenpieler
parent 48fc414c7c
commit 05f8b2ca0f
5 changed files with 41 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure vendored
View File

@ -6577,10 +6577,11 @@ fi
if ! disabled ffnvcodec; then if ! disabled ffnvcodec; then
ffnv_hdr_list="ffnvcodec/nvEncodeAPI.h ffnvcodec/dynlink_cuda.h ffnvcodec/dynlink_cuviddec.h ffnvcodec/dynlink_nvcuvid.h" ffnv_hdr_list="ffnvcodec/nvEncodeAPI.h ffnvcodec/dynlink_cuda.h ffnvcodec/dynlink_cuviddec.h ffnvcodec/dynlink_nvcuvid.h"
check_pkg_config ffnvcodec "ffnvcodec >= 12.0.16.0" "$ffnv_hdr_list" "" || \ check_pkg_config ffnvcodec "ffnvcodec >= 12.1.14.0" "$ffnv_hdr_list" "" || \
check_pkg_config ffnvcodec "ffnvcodec >= 11.1.5.2 ffnvcodec < 12.0" "$ffnv_hdr_list" "" || \ check_pkg_config ffnvcodec "ffnvcodec >= 12.0.16.1 ffnvcodec < 12.1" "$ffnv_hdr_list" "" || \
check_pkg_config ffnvcodec "ffnvcodec >= 11.0.10.2 ffnvcodec < 11.1" "$ffnv_hdr_list" "" || \ check_pkg_config ffnvcodec "ffnvcodec >= 11.1.5.3 ffnvcodec < 12.0" "$ffnv_hdr_list" "" || \
check_pkg_config ffnvcodec "ffnvcodec >= 8.1.24.14 ffnvcodec < 8.2" "$ffnv_hdr_list" "" check_pkg_config ffnvcodec "ffnvcodec >= 11.0.10.3 ffnvcodec < 11.1" "$ffnv_hdr_list" "" || \
check_pkg_config ffnvcodec "ffnvcodec >= 8.1.24.15 ffnvcodec < 8.2" "$ffnv_hdr_list" ""
fi fi
if enabled_all libglslang libshaderc; then if enabled_all libglslang libshaderc; then

3
doc/APIchanges
View File

@ -2,6 +2,9 @@ The last version increases of all libraries were on 2023-02-09
API changes, most recent first: API changes, most recent first:
2023-09-28 - xxxxxxxxxx - lavu 58.26.100 - hwcontext_cuda.h
Add AV_CUDA_USE_CURRENT_CONTEXT.
2023-09-19 - xxxxxxxxxx - lavu 58.25.100 - avutil.h 2023-09-19 - xxxxxxxxxx - lavu 58.25.100 - avutil.h
Make AV_TIME_BASE_Q compatible with C++. Make AV_TIME_BASE_Q compatible with C++.

28
libavutil/hwcontext_cuda.c
View File

@ -361,6 +361,11 @@ static int cuda_context_init(AVHWDeviceContext *device_ctx, int flags) {
hwctx->internal->cuda_device)); hwctx->internal->cuda_device));
if (ret < 0) if (ret < 0)
return ret; return ret;
} else if (flags & AV_CUDA_USE_CURRENT_CONTEXT) {
ret = CHECK_CU(cu->cuCtxGetCurrent(&hwctx->cuda_ctx));
if (ret < 0)
return ret;
av_log(device_ctx, AV_LOG_INFO, "Using current CUDA context.\n");
} else { } else {
ret = CHECK_CU(cu->cuCtxCreate(&hwctx->cuda_ctx, desired_flags, ret = CHECK_CU(cu->cuCtxCreate(&hwctx->cuda_ctx, desired_flags,
hwctx->internal->cuda_device)); hwctx->internal->cuda_device));
@ -382,8 +387,21 @@ static int cuda_flags_from_opts(AVHWDeviceContext *device_ctx,
AVDictionary *opts, int *flags) AVDictionary *opts, int *flags)
{ {
AVDictionaryEntry *primary_ctx_opt = av_dict_get(opts, "primary_ctx", NULL, 0); AVDictionaryEntry *primary_ctx_opt = av_dict_get(opts, "primary_ctx", NULL, 0);
AVDictionaryEntry *current_ctx_opt = av_dict_get(opts, "current_ctx", NULL, 0);
if (primary_ctx_opt && strtol(primary_ctx_opt->value, NULL, 10)) { int use_primary_ctx = 0, use_current_ctx = 0;
if (primary_ctx_opt)
use_primary_ctx = strtol(primary_ctx_opt->value, NULL, 10);
if (current_ctx_opt)
use_current_ctx = strtol(current_ctx_opt->value, NULL, 10);
if (use_primary_ctx && use_current_ctx) {
av_log(device_ctx, AV_LOG_ERROR, "Requested both primary and current CUDA context simultaneously.\n");
return AVERROR(EINVAL);
}
if (primary_ctx_opt && use_primary_ctx) {
av_log(device_ctx, AV_LOG_VERBOSE, "Using CUDA primary device context\n"); av_log(device_ctx, AV_LOG_VERBOSE, "Using CUDA primary device context\n");
*flags |= AV_CUDA_USE_PRIMARY_CONTEXT; *flags |= AV_CUDA_USE_PRIMARY_CONTEXT;
} else if (primary_ctx_opt) { } else if (primary_ctx_opt) {
@ -391,6 +409,14 @@ static int cuda_flags_from_opts(AVHWDeviceContext *device_ctx,
*flags &= ~AV_CUDA_USE_PRIMARY_CONTEXT; *flags &= ~AV_CUDA_USE_PRIMARY_CONTEXT;
} }
if (current_ctx_opt && use_current_ctx) {
av_log(device_ctx, AV_LOG_VERBOSE, "Using CUDA current device context\n");
*flags |= AV_CUDA_USE_CURRENT_CONTEXT;
} else if (current_ctx_opt) {
av_log(device_ctx, AV_LOG_VERBOSE, "Disabling use of CUDA current device context\n");
*flags &= ~AV_CUDA_USE_CURRENT_CONTEXT;
}
return 0; return 0;
} }

5
libavutil/hwcontext_cuda.h
View File

@ -62,6 +62,11 @@ typedef struct AVCUDADeviceContext {
*/ */
#define AV_CUDA_USE_PRIMARY_CONTEXT (1 << 0) #define AV_CUDA_USE_PRIMARY_CONTEXT (1 << 0)
/**
* Use current device context instead of creating a new one.
*/
#define AV_CUDA_USE_CURRENT_CONTEXT (1 << 1)
/** /**
* @} * @}
*/ */

2
libavutil/version.h
View File

@ -79,7 +79,7 @@
*/ */
#define LIBAVUTIL_VERSION_MAJOR 58 #define LIBAVUTIL_VERSION_MAJOR 58
#define LIBAVUTIL_VERSION_MINOR 25 #define LIBAVUTIL_VERSION_MINOR 26
#define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_MICRO 100
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \