vp9: ignore frame_context_index field in key-/intraonly-frames.

Reproduces a bug to remain consistent with libvpx' behaviour.
9 years ago · ee729cc0ed
parent 6135aed0d2
commit ee729cc0ed
1 changed files with 2 additions and 0 deletions
--- a/libavcodec/vp9.c
+++ b/libavcodec/vp9.c
@ -642,6 +642,8 @@ static int decode_frame_header(AVCodecContext *ctx,
    s->s.h.refreshctx   = s->s.h.errorres ? 0 : get_bits1(&s->gb);
    s->s.h.parallelmode = s->s.h.errorres ? 1 : get_bits1(&s->gb);
    s->s.h.framectxid   = c = get_bits(&s->gb, 2);
+    if (s->s.h.keyframe || s->s.h.intraonly)
+        s->s.h.framectxid = 0; // BUG: libvpx ignores this field in keyframes

    /* loopfilter header data */
    if (s->s.h.keyframe || s->s.h.errorres || s->s.h.intraonly) {