diff options
| author | Timo Rothenpieler <timo@rothenpieler.org> | 2017-02-13 22:59:46 +0100 |
|---|---|---|
| committer | Timo Rothenpieler <timo@rothenpieler.org> | 2017-02-14 11:24:13 +0100 |
| commit | be74ba648cf4063c9805ebe95ee83fd7299f7fd5 (patch) | |
| tree | 5a7b8006abcb4b3736b45e8aa599db5e61264f80 /libavcodec | |
| parent | 965503d3543c10d4dbbb3ae21e52296453e13b69 (diff) | |
| download | ffmpeg-be74ba648cf4063c9805ebe95ee83fd7299f7fd5.tar.gz | |
avcodec/nvenc: push cuda context before encoding a frame
Thanks to Miroslav Slugeň for figuring out what was going on here.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/nvenc.c | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 51e794e76b..ba2647b10a 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -1649,6 +1649,8 @@ int ff_nvenc_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFrame *frame, int *got_packet) { NVENCSTATUS nv_status; + CUresult cu_res; + CUcontext dummy; NvencSurface *tmpoutsurf, *inSurf; int res; @@ -1666,7 +1668,20 @@ int ff_nvenc_encode_frame(AVCodecContext *avctx, AVPacket *pkt, return AVERROR_BUG; } + cu_res = dl_fn->cuda_dl->cuCtxPushCurrent(ctx->cu_context); + if (cu_res != CUDA_SUCCESS) { + av_log(avctx, AV_LOG_ERROR, "cuCtxPushCurrent failed\n"); + return AVERROR_EXTERNAL; + } + res = nvenc_upload_frame(avctx, frame, inSurf); + + cu_res = dl_fn->cuda_dl->cuCtxPopCurrent(&dummy); + if (cu_res != CUDA_SUCCESS) { + av_log(avctx, AV_LOG_ERROR, "cuCtxPopCurrent failed\n"); + return AVERROR_EXTERNAL; + } + if (res) { inSurf->lockCount = 0; return res; @@ -1702,7 +1717,20 @@ int ff_nvenc_encode_frame(AVCodecContext *avctx, AVPacket *pkt, pic_params.encodePicFlags = NV_ENC_PIC_FLAG_EOS; } + cu_res = dl_fn->cuda_dl->cuCtxPushCurrent(ctx->cu_context); + if (cu_res != CUDA_SUCCESS) { + av_log(avctx, AV_LOG_ERROR, "cuCtxPushCurrent failed\n"); + return AVERROR_EXTERNAL; + } + nv_status = p_nvenc->nvEncEncodePicture(ctx->nvencoder, &pic_params); + + cu_res = dl_fn->cuda_dl->cuCtxPopCurrent(&dummy); + if (cu_res != CUDA_SUCCESS) { + av_log(avctx, AV_LOG_ERROR, "cuCtxPopCurrent failed\n"); + return AVERROR_EXTERNAL; + } + if (nv_status != NV_ENC_SUCCESS && nv_status != NV_ENC_ERR_NEED_MORE_INPUT) return nvenc_print_error(avctx, nv_status, "EncodePicture failed!"); |