vp9: fix show-existing-frames for multi-threading.
authorRonald S. Bultje <rsbultje@gmail.com>
Thu, 30 Apr 2015 20:03:10 +0000 (22:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 30 Apr 2015 21:32:09 +0000 (23:32 +0200)
This also fixes intra-only MT failures (it was the same bug), see trac
4526 and 4527.

Tested-by: James Almer <jamrial@gmail.com>
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/vp9.c

index 1310798..84e2220 100644 (file)
@@ -3767,6 +3767,13 @@ static int vp9_decode_frame(AVCodecContext *ctx, void *frame,
             return res;
         ((AVFrame *)frame)->pkt_pts = pkt->pts;
         ((AVFrame *)frame)->pkt_dts = pkt->dts;
+        for (i = 0; i < 8; i++) {
+            if (s->next_refs[i].f->data[0])
+                ff_thread_release_buffer(ctx, &s->next_refs[i]);
+            if (s->refs[i].f->data[0] &&
+                (res = ff_thread_ref_frame(&s->next_refs[i], &s->refs[i])) < 0)
+                return res;
+        }
         *got_frame = 1;
         return pkt->size;
     }