Merge "Renaming refresh_entropy_probs to refresh_frame_context." into experimental

This commit is contained in:
Dmitry Kovalev
2013-04-30 10:21:24 -07:00
committed by Gerrit Code Review
5 changed files with 13 additions and 19 deletions

View File

@@ -1391,10 +1391,10 @@ int vp9_decode_frame(VP9D_COMP *pbi, const uint8_t **p_data_end) {
}
if (!pc->error_resilient_mode) {
pc->refresh_entropy_probs = vp9_read_bit(&header_bc);
pc->refresh_frame_context = vp9_read_bit(&header_bc);
pc->frame_parallel_decoding_mode = vp9_read_bit(&header_bc);
} else {
pc->refresh_entropy_probs = 0;
pc->refresh_frame_context = 0;
pc->frame_parallel_decoding_mode = 1;
}
@@ -1486,7 +1486,7 @@ int vp9_decode_frame(VP9D_COMP *pbi, const uint8_t **p_data_end) {
}
#endif
if (pc->refresh_entropy_probs)
if (pc->refresh_frame_context)
pc->frame_contexts[pc->frame_context_idx] = pc->fc;
*p_data_end = vp9_reader_find_end(&residual_bc);