RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

vaapi: Add external control of allow-profile-mismatch 

Uses the just-added ALLOW_PROFILE_MISMATCH flag.
This commit is contained in:
Mark Thompson 2017-03-27 20:46:11 +01:00
parent 64a5260c69
commit 7acb90333a
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/vaapi_decode.c
View File

@ -283,14 +283,6 @@ static int vaapi_decode_make_config(AVCodecContext *avctx)
int profile_count, exact_match, alt_profile; int profile_count, exact_match, alt_profile;
const AVPixFmtDescriptor *sw_desc, *desc; const AVPixFmtDescriptor *sw_desc, *desc;
// Allowing a profile mismatch can be useful because streams may
// over-declare their required capabilities - in particular, many
// H.264 baseline profile streams (notably some of those in FATE)
// only use the feature set of constrained baseline. This flag
// would have to be be set by some external means in order to
// actually be useful. (AV_HWACCEL_FLAG_IGNORE_PROFILE?)
int allow_profile_mismatch = 0;
codec_desc = avcodec_descriptor_get(avctx->codec_id); codec_desc = avcodec_descriptor_get(avctx->codec_id);
if (!codec_desc) { if (!codec_desc) {
err = AVERROR(EINVAL); err = AVERROR(EINVAL);
@ -346,7 +338,8 @@ static int vaapi_decode_make_config(AVCodecContext *avctx)
goto fail; goto fail;
} }
if (!exact_match) { if (!exact_match) {
if (allow_profile_mismatch) { if (avctx->hwaccel_flags &
AV_HWACCEL_FLAG_ALLOW_PROFILE_MISMATCH) {
av_log(avctx, AV_LOG_VERBOSE, "Codec %s profile %d not " av_log(avctx, AV_LOG_VERBOSE, "Codec %s profile %d not "
"supported for hardware decode.\n", "supported for hardware decode.\n",
codec_desc->name, avctx->profile); codec_desc->name, avctx->profile);