Fix frame-parallel modes

This fix is already incorporated in master.

Change-Id: I7b0c048ebef4d92f041cc8727bc276843f17d50d
This commit is contained in:
Deb Mukherjee 2014-12-27 01:55:27 -08:00
parent 9aa76fdb69
commit 2b959d4ee8

View File

@ -2950,6 +2950,7 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi,
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) {
@ -2957,7 +2958,6 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi,
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;
}