vp10: merge frame_parallel_decoding_mode and refresh_frame_context.

See issue 1030. The value of frame_parallel_decoding_mode was ignored
in vp9 if refresh_frame_context was 0, so instead make it a 3-member
enum where the dependency is obviously stated.

Change-Id: I37f0177e5759f54e2e6cc6217023d5681de92438
This commit is contained in:
Ronald S. Bultje
2015-09-08 14:20:48 -04:00
parent c92c50f2fe
commit d1474f02aa
5 changed files with 68 additions and 29 deletions

View File

@@ -1142,8 +1142,13 @@ static void write_uncompressed_header(VP10_COMP *cpi,
}
if (!cm->error_resilient_mode) {
vpx_wb_write_bit(wb, cm->refresh_frame_context);
vpx_wb_write_bit(wb, cm->frame_parallel_decoding_mode);
vpx_wb_write_bit(wb,
cm->refresh_frame_context != REFRESH_FRAME_CONTEXT_OFF);
#if CONFIG_MISC_FIXES
if (cm->refresh_frame_context != REFRESH_FRAME_CONTEXT_OFF)
#endif
vpx_wb_write_bit(wb, cm->refresh_frame_context !=
REFRESH_FRAME_CONTEXT_BACKWARD);
}
vpx_wb_write_literal(wb, cm->frame_context_idx, FRAME_CONTEXTS_LOG2);