PR #21424 opened by Edison Ling (edisonling) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21424 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21424.patch
add parameter `coder` for users to explicitly select CABAC or CAVLC coding in D3D12 H264 encoding usage: `-coder cabac` or `-coder ac` or `-coder 1` `-coder cavlc` or `-coder vlc` or `-coder 0` `-coder auto` or `-coder -1` sample command line: ``` .\ffmpeg.exe -hwaccel d3d12va -hwaccel_output_format d3d12 -i input.mp4 -c:v h264_d3d12va -coder cabac -y output.mp4 ``` >From 6fe819efd483640aaa843803f3159446e0b3d128 Mon Sep 17 00:00:00 2001 From: "Ling, Edison" <[email protected]> Date: Fri, 9 Jan 2026 16:49:33 -0500 Subject: [PATCH] avcodec/d3d12va_encode: Add H264 entropy coder parameter support add parameter `coder` for users to explicitly select CABAC or CAVLC coding in D3D12 H264 encoding usage: `-coder cabac` or `-coder ac` or `-coder 1` `-coder cavlc` or `-coder vlc` or `-coder 0` `-coder auto` or `-coder -1` sample command line: ``` .\ffmpeg.exe -hwaccel d3d12va -hwaccel_output_format d3d12 -i input.mp4 -c:v h264_d3d12va -coder cabac -y output.mp4 ``` --- libavcodec/d3d12va_encode_h264.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/libavcodec/d3d12va_encode_h264.c b/libavcodec/d3d12va_encode_h264.c index bcf5a326e5..8ac26c34f8 100644 --- a/libavcodec/d3d12va_encode_h264.c +++ b/libavcodec/d3d12va_encode_h264.c @@ -44,6 +44,7 @@ typedef struct D3D12VAEncodeH264Context { int qp; int profile; int level; + int coder; int idr_pic_id; // Writer structures. @@ -269,9 +270,24 @@ static int d3d12va_encode_h264_get_encoder_caps(AVCodecContext *avctx) config->ConfigurationFlags = D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_FLAG_NONE; - if (h264_caps.SupportFlags & D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT_H264_FLAG_CABAC_ENCODING_SUPPORT) { - config->ConfigurationFlags |= D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_FLAG_ENABLE_CABAC_ENCODING; - priv->unit_opts.cabac = 1; + // Entropy coder configuration + if (priv->coder == 1) { + if (h264_caps.SupportFlags & D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT_H264_FLAG_CABAC_ENCODING_SUPPORT) { + config->ConfigurationFlags |= D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_FLAG_ENABLE_CABAC_ENCODING; + priv->unit_opts.cabac = 1; + } else { + av_log(avctx, AV_LOG_ERROR, "CABAC entropy coding requested but not supported by driver.\n"); + return AVERROR(ENOTSUP); + } + } else if (priv->coder == 0) { + priv->unit_opts.cabac = 0; + } else { + if (h264_caps.SupportFlags & D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT_H264_FLAG_CABAC_ENCODING_SUPPORT) { + config->ConfigurationFlags |= D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_FLAG_ENABLE_CABAC_ENCODING; + priv->unit_opts.cabac = 1; + } else { + priv->unit_opts.cabac = 0; + } } base_ctx->surface_width = FFALIGN(avctx->width, 16); @@ -591,6 +607,14 @@ static const AVOption d3d12va_encode_h264_options[] = { { LEVEL("6.2", 62) }, #undef LEVEL + { "coder", "Entropy coder type", + OFFSET(coder), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, FLAGS, .unit = "coder" }, + { "auto", "Driver default", 0, AV_OPT_TYPE_CONST, { .i64 = -1 }, 0, 0, FLAGS, .unit = "coder" }, + { "cavlc", "CAVLC entropy coder", 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, 0, 0, FLAGS, .unit = "coder" }, + { "vlc", "VLC entropy coder (CAVLC)", 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, 0, 0, FLAGS, .unit = "coder" }, + { "cabac", "CABAC entropy coder", 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, 0, 0, FLAGS, .unit = "coder" }, + { "ac", "Arithmetic coder (CABAC)", 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, 0, 0, FLAGS, .unit = "coder" }, + { NULL }, }; -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]
