diff options
| author | Ben Murdoch <benm@google.com> | 2015-01-16 13:22:35 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2015-01-16 13:22:35 +0000 |
| commit | 4c5e1b60846631285cc824dc9215892cc0ac89af (patch) | |
| tree | 48f1a4284af2818ba90ad2e1088b25ced3612961 | |
| parent | d79cb8cdf5a8090b3907d067cc572c11dc71c5ea (diff) | |
| parent | 6eaf29054986a2ae8a18b3c56d42e63371dc7e3f (diff) | |
| download | libvpx-4c5e1b60846631285cc824dc9215892cc0ac89af.tar.gz | |
Merge from Chromium at DEPS revision 40.0.2214.87webview-m40_r4webview-m40_r3webview-m40_r2webview-m40_r1ub-webview-m40-release
This commit was generated by merge_to_master.py.
Change-Id: I151e384461675513d2c69f802571715efac981fa
| -rw-r--r-- | source/libvpx/vp9/decoder/vp9_decoder.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/source/libvpx/vp9/decoder/vp9_decoder.c b/source/libvpx/vp9/decoder/vp9_decoder.c index baf6ab7..78eb36f 100644 --- a/source/libvpx/vp9/decoder/vp9_decoder.c +++ b/source/libvpx/vp9/decoder/vp9_decoder.c @@ -241,8 +241,19 @@ int vp9_receive_compressed_data(VP9Decoder *pbi, cm->new_fb_idx = get_free_fb(cm); 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 |