Skip to content

Commit

Permalink
lavc/vp9: reset segmentation fields when segmentation isn't enabled
Browse files Browse the repository at this point in the history
Fields under the segmentation switch are never reset on a new frame, and
retain the value from the previous frame. This bugs out a bunch of
hwaccel drivers when segmentation is disabled but update_map isn't
reset because they don't ignore values behind switches. This commit also
resets the temporal field, though it may not be required.

We also do this for vp8 [1] so this commit is just mirroring the vp8
logic.

This fixes an issue with certain samples [2] that causes blocky
artifacts with vaapi, d3d11va and cuda (and possibly others).
Mesa worked around [3] this by ignoring these fields if
segmentation.enabled is 0, but d3d11va still displays blocky artifacts.

[1] https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/2e877090f958131accb8c7e5ac10e5b9865d1735:/libavcodec/vp8.c#l797
[2] mpv-player/mpv#13533
[3] https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27816

Signed-off-by: llyyr <llyyr.public@gmail.com>
  • Loading branch information
llyyr authored and Nevcairiel committed May 27, 2024
1 parent 01c7f68 commit 2b11a8b
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions libavcodec/vp9.c
Original file line number Diff line number Diff line change
Expand Up @@ -709,6 +709,12 @@ static int decode_frame_header(AVCodecContext *avctx,
s->s.h.segmentation.feat[i].skip_enabled = get_bits1(&s->gb);
}
}
} else {
// Reset fields under segmentation switch if segmentation is disabled.
// This is necessary because some hwaccels don't ignore these fields
// if segmentation is disabled.
s->s.h.segmentation.temporal = 0;
s->s.h.segmentation.update_map = 0;
}

// set qmul[] based on Y/UV, AC/DC and segmentation Q idx deltas
Expand Down

0 comments on commit 2b11a8b

Please sign in to comment.