From bd211bb866f8bf5c372589fc44dc06d1a9509c0a Mon Sep 17 00:00:00 2001
From: Mark Thompson <sw@jkqxz.net>
Date: Sun, 8 Oct 2017 14:48:24 +0100
Subject: [PATCH] vaapi: Remove H.264 baseline profile
This has been deprecated in libva2 because hardware does not and will not
support it. Therefore never consider it for decode, and for encode assume
the user meant constrained baseline profile instead.
---
libavcodec/vaapi_decode.c | 1 -
libavcodec/vaapi_encode_h264.c | 12 ++++--------
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c
index cf58aae4c6f..4f0ff84e01a 100644
--- a/libavcodec/vaapi_decode.c
+++ b/libavcodec/vaapi_decode.c
@@ -246,7 +246,6 @@ static const struct {
MAP(MPEG4, MPEG4_MAIN, MPEG4Main ),
MAP(H264, H264_CONSTRAINED_BASELINE,
H264ConstrainedBaseline),
- MAP(H264, H264_BASELINE, H264Baseline),
MAP(H264, H264_MAIN, H264Main ),
MAP(H264, H264_HIGH, H264High ),
#if VA_CHECK_VERSION(0, 37, 0)
diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c
index 549867ef3f5..efde80b08ee 100644
--- a/libavcodec/vaapi_encode_h264.c
+++ b/libavcodec/vaapi_encode_h264.c
@@ -1175,6 +1175,10 @@ static av_cold int vaapi_encode_h264_init(AVCodecContext *avctx)
ctx->codec = &vaapi_encode_type_h264;
switch (avctx->profile) {
+ case FF_PROFILE_H264_BASELINE:
+ av_log(avctx, AV_LOG_WARNING, "H.264 baseline profile is not "
+ "supported, using constrained baseline profile instead.\n");
+ avctx->profile = FF_PROFILE_H264_CONSTRAINED_BASELINE;
case FF_PROFILE_H264_CONSTRAINED_BASELINE:
ctx->va_profile = VAProfileH264ConstrainedBaseline;
if (avctx->max_b_frames != 0) {
@@ -1183,14 +1187,6 @@ static av_cold int vaapi_encode_h264_init(AVCodecContext *avctx)
"doesn't support encoding with B frames, disabling them.\n");
}
break;
- case FF_PROFILE_H264_BASELINE:
- ctx->va_profile = VAProfileH264Baseline;
- if (avctx->max_b_frames != 0) {
- avctx->max_b_frames = 0;
- av_log(avctx, AV_LOG_WARNING, "H.264 baseline profile "
- "doesn't support encoding with B frames, disabling them.\n");
- }
- break;
case FF_PROFILE_H264_MAIN:
ctx->va_profile = VAProfileH264Main;
break;
--
GitLab