shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp9: fix frame-parallel encoding"

--- a/vp9/encoder/vp9_encoder.c

+++ b/vp9/encoder/vp9_encoder.c

@@ -3179,6 +3179,7 @@

     cpi->rc.source_alt_ref_active = 0;

     cm->error_resilient_mode = oxcf->error_resilient_mode;

+    cm->frame_parallel_decoding_mode = oxcf->frame_parallel_decoding_mode;

     // By default, encoder assumes decoder can use prev_mi.

     if (cm->error_resilient_mode) {

@@ -3186,7 +3187,6 @@

       cm->reset_frame_context = 0;

       cm->refresh_frame_context = 0;

     } else if (cm->intra_only) {

-      cm->frame_parallel_decoding_mode = oxcf->frame_parallel_decoding_mode;

       // Only reset the current context.

       cm->reset_frame_context = 2;

     }