Skip to content

F
ffmpeg.wasm-core
Commit a8bedd56 authored by Agatha Hu's avatar Agatha Hu Committed by Timo Rothenpieler
Browse files
Options

avcodec/nvenc: merge compute initialQP sections 

Signed-off-by: 's avatarTimo Rothenpieler <timo@rothenpieler.org>
parent 49046580
Show whitespace changes
Inline Side-by-side
Showing with 30 additions and 42 deletions
libavcodec/nvenc.c
View file @ a8bedd56
...@@ -804,51 +804,41 @@ static av_cold int nvenc_encode_init(AVCodecContext *avctx) ...@@ -804,51 +804,41 @@ static av_cold int nvenc_encode_init(AVCodecContext *avctx)
avctx->qmin = -1; avctx->qmin = -1;
avctx->qmax = -1; avctx->qmax = -1;
} else if (avctx->qmin >= 0 && avctx->qmax >= 0) {
if (ctx->twopass) {
ctx->encode_config.rcParams.rateControlMode = NV_ENC_PARAMS_RC_2_PASS_VBR;
if (avctx->codec->id == AV_CODEC_ID_H264) {
ctx->encode_config.encodeCodecConfig.h264Config.adaptiveTransformMode = NV_ENC_H264_ADAPTIVE_TRANSFORM_ENABLE;
ctx->encode_config.encodeCodecConfig.h264Config.fmoMode = NV_ENC_H264_FMO_DISABLE;
}
} else { } else {
ctx->encode_config.rcParams.rateControlMode = NV_ENC_PARAMS_RC_VBR_MINQP; if (avctx->qmin >= 0 && avctx->qmax >= 0) {
}
ctx->encode_config.rcParams.enableMinQP = 1; ctx->encode_config.rcParams.enableMinQP = 1;
ctx->encode_config.rcParams.enableMaxQP = 1; ctx->encode_config.rcParams.enableMaxQP = 1;
ctx->encode_config.rcParams.minQP.qpInterB = avctx->qmin; // * fabs(avctx->b_quant_factor); ctx->encode_config.rcParams.minQP.qpInterB = avctx->qmin;
ctx->encode_config.rcParams.minQP.qpInterP = avctx->qmin; // * fabs(avctx->i_quant_factor); ctx->encode_config.rcParams.minQP.qpInterP = avctx->qmin;
ctx->encode_config.rcParams.minQP.qpIntra = avctx->qmin; ctx->encode_config.rcParams.minQP.qpIntra = avctx->qmin;
ctx->encode_config.rcParams.maxQP.qpInterB = avctx->qmax; // / fabs(avctx->b_quant_factor); ctx->encode_config.rcParams.maxQP.qpInterB = avctx->qmax;
ctx->encode_config.rcParams.maxQP.qpInterP = avctx->qmax; // / fabs(avctx->i_quant_factor); ctx->encode_config.rcParams.maxQP.qpInterP = avctx->qmax;
ctx->encode_config.rcParams.maxQP.qpIntra = avctx->qmax; ctx->encode_config.rcParams.maxQP.qpIntra = avctx->qmax;
qp_inter_p = (avctx->qmax + 3 * avctx->qmin) / 4; // biased towards Qmin qp_inter_p = (avctx->qmax + 3 * avctx->qmin) / 4; // biased towards Qmin
ctx->encode_config.rcParams.initialRCQP.qpInterP = qp_inter_p;
if (avctx->i_quant_factor != 0.0 && avctx->b_quant_factor != 0.0) { if (ctx->twopass) {
ctx->encode_config.rcParams.initialRCQP.qpIntra = qp_inter_p * fabs(avctx->i_quant_factor); ctx->encode_config.rcParams.rateControlMode = NV_ENC_PARAMS_RC_2_PASS_VBR;
ctx->encode_config.rcParams.initialRCQP.qpIntra += qp_inter_p * avctx->i_quant_offset; if (avctx->codec->id == AV_CODEC_ID_H264) {
ctx->encode_config.rcParams.initialRCQP.qpInterB = qp_inter_p * fabs(avctx->b_quant_factor); ctx->encode_config.encodeCodecConfig.h264Config.adaptiveTransformMode = NV_ENC_H264_ADAPTIVE_TRANSFORM_ENABLE;
ctx->encode_config.rcParams.initialRCQP.qpInterB += qp_inter_p * avctx->b_quant_offset; ctx->encode_config.encodeCodecConfig.h264Config.fmoMode = NV_ENC_H264_FMO_DISABLE;
}
} else { } else {
ctx->encode_config.rcParams.initialRCQP.qpIntra = qp_inter_p; ctx->encode_config.rcParams.rateControlMode = NV_ENC_PARAMS_RC_VBR_MINQP;
ctx->encode_config.rcParams.initialRCQP.qpInterB = qp_inter_p;
} }
} else {
qp_inter_p = 26; // default to 26
ctx->encode_config.rcParams.enableInitialRCQP = 1; if (ctx->twopass) {
ctx->encode_config.rcParams.rateControlMode = NV_ENC_PARAMS_RC_2_PASS_VBR;
} else { } else {
if (!ctx->twopass) {
ctx->encode_config.rcParams.rateControlMode = NV_ENC_PARAMS_RC_VBR; ctx->encode_config.rcParams.rateControlMode = NV_ENC_PARAMS_RC_VBR;
} else { }
ctx->encode_config.rcParams.rateControlMode = NV_ENC_PARAMS_RC_2_PASS_VBR;
} }
qp_inter_p = 26; // default to 26 ctx->encode_config.rcParams.enableInitialRCQP = 1;
ctx->encode_config.rcParams.initialRCQP.qpInterP = qp_inter_p; ctx->encode_config.rcParams.initialRCQP.qpInterP = qp_inter_p;
if(avctx->i_quant_factor != 0.0 && avctx->b_quant_factor != 0.0) { if(avctx->i_quant_factor != 0.0 && avctx->b_quant_factor != 0.0) {
...@@ -860,8 +850,6 @@ static av_cold int nvenc_encode_init(AVCodecContext *avctx) ...@@ -860,8 +850,6 @@ static av_cold int nvenc_encode_init(AVCodecContext *avctx)
ctx->encode_config.rcParams.initialRCQP.qpIntra = qp_inter_p; ctx->encode_config.rcParams.initialRCQP.qpIntra = qp_inter_p;
ctx->encode_config.rcParams.initialRCQP.qpInterB = qp_inter_p; ctx->encode_config.rcParams.initialRCQP.qpInterB = qp_inter_p;
} }
ctx->encode_config.rcParams.enableInitialRCQP = 1;
} }
if (avctx->rc_buffer_size > 0) if (avctx->rc_buffer_size > 0)
......
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