RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavc/qsvenc: use the common option "trellis" of AVCodecContext 

Signed-off-by: Zhong Li <zhong.li@intel.com>
This commit is contained in:
Zhong Li 2019-03-27 19:33:37 +08:00
parent 4131b0619c
commit b9a066ae23
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/qsvenc.c
View File

@ -683,7 +683,10 @@ FF_ENABLE_DEPRECATION_WARNINGS
#endif
#if QSV_HAVE_TRELLIS
q->extco2.Trellis = q->trellis;
if (avctx->trellis >= 0)
q->extco2.Trellis = (avctx->trellis == 0) ? MFX_TRELLIS_OFF : (MFX_TRELLIS_I | MFX_TRELLIS_P | MFX_TRELLIS_B);
else
q->extco2.Trellis = MFX_TRELLIS_UNKNOWN;
#endif
#if QSV_VERSION_ATLEAST(1, 8)

2
libavcodec/qsvenc_h264.c
View File

@ -181,7 +181,7 @@ static const AVCodecDefault qsv_enc_defaults[] = {
#if FF_API_CODER_TYPE
{ "coder", "-1" },
#endif
{ "trellis", "-1" },
{ "flags", "+cgop" },
#if FF_API_PRIVATE_OPT
{ "b_strategy", "-1" },

2
libavcodec/qsvenc_hevc.c
View File

@ -254,7 +254,7 @@ static const AVCodecDefault qsv_enc_defaults[] = {
// same as the x264 default
{ "g", "248" },
{ "bf", "8" },
{ "trellis", "-1" },
{ "flags", "+cgop" },
#if FF_API_PRIVATE_OPT
{ "b_strategy", "-1" },

2
libavcodec/qsvenc_mpeg2.c
View File

@ -87,7 +87,7 @@ static const AVCodecDefault qsv_enc_defaults[] = {
// same as the x264 default
{ "g", "250" },
{ "bf", "3" },
{ "trellis", "-1" },
{ "flags", "+cgop" },
#if FF_API_PRIVATE_OPT
{ "b_strategy", "-1" },