From cea1fb854c26a1d8c8857ec94adeb8a19beb5004 Mon Sep 17 00:00:00 2001 From: Timo Rothenpieler Date: Wed, 11 May 2016 10:34:31 +0200 Subject: nvenc: Generate bufferingPeriod/pictureTiming SEI For some unknown reason enabling these causes proper CBR padding, so as there are no known downsides just always enable them in CBR mode. Signed-off-by: Anton Khirnov --- libavcodec/nvenc.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index bd704a76ad..283a71c294 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -57,6 +57,9 @@ #define NVENC_CAP 0x30 #define BITSTREAM_BUFFER_SIZE 1024 * 1024 +#define IS_CBR(rc) (rc == NV_ENC_PARAMS_RC_CBR || \ + rc == NV_ENC_PARAMS_RC_2_PASS_QUALITY || \ + rc == NV_ENC_PARAMS_RC_2_PASS_FRAMESIZE_CAP) #define LOAD_LIBRARY(l, path) \ do { \ @@ -604,6 +607,11 @@ static int nvenc_setup_h264_config(AVCodecContext *avctx) if (ctx->flags & NVENC_LOSSLESS) h264->qpPrimeYZeroTransformBypassFlag = 1; + if (IS_CBR(cc->rcParams.rateControlMode)) { + h264->outputBufferingPeriodSEI = 1; + h264->outputPictureTimingSEI = 1; + } + if (ctx->profile) avctx->profile = ctx->profile; @@ -648,6 +656,11 @@ static int nvenc_setup_hevc_config(AVCodecContext *avctx) hevc->maxNumRefFramesInDPB = avctx->refs; hevc->idrPeriod = cc->gopLength; + if (IS_CBR(cc->rcParams.rateControlMode)) { + hevc->outputBufferingPeriodSEI = 1; + hevc->outputPictureTimingSEI = 1; + } + /* No other profile is supported in the current SDK version 5 */ cc->profileGUID = NV_ENC_HEVC_PROFILE_MAIN_GUID; avctx->profile = FF_PROFILE_HEVC_MAIN; -- cgit v1.2.3