| Message ID | AS8P250MB0744C719F89358944D5463A88F94A@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM |
|---|---|
| State | Accepted |
| Commit | 3435565e26bdb3b68b14a570881d1dfd980130f0 |
| Headers | show |
| Series | [FFmpeg-devel] avcodec/d3d12va_(av1|hevc|vp9): Don't use deprecated FF_PROFILE_* | 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 |
Andreas Rheinhardt: > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > libavcodec/d3d12va_av1.c | 2 +- > libavcodec/d3d12va_hevc.c | 6 +++--- > libavcodec/d3d12va_vp9.c | 8 ++++---- > 3 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/libavcodec/d3d12va_av1.c b/libavcodec/d3d12va_av1.c > index 6a3543353f..4a87169bfb 100644 > --- a/libavcodec/d3d12va_av1.c > +++ b/libavcodec/d3d12va_av1.c > @@ -164,7 +164,7 @@ static int d3d12va_av1_decode_init(AVCodecContext *avctx) > > int ret; > > - if (avctx->profile != FF_PROFILE_AV1_MAIN) > + if (avctx->profile != AV_PROFILE_AV1_MAIN) > return AVERROR(EINVAL); > > ctx->cfg.DecodeProfile = D3D12_VIDEO_DECODE_PROFILE_AV1_PROFILE0; > diff --git a/libavcodec/d3d12va_hevc.c b/libavcodec/d3d12va_hevc.c > index 7e0c295a2d..2fd884b8e6 100644 > --- a/libavcodec/d3d12va_hevc.c > +++ b/libavcodec/d3d12va_hevc.c > @@ -171,11 +171,11 @@ static int d3d12va_hevc_decode_init(AVCodecContext *avctx) > DXVA_PicParams_HEVC pp; > > switch (avctx->profile) { > - case FF_PROFILE_HEVC_MAIN_10: > + case AV_PROFILE_HEVC_MAIN_10: > ctx->cfg.DecodeProfile = D3D12_VIDEO_DECODE_PROFILE_HEVC_MAIN10; > break; > > - case FF_PROFILE_HEVC_MAIN_STILL_PICTURE: > + case AV_PROFILE_HEVC_MAIN_STILL_PICTURE: > if (avctx->hwaccel_flags & AV_HWACCEL_FLAG_ALLOW_PROFILE_MISMATCH) { > ctx->cfg.DecodeProfile = D3D12_VIDEO_DECODE_PROFILE_HEVC_MAIN; > break; > @@ -184,7 +184,7 @@ static int d3d12va_hevc_decode_init(AVCodecContext *avctx) > return AVERROR(EINVAL); > } > > - case FF_PROFILE_HEVC_MAIN: > + case AV_PROFILE_HEVC_MAIN: > default: > ctx->cfg.DecodeProfile = D3D12_VIDEO_DECODE_PROFILE_HEVC_MAIN; > break; > diff --git a/libavcodec/d3d12va_vp9.c b/libavcodec/d3d12va_vp9.c > index bb94e18781..84ff06b9a9 100644 > --- a/libavcodec/d3d12va_vp9.c > +++ b/libavcodec/d3d12va_vp9.c > @@ -136,13 +136,13 @@ static int d3d12va_vp9_decode_init(AVCodecContext *avctx) > DXVA_PicParams_VP9 pp; > > switch (avctx->profile) { > - case FF_PROFILE_VP9_2: > - case FF_PROFILE_VP9_3: > + case AV_PROFILE_VP9_2: > + case AV_PROFILE_VP9_3: > ctx->cfg.DecodeProfile = D3D12_VIDEO_DECODE_PROFILE_VP9_10BIT_PROFILE2; > break; > > - case FF_PROFILE_VP9_0: > - case FF_PROFILE_VP9_1: > + case AV_PROFILE_VP9_0: > + case AV_PROFILE_VP9_1: > default: > ctx->cfg.DecodeProfile = D3D12_VIDEO_DECODE_PROFILE_VP9; > break; Will apply this patch tomorrow unless there are objections. - Andreas
diff --git a/libavcodec/d3d12va_av1.c b/libavcodec/d3d12va_av1.c index 6a3543353f..4a87169bfb 100644 --- a/libavcodec/d3d12va_av1.c +++ b/libavcodec/d3d12va_av1.c @@ -164,7 +164,7 @@ static int d3d12va_av1_decode_init(AVCodecContext *avctx) int ret; - if (avctx->profile != FF_PROFILE_AV1_MAIN) + if (avctx->profile != AV_PROFILE_AV1_MAIN) return AVERROR(EINVAL); ctx->cfg.DecodeProfile = D3D12_VIDEO_DECODE_PROFILE_AV1_PROFILE0; diff --git a/libavcodec/d3d12va_hevc.c b/libavcodec/d3d12va_hevc.c index 7e0c295a2d..2fd884b8e6 100644 --- a/libavcodec/d3d12va_hevc.c +++ b/libavcodec/d3d12va_hevc.c @@ -171,11 +171,11 @@ static int d3d12va_hevc_decode_init(AVCodecContext *avctx) DXVA_PicParams_HEVC pp; switch (avctx->profile) { - case FF_PROFILE_HEVC_MAIN_10: + case AV_PROFILE_HEVC_MAIN_10: ctx->cfg.DecodeProfile = D3D12_VIDEO_DECODE_PROFILE_HEVC_MAIN10; break; - case FF_PROFILE_HEVC_MAIN_STILL_PICTURE: + case AV_PROFILE_HEVC_MAIN_STILL_PICTURE: if (avctx->hwaccel_flags & AV_HWACCEL_FLAG_ALLOW_PROFILE_MISMATCH) { ctx->cfg.DecodeProfile = D3D12_VIDEO_DECODE_PROFILE_HEVC_MAIN; break; @@ -184,7 +184,7 @@ static int d3d12va_hevc_decode_init(AVCodecContext *avctx) return AVERROR(EINVAL); } - case FF_PROFILE_HEVC_MAIN: + case AV_PROFILE_HEVC_MAIN: default: ctx->cfg.DecodeProfile = D3D12_VIDEO_DECODE_PROFILE_HEVC_MAIN; break; diff --git a/libavcodec/d3d12va_vp9.c b/libavcodec/d3d12va_vp9.c index bb94e18781..84ff06b9a9 100644 --- a/libavcodec/d3d12va_vp9.c +++ b/libavcodec/d3d12va_vp9.c @@ -136,13 +136,13 @@ static int d3d12va_vp9_decode_init(AVCodecContext *avctx) DXVA_PicParams_VP9 pp; switch (avctx->profile) { - case FF_PROFILE_VP9_2: - case FF_PROFILE_VP9_3: + case AV_PROFILE_VP9_2: + case AV_PROFILE_VP9_3: ctx->cfg.DecodeProfile = D3D12_VIDEO_DECODE_PROFILE_VP9_10BIT_PROFILE2; break; - case FF_PROFILE_VP9_0: - case FF_PROFILE_VP9_1: + case AV_PROFILE_VP9_0: + case AV_PROFILE_VP9_1: default: ctx->cfg.DecodeProfile = D3D12_VIDEO_DECODE_PROFILE_VP9; break;
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/d3d12va_av1.c | 2 +- libavcodec/d3d12va_hevc.c | 6 +++--- libavcodec/d3d12va_vp9.c | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-)