Message ID | 20211221151806.23772-1-zhongli_dev@126.com |
---|---|
State | Accepted |
Commit | 0598b38e9316391c76da24cc0f8c11d5e0292ae7 |
Headers | show |
Series | [FFmpeg-devel,1/2] lavc/qsvenc: specify codec name when print profile | 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 |
On Tue, 2021-12-21 at 23:18 +0800, Zhong Li wrote: > It is more clear and easily to detect the issues similar to commit > 3857ecbe70e81cb6ad7a7f155c311e8522b93b3e > > Signed-off-by: Zhong Li <zhongli_dev@126.com> > --- > libavcodec/qsvenc.c | 38 +++++++++++++++++++------------------- > 1 file changed, 19 insertions(+), 19 deletions(-) > > diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c > index 92a8b49fe3..be5a541409 100644 > --- a/libavcodec/qsvenc.c > +++ b/libavcodec/qsvenc.c > @@ -47,41 +47,41 @@ struct profile_names { > }; > > static const struct profile_names avc_profiles[] = { > - { MFX_PROFILE_AVC_BASELINE, "baseline" }, > - { MFX_PROFILE_AVC_MAIN, "main" }, > - { MFX_PROFILE_AVC_EXTENDED, "extended" }, > - { MFX_PROFILE_AVC_HIGH, "high" }, > + { MFX_PROFILE_AVC_BASELINE, "avc > baseline" }, > + { MFX_PROFILE_AVC_MAIN, "avc > main" }, > + { MFX_PROFILE_AVC_EXTENDED, "avc > extended" }, > + { MFX_PROFILE_AVC_HIGH, "avc > high" }, > #if QSV_VERSION_ATLEAST(1, 15) > - { MFX_PROFILE_AVC_HIGH_422, "high 422" }, > + { MFX_PROFILE_AVC_HIGH_422, "avc high > 422" }, > #endif > #if QSV_VERSION_ATLEAST(1, 4) > - { MFX_PROFILE_AVC_CONSTRAINED_BASELINE, "constrained baseline" }, > - { MFX_PROFILE_AVC_CONSTRAINED_HIGH, "constrained high" }, > - { MFX_PROFILE_AVC_PROGRESSIVE_HIGH, "progressive high" }, > + { MFX_PROFILE_AVC_CONSTRAINED_BASELINE, "avc constrained > baseline" }, > + { MFX_PROFILE_AVC_CONSTRAINED_HIGH, "avc constrained > high" }, > + { MFX_PROFILE_AVC_PROGRESSIVE_HIGH, "avc progressive > high" }, > #endif > }; > > static const struct profile_names mpeg2_profiles[] = { > - { MFX_PROFILE_MPEG2_SIMPLE, "simple" }, > - { MFX_PROFILE_MPEG2_MAIN, "main" }, > - { MFX_PROFILE_MPEG2_HIGH, "high" }, > + { MFX_PROFILE_MPEG2_SIMPLE, "mpeg2 > simple" }, > + { MFX_PROFILE_MPEG2_MAIN, "mpeg2 > main" }, > + { MFX_PROFILE_MPEG2_HIGH, "mpeg2 > high" }, > }; > > static const struct profile_names hevc_profiles[] = { > #if QSV_VERSION_ATLEAST(1, 8) > - { MFX_PROFILE_HEVC_MAIN, "main" }, > - { MFX_PROFILE_HEVC_MAIN10, "main10" }, > - { MFX_PROFILE_HEVC_MAINSP, "mainsp" }, > - { MFX_PROFILE_HEVC_REXT, "rext" }, > + { MFX_PROFILE_HEVC_MAIN, "hevc > main" }, > + { MFX_PROFILE_HEVC_MAIN10, "hevc > main10" }, > + { MFX_PROFILE_HEVC_MAINSP, "hevc > mainsp" }, > + { MFX_PROFILE_HEVC_REXT, "hevc > rext" }, > #endif > }; > > static const struct profile_names vp9_profiles[] = { > #if QSV_VERSION_ATLEAST(1, 19) > - { MFX_PROFILE_VP9_0, "0" }, > - { MFX_PROFILE_VP9_1, "1" }, > - { MFX_PROFILE_VP9_2, "2" }, > - { MFX_PROFILE_VP9_3, "3" }, > + { MFX_PROFILE_VP9_0, "vp9 > 0" }, > + { MFX_PROFILE_VP9_1, "vp9 > 1" }, > + { MFX_PROFILE_VP9_2, "vp9 > 2" }, > + { MFX_PROFILE_VP9_3, "vp9 > 3" }, > #endif > }; > Applied, thx! -Haihao
diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 92a8b49fe3..be5a541409 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -47,41 +47,41 @@ struct profile_names { }; static const struct profile_names avc_profiles[] = { - { MFX_PROFILE_AVC_BASELINE, "baseline" }, - { MFX_PROFILE_AVC_MAIN, "main" }, - { MFX_PROFILE_AVC_EXTENDED, "extended" }, - { MFX_PROFILE_AVC_HIGH, "high" }, + { MFX_PROFILE_AVC_BASELINE, "avc baseline" }, + { MFX_PROFILE_AVC_MAIN, "avc main" }, + { MFX_PROFILE_AVC_EXTENDED, "avc extended" }, + { MFX_PROFILE_AVC_HIGH, "avc high" }, #if QSV_VERSION_ATLEAST(1, 15) - { MFX_PROFILE_AVC_HIGH_422, "high 422" }, + { MFX_PROFILE_AVC_HIGH_422, "avc high 422" }, #endif #if QSV_VERSION_ATLEAST(1, 4) - { MFX_PROFILE_AVC_CONSTRAINED_BASELINE, "constrained baseline" }, - { MFX_PROFILE_AVC_CONSTRAINED_HIGH, "constrained high" }, - { MFX_PROFILE_AVC_PROGRESSIVE_HIGH, "progressive high" }, + { MFX_PROFILE_AVC_CONSTRAINED_BASELINE, "avc constrained baseline" }, + { MFX_PROFILE_AVC_CONSTRAINED_HIGH, "avc constrained high" }, + { MFX_PROFILE_AVC_PROGRESSIVE_HIGH, "avc progressive high" }, #endif }; static const struct profile_names mpeg2_profiles[] = { - { MFX_PROFILE_MPEG2_SIMPLE, "simple" }, - { MFX_PROFILE_MPEG2_MAIN, "main" }, - { MFX_PROFILE_MPEG2_HIGH, "high" }, + { MFX_PROFILE_MPEG2_SIMPLE, "mpeg2 simple" }, + { MFX_PROFILE_MPEG2_MAIN, "mpeg2 main" }, + { MFX_PROFILE_MPEG2_HIGH, "mpeg2 high" }, }; static const struct profile_names hevc_profiles[] = { #if QSV_VERSION_ATLEAST(1, 8) - { MFX_PROFILE_HEVC_MAIN, "main" }, - { MFX_PROFILE_HEVC_MAIN10, "main10" }, - { MFX_PROFILE_HEVC_MAINSP, "mainsp" }, - { MFX_PROFILE_HEVC_REXT, "rext" }, + { MFX_PROFILE_HEVC_MAIN, "hevc main" }, + { MFX_PROFILE_HEVC_MAIN10, "hevc main10" }, + { MFX_PROFILE_HEVC_MAINSP, "hevc mainsp" }, + { MFX_PROFILE_HEVC_REXT, "hevc rext" }, #endif }; static const struct profile_names vp9_profiles[] = { #if QSV_VERSION_ATLEAST(1, 19) - { MFX_PROFILE_VP9_0, "0" }, - { MFX_PROFILE_VP9_1, "1" }, - { MFX_PROFILE_VP9_2, "2" }, - { MFX_PROFILE_VP9_3, "3" }, + { MFX_PROFILE_VP9_0, "vp9 0" }, + { MFX_PROFILE_VP9_1, "vp9 1" }, + { MFX_PROFILE_VP9_2, "vp9 2" }, + { MFX_PROFILE_VP9_3, "vp9 3" }, #endif };
It is more clear and easily to detect the issues similar to commit 3857ecbe70e81cb6ad7a7f155c311e8522b93b3e Signed-off-by: Zhong Li <zhongli_dev@126.com> --- libavcodec/qsvenc.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-)