x/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-06-11 08:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

avcodec/nvenc: fix b_ref_mode capability check

Browse Source 
Turns out it's a bitfield, not straight values.

Fixes #23061
This commit is contained in:
Timo Rothenpieler
2026-06-10 20:17:44 +02:00
parent cf0244aa38
commit 5f998e304d
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavcodec/nvenc.c
+18 -6
View File
@@ -591,12 +591,24 @@ static int nvenc_check_capabilities(AVCodecContext *avctx)
#ifdef NVENC_HAVE_BFRAME_REF_MODE #ifdef NVENC_HAVE_BFRAME_REF_MODE
tmp = (ctx->b_ref_mode >= 0) ? ctx->b_ref_mode : NV_ENC_BFRAME_REF_MODE_DISABLED; tmp = (ctx->b_ref_mode >= 0) ? ctx->b_ref_mode : NV_ENC_BFRAME_REF_MODE_DISABLED;
ret = nvenc_check_cap(avctx, NV_ENC_CAPS_SUPPORT_BFRAME_REF_MODE); ret = nvenc_check_cap(avctx, NV_ENC_CAPS_SUPPORT_BFRAME_REF_MODE);
if (tmp == NV_ENC_BFRAME_REF_MODE_EACH && ret != 1 && ret != 3) { switch (tmp) {
av_log(avctx, AV_LOG_WARNING, "Each B frame as reference is not supported\n"); case NV_ENC_BFRAME_REF_MODE_DISABLED:
return AVERROR(ENOSYS); break;
} else if (tmp != NV_ENC_BFRAME_REF_MODE_DISABLED && ret == 0) { case NV_ENC_BFRAME_REF_MODE_EACH:
av_log(avctx, AV_LOG_WARNING, "B frames as references are not supported\n"); if (!(ret & 1)) {
return AVERROR(ENOSYS); av_log(avctx, AV_LOG_WARNING, "Each B frame reference mode is not supported\n");
return AVERROR(ENOSYS);
}
break;
case NV_ENC_BFRAME_REF_MODE_MIDDLE:
if (!(ret & 2)) {
av_log(avctx, AV_LOG_WARNING, "Middle B frame reference mode is not supported\n");
return AVERROR(ENOSYS);
}
break;
default:
av_log(avctx, AV_LOG_ERROR, "Unknown B frame reference mode!\n");
return AVERROR_BUG;
} }
#else #else
tmp = (ctx->b_ref_mode >= 0) ? ctx->b_ref_mode : 0; tmp = (ctx->b_ref_mode >= 0) ? ctx->b_ref_mode : 0;