| Message ID | 20220112083657.10709-1-haihao.xiang@intel.com |
|---|---|
| State | Accepted |
| Commit | c4ae6908f28ceacb39b96de9f8761aae1968bf42 |
| Headers | show |
| Series | [FFmpeg-devel,v2] lavc/qsvenc: add encode support for screen content coding extension | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
| andriy/make_ppc | success | Make finished |
| andriy/make_fate_ppc | success | Make fate finished |
| andriy/make_aarch64_jetson | success | Make finished |
| andriy/make_fate_aarch64_jetson | success | Make fate finished |
| andriy/make_armv7_RPi4 | success | Make finished |
| andriy/make_fate_armv7_RPi4 | success | Make fate finished |
On Wed, 2022-01-12 at 16:36 +0800, Haihao Xiang wrote: > Enables HEVC Screen Content Coding extension support on ICL+ platform > > Signed-off-by: Haihao Xiang <haihao.xiang@intel.com> > --- > v2: rebased it against the latest master and added scc to the doc > > doc/encoders.texi | 3 +++ > libavcodec/qsvenc.c | 3 +++ > libavcodec/qsvenc_hevc.c | 3 +++ > 3 files changed, 9 insertions(+) > > diff --git a/doc/encoders.texi b/doc/encoders.texi > index 7cc8be1209..78518629cd 100644 > --- a/doc/encoders.texi > +++ b/doc/encoders.texi > @@ -3411,12 +3411,15 @@ an internal session. > Depth of look ahead in number frames, available when extbrc option is > enabled. > > @item @var{profile} > +Set the encoding profile (scc requires libmfx >= 1.32). > + > @table @samp > @item unknown > @item main > @item main10 > @item mainsp > @item rext > +@item scc > @end table > > @item @var{gpb} > diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c > index 4e7a15f060..269386624d 100644 > --- a/libavcodec/qsvenc.c > +++ b/libavcodec/qsvenc.c > @@ -74,6 +74,9 @@ static const struct profile_names hevc_profiles[] = { > { MFX_PROFILE_HEVC_MAINSP, "hevc > mainsp" }, > { MFX_PROFILE_HEVC_REXT, "hevc > rext" }, > #endif > +#if QSV_VERSION_ATLEAST(1, 32) > + { MFX_PROFILE_HEVC_SCC, "hevc > scc" }, > +#endif > }; > > static const struct profile_names vp9_profiles[] = { > diff --git a/libavcodec/qsvenc_hevc.c b/libavcodec/qsvenc_hevc.c > index 08aba3011d..07010c698e 100644 > --- a/libavcodec/qsvenc_hevc.c > +++ b/libavcodec/qsvenc_hevc.c > @@ -244,6 +244,9 @@ static const AVOption options[] = { > { "main10", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = > MFX_PROFILE_HEVC_MAIN10 }, INT_MIN, INT_MAX, VE, "profile" }, > { "mainsp", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = > MFX_PROFILE_HEVC_MAINSP }, INT_MIN, INT_MAX, VE, "profile" }, > { "rext", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = > MFX_PROFILE_HEVC_REXT }, INT_MIN, INT_MAX, VE, "profile" }, > +#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 > > { "gpb", "1: GPB (generalized P/B frame); 0: regular P frame", > OFFSET(qsv.gpb), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, VE}, > Will apply, -Haihao
diff --git a/doc/encoders.texi b/doc/encoders.texi index 7cc8be1209..78518629cd 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -3411,12 +3411,15 @@ an internal session. Depth of look ahead in number frames, available when extbrc option is enabled. @item @var{profile} +Set the encoding profile (scc requires libmfx >= 1.32). + @table @samp @item unknown @item main @item main10 @item mainsp @item rext +@item scc @end table @item @var{gpb} diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 4e7a15f060..269386624d 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -74,6 +74,9 @@ static const struct profile_names hevc_profiles[] = { { MFX_PROFILE_HEVC_MAINSP, "hevc mainsp" }, { MFX_PROFILE_HEVC_REXT, "hevc rext" }, #endif +#if QSV_VERSION_ATLEAST(1, 32) + { MFX_PROFILE_HEVC_SCC, "hevc scc" }, +#endif }; static const struct profile_names vp9_profiles[] = { diff --git a/libavcodec/qsvenc_hevc.c b/libavcodec/qsvenc_hevc.c index 08aba3011d..07010c698e 100644 --- a/libavcodec/qsvenc_hevc.c +++ b/libavcodec/qsvenc_hevc.c @@ -244,6 +244,9 @@ static const AVOption options[] = { { "main10", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_PROFILE_HEVC_MAIN10 }, INT_MIN, INT_MAX, VE, "profile" }, { "mainsp", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_PROFILE_HEVC_MAINSP }, INT_MIN, INT_MAX, VE, "profile" }, { "rext", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_PROFILE_HEVC_REXT }, INT_MIN, INT_MAX, VE, "profile" }, +#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 { "gpb", "1: GPB (generalized P/B frame); 0: regular P frame", OFFSET(qsv.gpb), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, VE},
Enables HEVC Screen Content Coding extension support on ICL+ platform Signed-off-by: Haihao Xiang <haihao.xiang@intel.com> --- v2: rebased it against the latest master and added scc to the doc doc/encoders.texi | 3 +++ libavcodec/qsvenc.c | 3 +++ libavcodec/qsvenc_hevc.c | 3 +++ 3 files changed, 9 insertions(+)