[FFmpeg-cvslog] vp9: fix show-existing-frames for multi-threading.

Ronald S. Bultje git at videolan.org
Thu Apr 30 23:32:26 CEST 2015


ffmpeg | branch: master | Ronald S. Bultje <rsbultje at gmail.com> | Thu Apr 30 22:03:10 2015 +0200| [5935513c0ed1563a654b2e40d053f824bae93e6b] | committer: Michael Niedermayer

vp9: fix show-existing-frames for multi-threading.

This also fixes intra-only MT failures (it was the same bug), see trac
4526 and 4527.

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5935513c0ed1563a654b2e40d053f824bae93e6b
---

 libavcodec/vp9.c |    7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c
index 1310798..84e2220 100644
--- a/libavcodec/vp9.c
+++ b/libavcodec/vp9.c
@@ -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;
     }



More information about the ffmpeg-cvslog mailing list