diff options
| author | James Almer | 2018-09-11 13:57:49 -0300 |
|---|---|---|
| committer | James Almer | 2018-09-11 13:57:49 -0300 |
| commit | 27e30c73d722ec13e59753dea91be00859c72bf2 (patch) | |
| tree | 9dc276a56b52057ad6f10c168a2512adaece3de5 /libavcodec | |
| parent | ff44c2d4f483cda53859ce019f3815c69239a7e0 (diff) | |
| parent | e16b20782a597e36a9c7488487c3179375a25b97 (diff) | |
Merge commit 'e16b20782a597e36a9c7488487c3179375a25b97'
* commit 'e16b20782a597e36a9c7488487c3179375a25b97':
lavc/qsvenc: allow to set qp range for h264 BRC
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/qsvenc.c | 14 | ||||
| -rw-r--r-- | libavcodec/qsvenc_h264.c | 2 |
2 files changed, 16 insertions, 0 deletions
diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 10bb237863..91940e9bb5 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -660,6 +660,20 @@ FF_ENABLE_DEPRECATION_WARNINGS q->extco2.AdaptiveB = q->adaptive_b ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; #endif +#if QSV_VERSION_ATLEAST(1, 9) + if (avctx->qmin >= 0 && avctx->qmax >= 0 && avctx->qmin > avctx->qmax) { + av_log(avctx, AV_LOG_ERROR, "qmin and or qmax are set but invalid, please make sure min <= max\n"); + return AVERROR(EINVAL); + } + if (avctx->qmin >= 0) { + q->extco2.MinQPI = avctx->qmin > 51 ? 51 : avctx->qmin; + q->extco2.MinQPP = q->extco2.MinQPB = q->extco2.MinQPI; + } + if (avctx->qmax >= 0) { + q->extco2.MaxQPI = avctx->qmax > 51 ? 51 : avctx->qmax; + q->extco2.MaxQPP = q->extco2.MaxQPB = q->extco2.MaxQPI; + } +#endif q->extparam_internal[q->nb_extparam_internal++] = (mfxExtBuffer *)&q->extco2; } #endif diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c index 06fa0ebf06..f2bdea0180 100644 --- a/libavcodec/qsvenc_h264.c +++ b/libavcodec/qsvenc_h264.c @@ -170,6 +170,8 @@ static const AVCodecDefault qsv_enc_defaults[] = { // same as the x264 default { "g", "250" }, { "bf", "3" }, + { "qmin", "-1" }, + { "qmax", "-1" }, #if FF_API_CODER_TYPE { "coder", "-1" }, #endif |