PR #25915 opened by dongnguyenminhanh URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/25915 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/25915.patch
For interlaced PAFF H.264 the second field references the first field, which shares the same output surface and thus the same reference only shadow resource. d3d12va_update_reference_frames_state() skipped the current resource when building barriers, so the shadow resource stayed in VIDEO_DECODE_WRITE while the decoder needed to read it as a reference. On AMD hardware this shows up as green block corruption, since compression metadata tracks resource state. Add a VIDEO_DECODE_WRITE to VIDEO_DECODE_READ barrier for the self reference case instead of skipping it, and transition it back to COMMON after DecodeFrame with the other barriers instead of back to VIDEO_DECODE_WRITE. Tested with interlaced H.264 50i content on AMD RX 7800 XT (VCN4). D3D11/DXVA2 is unaffected (no client managed barriers). Progressive content is unaffected since frames never self reference. >From 3b48e0d50f4cc58dfad152d175f93ca82d7daa1d Mon Sep 17 00:00:00 2001 From: Dong Nguyen <[email protected]> Date: Wed, 28 Oct 2026 12:32:13 -0400 Subject: [PATCH] avcodec/d3d12va_decode: fix interlaced PAFF H.264 decode corruption For interlaced PAFF H.264 the second field references the first field, which shares the same output surface and thus the same reference only shadow resource. d3d12va_update_reference_frames_state() skipped the current resource when building barriers, so the shadow resource stayed in VIDEO_DECODE_WRITE while the decoder needed to read it as a reference. On AMD hardware this shows up as green block corruption, since compression metadata tracks resource state. Add a VIDEO_DECODE_WRITE to VIDEO_DECODE_READ barrier for the self reference case instead of skipping it, and transition it back to COMMON after DecodeFrame with the other barriers instead of back to VIDEO_DECODE_WRITE. Tested with interlaced H.264 50i content on AMD RX 7800 XT (VCN4). D3D11/DXVA2 is unaffected (no client managed barriers). Progressive content is unaffected since frames never self reference. Signed-off-by: Dong Nguyen <[email protected]> --- libavcodec/d3d12va_decode.c | 66 +++++++++++++++++++++++++++++-------- 1 file changed, 52 insertions(+), 14 deletions(-) diff --git a/libavcodec/d3d12va_decode.c b/libavcodec/d3d12va_decode.c index 39feb3a623b..1a5e19ca4e8 100644 --- a/libavcodec/d3d12va_decode.c +++ b/libavcodec/d3d12va_decode.c @@ -545,24 +545,47 @@ av_cold int ff_d3d12va_decode_uninit(AVCodecContext *avctx) } static inline int d3d12va_update_reference_frames_state(AVCodecContext *avctx, D3D12_RESOURCE_BARRIER *barriers, - ID3D12Resource *current_resource, int state_before, int state_end) + ID3D12Resource *current_resource, int state_before, int state_end, + int *self_ref_barrier) { D3D12VADecodeContext *ctx = D3D12VA_DECODE_CONTEXT(avctx); ID3D12Resource **ref_resources = ctx->ref_only_resources ? ctx->ref_only_resources : ctx->ref_resources; int num_barrier = 0; + int self_ref_seen = 0; + + *self_ref_barrier = -1; + for (int i = 0; i < ctx->max_num_ref; i++) { - if (((ctx->used_mask >> i) & 0x1) && ref_resources[i] && ref_resources[i] != current_resource) { - barriers[num_barrier].Type = D3D12_RESOURCE_BARRIER_TYPE_TRANSITION; - barriers[num_barrier].Flags = D3D12_RESOURCE_BARRIER_FLAG_NONE; - barriers[num_barrier].Transition = (D3D12_RESOURCE_TRANSITION_BARRIER) { - .pResource = ref_resources[i], - .Subresource = D3D12_RESOURCE_BARRIER_ALL_SUBRESOURCES, - .StateBefore = state_before, - .StateAfter = state_end, - }; - num_barrier++; + int is_self_ref; + + if (!((ctx->used_mask >> i) & 0x1) || !ref_resources[i]) + continue; + + /* Field self reference (PAFF): the opposite parity field of the + * current frame shares current_resource's output surface. Promote + * it to a WRITE to READ transition instead of skipping it, once only + * even if it appears under more than one reference slot. */ + is_self_ref = (ref_resources[i] == current_resource); + if (is_self_ref && self_ref_seen) + continue; + + barriers[num_barrier].Type = D3D12_RESOURCE_BARRIER_TYPE_TRANSITION; + barriers[num_barrier].Flags = D3D12_RESOURCE_BARRIER_FLAG_NONE; + barriers[num_barrier].Transition.pResource = ref_resources[i]; + barriers[num_barrier].Transition.Subresource = D3D12_RESOURCE_BARRIER_ALL_SUBRESOURCES; + + if (is_self_ref) { + self_ref_seen = 1; + barriers[num_barrier].Transition.StateBefore = D3D12_RESOURCE_STATE_VIDEO_DECODE_WRITE; + barriers[num_barrier].Transition.StateAfter = D3D12_RESOURCE_STATE_VIDEO_DECODE_READ; + *self_ref_barrier = num_barrier; + } else { + barriers[num_barrier].Transition.StateBefore = state_before; + barriers[num_barrier].Transition.StateAfter = state_end; } + + num_barrier++; } return num_barrier; @@ -674,14 +697,29 @@ int ff_d3d12va_common_end_frame(AVCodecContext *avctx, AVFrame *frame, DX_CHECK(ID3D12VideoDecodeCommandList_Reset(cmd_list, command_allocator)); - num_barrier += d3d12va_update_reference_frames_state(avctx, &barriers[num_barrier], ref_resource, D3D12_RESOURCE_STATE_COMMON, D3D12_RESOURCE_STATE_VIDEO_DECODE_READ); + int ref_barrier_base = num_barrier; + int self_ref_barrier = -1; + + num_barrier += d3d12va_update_reference_frames_state(avctx, &barriers[num_barrier], ref_resource, + D3D12_RESOURCE_STATE_COMMON, D3D12_RESOURCE_STATE_VIDEO_DECODE_READ, + &self_ref_barrier); + if (self_ref_barrier >= 0) + self_ref_barrier += ref_barrier_base; ID3D12VideoDecodeCommandList_ResourceBarrier(cmd_list, num_barrier, barriers); ID3D12VideoDecodeCommandList_DecodeFrame(cmd_list, ctx->decoder, &output_args, &input_args); - for (int i = 0; i < num_barrier; i++) - FFSWAP(D3D12_RESOURCE_STATES, barriers[i].Transition.StateBefore, barriers[i].Transition.StateAfter); + for (int i = 0; i < num_barrier; i++) { + if (i == self_ref_barrier) { + /* This resource must drop back to COMMON like the others + * instead of bouncing back to WRITE through the swap. */ + barriers[i].Transition.StateBefore = D3D12_RESOURCE_STATE_VIDEO_DECODE_READ; + barriers[i].Transition.StateAfter = D3D12_RESOURCE_STATE_COMMON; + } else { + FFSWAP(D3D12_RESOURCE_STATES, barriers[i].Transition.StateBefore, barriers[i].Transition.StateAfter); + } + } ID3D12VideoDecodeCommandList_ResourceBarrier(cmd_list, num_barrier, barriers); -- 2.54.0 _______________________________________________ ffmpeg-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]
