Commit 2336853b authored by Dmitry Kovalev's avatar Dmitry Kovalev Committed by Gerrit Code Review
Browse files

Merge "Pre planes configuration cleanup."

parents 326b73e4 a8ba34d2
...@@ -2583,20 +2583,14 @@ static void encode_superblock(VP9_COMP *cpi, TOKENEXTRA **t, int output_enabled, ...@@ -2583,20 +2583,14 @@ static void encode_superblock(VP9_COMP *cpi, TOKENEXTRA **t, int output_enabled,
if (output_enabled) if (output_enabled)
sum_intra_stats(cm, mi); sum_intra_stats(cm, mi);
} else { } else {
int idx = cm->ref_frame_map[get_ref_frame_idx(cpi, mbmi->ref_frame[0])]; int ref;
YV12_BUFFER_CONFIG *ref_fb = &cm->yv12_fb[idx]; const int is_compound = has_second_ref(mbmi);
YV12_BUFFER_CONFIG *second_ref_fb = NULL; for (ref = 0; ref < 1 + is_compound; ++ref) {
if (has_second_ref(mbmi)) { YV12_BUFFER_CONFIG *cfg = &cm->yv12_fb[cm->ref_frame_map[
idx = cm->ref_frame_map[get_ref_frame_idx(cpi, mbmi->ref_frame[1])]; get_ref_frame_idx(cpi, mbmi->ref_frame[ref])]];
second_ref_fb = &cm->yv12_fb[idx]; setup_pre_planes(xd, ref, cfg, mi_row, mi_col, xd->scale_factors[ref]);
} }
assert(cm->frame_type != KEY_FRAME);
setup_pre_planes(xd, 0, ref_fb, mi_row, mi_col, xd->scale_factors[0]);
setup_pre_planes(xd, 1, second_ref_fb, mi_row, mi_col,
xd->scale_factors[1]);
vp9_build_inter_predictors_sb(xd, mi_row, mi_col, MAX(bsize, BLOCK_8X8)); vp9_build_inter_predictors_sb(xd, mi_row, mi_col, MAX(bsize, BLOCK_8X8));
} }
......
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