diff options
| -rw-r--r-- | libavcodec/nvenc.c | 25 | ||||
| -rw-r--r-- | libavcodec/nvenc.h | 2 | ||||
| -rw-r--r-- | libavcodec/nvenc_h264.c | 2 | ||||
| -rw-r--r-- | libavcodec/nvenc_hevc.c | 2 |
4 files changed, 30 insertions, 1 deletions
diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 41963e4d21..ff7c9d6542 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -529,8 +529,21 @@ static int nvenc_check_capabilities(AVCodecContext *avctx) } #endif +#ifdef NVENC_HAVE_SINGLE_SLICE_INTRA_REFRESH + ret = nvenc_check_cap(avctx, NV_ENC_CAPS_SINGLE_SLICE_INTRA_REFRESH); + if(ctx->single_slice_intra_refresh && ret <= 0) { + av_log(avctx, AV_LOG_WARNING, "Single slice intra refresh not supported by the device\n"); + return AVERROR(ENOSYS); + } +#else + if(ctx->single_slice_intra_refresh) { + av_log(avctx, AV_LOG_WARNING, "Single slice intra refresh needs SDK 11.1 at build time\n"); + return AVERROR(ENOSYS); + } +#endif + ret = nvenc_check_cap(avctx, NV_ENC_CAPS_SUPPORT_INTRA_REFRESH); - if(ctx->intra_refresh && ret <= 0) { + if((ctx->intra_refresh || ctx->single_slice_intra_refresh) && ret <= 0) { av_log(avctx, AV_LOG_WARNING, "Intra refresh not supported by the device\n"); return AVERROR(ENOSYS); } @@ -1086,6 +1099,9 @@ static av_cold int nvenc_setup_h264_config(AVCodecContext *avctx) h264->enableIntraRefresh = 1; h264->intraRefreshPeriod = avctx->gop_size; h264->intraRefreshCnt = avctx->gop_size - 1; +#ifdef NVENC_HAVE_SINGLE_SLICE_INTRA_REFRESH + h264->singleSliceIntraRefresh = ctx->single_slice_intra_refresh; +#endif } h264->disableSPSPPS = (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) ? 1 : 0; @@ -1192,6 +1208,9 @@ static av_cold int nvenc_setup_hevc_config(AVCodecContext *avctx) hevc->enableIntraRefresh = 1; hevc->intraRefreshPeriod = avctx->gop_size; hevc->intraRefreshCnt = avctx->gop_size - 1; +#ifdef NVENC_HAVE_SINGLE_SLICE_INTRA_REFRESH + hevc->singleSliceIntraRefresh = ctx->single_slice_intra_refresh; +#endif } hevc->disableSPSPPS = (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) ? 1 : 0; @@ -1391,6 +1410,10 @@ static av_cold int nvenc_setup_encoder(AVCodecContext *avctx) ctx->encode_config.gopLength = 1; } + /* force to enable intra refresh */ + if(ctx->single_slice_intra_refresh) + ctx->intra_refresh = 1; + if (ctx->intra_refresh) ctx->encode_config.gopLength = NVENC_INFINITE_GOPLENGTH; diff --git a/libavcodec/nvenc.h b/libavcodec/nvenc.h index e7cc0e6ba0..1e756a6f72 100644 --- a/libavcodec/nvenc.h +++ b/libavcodec/nvenc.h @@ -73,6 +73,7 @@ typedef void ID3D11Device; // SDK 11.1 compile time feature checks #if NVENCAPI_CHECK_VERSION(11, 1) #define NVENC_HAVE_QP_CHROMA_OFFSETS +#define NVENC_HAVE_SINGLE_SLICE_INTRA_REFRESH #endif typedef struct NvencSurface @@ -231,6 +232,7 @@ typedef struct NvencContext int ldkfs; int extra_sei; int intra_refresh; + int single_slice_intra_refresh; } NvencContext; int ff_nvenc_encode_init(AVCodecContext *avctx); diff --git a/libavcodec/nvenc_h264.c b/libavcodec/nvenc_h264.c index f00755530e..ab5263368e 100644 --- a/libavcodec/nvenc_h264.c +++ b/libavcodec/nvenc_h264.c @@ -190,6 +190,8 @@ static const AVOption options[] = { OFFSET(extra_sei), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, VE }, { "intra-refresh","Use Periodic Intra Refresh instead of IDR frames", OFFSET(intra_refresh),AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, + { "single-slice-intra-refresh", "Use single slice intra refresh", + OFFSET(single_slice_intra_refresh), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { NULL } }; diff --git a/libavcodec/nvenc_hevc.c b/libavcodec/nvenc_hevc.c index efddd990e4..d8cfeca7a9 100644 --- a/libavcodec/nvenc_hevc.c +++ b/libavcodec/nvenc_hevc.c @@ -171,6 +171,8 @@ static const AVOption options[] = { OFFSET(extra_sei), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, VE }, { "intra-refresh","Use Periodic Intra Refresh instead of IDR frames", OFFSET(intra_refresh),AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, + { "single-slice-intra-refresh", "Use single slice intra refresh", + OFFSET(single_slice_intra_refresh), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { NULL } }; |