Commit cea1fb85 authored by Timo Rothenpieler's avatar Timo Rothenpieler Committed by Anton Khirnov

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: 's avatarAnton Khirnov <anton@khirnov.net>
parent a1e215ea
...@@ -57,6 +57,9 @@ ...@@ -57,6 +57,9 @@
#define NVENC_CAP 0x30 #define NVENC_CAP 0x30
#define BITSTREAM_BUFFER_SIZE 1024 * 1024 #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) \ #define LOAD_LIBRARY(l, path) \
do { \ do { \
...@@ -604,6 +607,11 @@ static int nvenc_setup_h264_config(AVCodecContext *avctx) ...@@ -604,6 +607,11 @@ static int nvenc_setup_h264_config(AVCodecContext *avctx)
if (ctx->flags & NVENC_LOSSLESS) if (ctx->flags & NVENC_LOSSLESS)
h264->qpPrimeYZeroTransformBypassFlag = 1; h264->qpPrimeYZeroTransformBypassFlag = 1;
if (IS_CBR(cc->rcParams.rateControlMode)) {
h264->outputBufferingPeriodSEI = 1;
h264->outputPictureTimingSEI = 1;
}
if (ctx->profile) if (ctx->profile)
avctx->profile = ctx->profile; avctx->profile = ctx->profile;
...@@ -648,6 +656,11 @@ static int nvenc_setup_hevc_config(AVCodecContext *avctx) ...@@ -648,6 +656,11 @@ static int nvenc_setup_hevc_config(AVCodecContext *avctx)
hevc->maxNumRefFramesInDPB = avctx->refs; hevc->maxNumRefFramesInDPB = avctx->refs;
hevc->idrPeriod = cc->gopLength; 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 */ /* No other profile is supported in the current SDK version 5 */
cc->profileGUID = NV_ENC_HEVC_PROFILE_MAIN_GUID; cc->profileGUID = NV_ENC_HEVC_PROFILE_MAIN_GUID;
avctx->profile = FF_PROFILE_HEVC_MAIN; avctx->profile = FF_PROFILE_HEVC_MAIN;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment