| Message ID | 20221101175807.21696-1-nst799610810@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel,1/2] libavcodec/qsvenc_hevc: add tier option | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On Wed, 2022-11-02 at 01:58 +0800, nyanmisaka wrote: > 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> > --- > libavcodec/qsvenc.c | 5 ++++- > libavcodec/qsvenc.h | 1 + > libavcodec/qsvenc_hevc.c | 3 +++ > 3 files changed, 8 insertions(+), 1 deletion(-) > > diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c > index 15e6936a65..5250717f0b 100644 > --- a/libavcodec/qsvenc.c > +++ b/libavcodec/qsvenc.c > @@ -614,8 +614,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; > diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h > index d77bc0aee1..d64af90235 100644 > --- a/libavcodec/qsvenc.h > +++ b/libavcodec/qsvenc.h > @@ -180,6 +180,7 @@ typedef struct QSVEncContext { > int async_depth; > int idr_interval; > int profile; > + int tier; > int preset; > int avbr_accuracy; > int avbr_convergence; > diff --git a/libavcodec/qsvenc_hevc.c b/libavcodec/qsvenc_hevc.c > index 2a3f34b915..845fb93e9d 100644 > --- a/libavcodec/qsvenc_hevc.c > +++ b/libavcodec/qsvenc_hevc.c > @@ -258,6 +258,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}, Patchset applied, thx -Haihao
diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 15e6936a65..5250717f0b 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -614,8 +614,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; diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index d77bc0aee1..d64af90235 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -180,6 +180,7 @@ typedef struct QSVEncContext { int async_depth; int idr_interval; int profile; + int tier; int preset; int avbr_accuracy; int avbr_convergence; diff --git a/libavcodec/qsvenc_hevc.c b/libavcodec/qsvenc_hevc.c index 2a3f34b915..845fb93e9d 100644 --- a/libavcodec/qsvenc_hevc.c +++ b/libavcodec/qsvenc_hevc.c @@ -258,6 +258,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},
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> --- libavcodec/qsvenc.c | 5 ++++- libavcodec/qsvenc.h | 1 + libavcodec/qsvenc_hevc.c | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-)