Commit 6db81fd6 authored by James Zern's avatar James Zern

vp9: fix frame-parallel encoding

the flag in the header wasn't being set based on the encoder
configuration in non-intra only mode

broken since:
fbc2fbf4 Adding oxcf temp variable.

Change-Id: Ib4cff9901889824bc4e68d7f0f6deb1e41df2f53
parent eaa6deee
......@@ -3179,6 +3179,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) {
......@@ -3186,7 +3187,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;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment