diff options
author | Timo Rothenpieler <timo@rothenpieler.org> | 2016-05-11 10:34:31 +0200 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2016-05-19 14:17:03 +0200 |
commit | cea1fb854c26a1d8c8857ec94adeb8a19beb5004 (patch) | |
tree | 0076caacfc2d4b9423cf74d5bd89d75c618d6c67 | |
parent | a1e215ea0157360261e856eea2cd468136a68da0 (diff) |
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 <anton@khirnov.net>
-rw-r--r-- | libavcodec/nvenc.c | 13 |
1 files changed, 13 insertions, 0 deletions
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; |