summaryrefslogtreecommitdiff
path: root/vp9/encoder/vp9_rd.c
diff options
context:
space:
mode:
authorScott LaVarnway <slavarnway@google.com>2015-04-21 05:36:58 -0700
committerScott LaVarnway <slavarnway@google.com>2015-04-21 11:16:45 -0700
commit8b17f7f4eb86107ac9ed9e31a2a8bba238a1247a (patch)
treec1930ad55f268550bfa0fa10f7b2bb0b589d212a /vp9/encoder/vp9_rd.c
parent924d06a0755fdbdd90883f3fcc16b837f00362d1 (diff)
downloadlibvpx-8b17f7f4eb86107ac9ed9e31a2a8bba238a1247a.tar
libvpx-8b17f7f4eb86107ac9ed9e31a2a8bba238a1247a.tar.gz
libvpx-8b17f7f4eb86107ac9ed9e31a2a8bba238a1247a.tar.bz2
libvpx-8b17f7f4eb86107ac9ed9e31a2a8bba238a1247a.zip
Revert "Remove mi_grid_* structures."
(see I3a05cf1610679fed26e0b2eadd315a9ae91afdd6) For the test clip used, the decoder performance improved by ~2%. This is also an intermediate step towards adding back the mode_info streams. Change-Id: Idddc4a3f46e4180fbebddc156c4bbf177d5c2e0d
Diffstat (limited to 'vp9/encoder/vp9_rd.c')
-rw-r--r--vp9/encoder/vp9_rd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_rd.c b/vp9/encoder/vp9_rd.c
index bbf70ead5..a2a4808da 100644
--- a/vp9/encoder/vp9_rd.c
+++ b/vp9/encoder/vp9_rd.c
@@ -450,7 +450,7 @@ void vp9_mv_pred(VP9_COMP *cpi, MACROBLOCK *x,
uint8_t *ref_y_buffer, int ref_y_stride,
int ref_frame, BLOCK_SIZE block_size) {
MACROBLOCKD *xd = &x->e_mbd;
- MB_MODE_INFO *mbmi = &xd->mi[0].src_mi->mbmi;
+ MB_MODE_INFO *mbmi = &xd->mi[0]->mbmi;
int i;
int zero_seen = 0;
int best_index = 0;
@@ -550,7 +550,7 @@ YV12_BUFFER_CONFIG *vp9_get_scaled_ref_frame(const VP9_COMP *cpi,
}
int vp9_get_switchable_rate(const VP9_COMP *cpi, const MACROBLOCKD *const xd) {
- const MB_MODE_INFO *const mbmi = &xd->mi[0].src_mi->mbmi;
+ const MB_MODE_INFO *const mbmi = &xd->mi[0]->mbmi;
const int ctx = vp9_get_pred_context_switchable_interp(xd);
return SWITCHABLE_INTERP_RATE_FACTOR *
cpi->switchable_interp_costs[ctx][mbmi->interp_filter];