shithub: libvpx

Download patch

ref: d5937cd268330da4e80683444bc463d2016c07ee
parent: 8f3db5f22e2f400f50f1ea050d17fe9bbbb272fe
parent: 6f7ab01451c3b1401a7a4823947d73f86aebe893
author: James Zern <jzern@google.com>
date: Wed Dec 3 09:30:55 EST 2014 

Merge "vp9: sync threads after a longjmp"


--- a/vp9/decoder/vp9_decoder.c
+++ b/vp9/decoder/vp9_decoder.c
@@ -273,8 +273,19 @@
   cm->cur_frame = &cm->frame_bufs[cm->new_fb_idx];
 
   if (setjmp(cm->error.jmp)) {
+    const VP9WorkerInterface *const winterface = vp9_get_worker_interface();
+    int i;
+
     pbi->need_resync = 1;
     cm->error.setjmp = 0;
+
+    // Synchronize all threads immediately as a subsequent decode call may
+    // cause a resize invalidating some allocations.
+    winterface->sync(&pbi->lf_worker);
+    for (i = 0; i < pbi->num_tile_workers; ++i) {
+      winterface->sync(&pbi->tile_workers[i]);
+    }
+
     vp9_clear_system_state();
 
     // We do not know if the missing frame(s) was supposed to update