MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libavcodec/qsvenc_hevc: add tier option

Browse Source 
Without this change, MSDK/VPL always defaults the HEVC tier to MAIN if the -level is specified.
Also, according to the HEVC specs, only level >= 4 can support High Tier.

Signed-off-by: nyanmisaka <nst799610810@gmail.com>
This commit is contained in:
nyanmisaka 2022-11-02 01:58:06 +08:00 committed by Haihao Xiang
parent e137d197b5
commit 09775cfea7
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/qsvenc.c
View File

@ -709,8 +709,11 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q)
return AVERROR_BUG;
q->param.mfx.CodecId = ret;
if (avctx->level > 0)
if (avctx->level > 0) {
q->param.mfx.CodecLevel = avctx->level;
if (avctx->codec_id == AV_CODEC_ID_HEVC && avctx->level >= MFX_LEVEL_HEVC_4)
q->param.mfx.CodecLevel |= q->tier;
}
if (avctx->compression_level == FF_COMPRESSION_DEFAULT) {
avctx->compression_level = q->preset;

1
libavcodec/qsvenc.h
View File

@ -185,6 +185,7 @@ typedef struct QSVEncContext {
int async_depth;
int idr_interval;
int profile;
int tier;
int preset;
int avbr_accuracy;
int avbr_convergence;

3
libavcodec/qsvenc_hevc.c
View File

@ -338,6 +338,9 @@ static const AVOption options[] = {
#if QSV_VERSION_ATLEAST(1, 32)
{ "scc", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_PROFILE_HEVC_SCC }, INT_MIN, INT_MAX, VE, "profile" },
#endif
{ "tier", "Set the encoding tier (only level >= 4 can support high tier)", OFFSET(qsv.tier), AV_OPT_TYPE_INT, { .i64 = MFX_TIER_HEVC_HIGH }, MFX_TIER_HEVC_MAIN, MFX_TIER_HEVC_HIGH, VE, "tier" },
{ "main", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_TIER_HEVC_MAIN }, INT_MIN, INT_MAX, VE, "tier" },
{ "high", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_TIER_HEVC_HIGH }, INT_MIN, INT_MAX, VE, "tier" },
{ "gpb", "1: GPB (generalized P/B frame); 0: regular P frame", OFFSET(qsv.gpb), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, VE},