diff options
| author | Zhong Li <zhong.li@intel.com> | 2018-06-08 07:00:18 +0800 |
|---|---|---|
| committer | Maxym Dmytrychenko <maxim.d33@gmail.com> | 2018-06-11 13:33:23 +0200 |
| commit | f8060865f3e1a16c62e0d337ef0979b6ee4ba457 (patch) | |
| tree | 2805ce2f9a32f3dc2e4fc26afc6a1c17eda2df7d /libavcodec | |
| parent | a507af97eef468238d545ff954a39d7432832e54 (diff) | |
| download | ffmpeg-f8060865f3e1a16c62e0d337ef0979b6ee4ba457.tar.gz | |
qsvenc: use the compression_level to replace private option
Use a common way to control target_usage, keeping consistent with vaapi
encoders. The private option preset is kept only for compatibility.
Signed-off-by: Zhong Li <zhong.li@intel.com>
Signed-off-by: Maxym Dmytrychenko <maxim.d33@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/qsvenc.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index a8b446c5bd..307ef683f9 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -461,8 +461,19 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) if (avctx->level > 0) q->param.mfx.CodecLevel = avctx->level; + if (avctx->compression_level == FF_COMPRESSION_DEFAULT) { + avctx->compression_level = q->preset; + } else if (avctx->compression_level >= 0) { + if (avctx->compression_level > MFX_TARGETUSAGE_BEST_SPEED) { + av_log(avctx, AV_LOG_WARNING, "Invalid compression level: " + "valid range is 0-%d, using %d instead\n", + MFX_TARGETUSAGE_BEST_SPEED, MFX_TARGETUSAGE_BEST_SPEED); + avctx->compression_level = MFX_TARGETUSAGE_BEST_SPEED; + } + } + q->param.mfx.CodecProfile = q->profile; - q->param.mfx.TargetUsage = q->preset; + q->param.mfx.TargetUsage = avctx->compression_level; q->param.mfx.GopPicSize = FFMAX(0, avctx->gop_size); q->param.mfx.GopRefDist = FFMAX(-1, avctx->max_b_frames) + 1; q->param.mfx.GopOptFlag = avctx->flags & AV_CODEC_FLAG_CLOSED_GOP ? |