ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-20 05:16:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'f8060865f3e1a16c62e0d337ef0979b6ee4ba457'

Browse Source 
* commit 'f8060865f3e1a16c62e0d337ef0979b6ee4ba457':
  qsvenc: use the compression_level to replace private option

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2018-09-02 19:12:18 -03:00
commit aebc5b2284
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/qsvenc.c
View File

@ -453,8 +453,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 ?