summaryrefslogtreecommitdiff
path: root/vp9/common/vp9_onyxc_int.h
diff options
context:
space:
mode:
authorScott LaVarnway <slavarnway@google.com>2016-01-20 12:19:27 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2016-01-20 12:19:27 +0000
commita7e0b1ea0169c28bea4a11727bab54ee0d6f26ce (patch)
treea4fa9939916715254c9cf608f6db43c70cc9e6c1 /vp9/common/vp9_onyxc_int.h
parent3277d481ebe1cfa8f14006245554cf5745f9a257 (diff)
parent5232326716af469eafa6d98fba64f8154c69d9f8 (diff)
downloadlibvpx-a7e0b1ea0169c28bea4a11727bab54ee0d6f26ce.tar
libvpx-a7e0b1ea0169c28bea4a11727bab54ee0d6f26ce.tar.gz
libvpx-a7e0b1ea0169c28bea4a11727bab54ee0d6f26ce.tar.bz2
libvpx-a7e0b1ea0169c28bea4a11727bab54ee0d6f26ce.zip
Merge "VP9: Eliminate MB_MODE_INFO"
Diffstat (limited to 'vp9/common/vp9_onyxc_int.h')
-rw-r--r--vp9/common/vp9_onyxc_int.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/vp9/common/vp9_onyxc_int.h b/vp9/common/vp9_onyxc_int.h
index ceffdedf9..fd674cbc6 100644
--- a/vp9/common/vp9_onyxc_int.h
+++ b/vp9/common/vp9_onyxc_int.h
@@ -406,22 +406,17 @@ static INLINE void set_mi_row_col(MACROBLOCKD *xd, const TileInfo *const tile,
// Are edges available for intra prediction?
xd->up_available = (mi_row != 0);
xd->left_available = (mi_col > tile->mi_col_start);
+ // TODO(slavarnway): eliminate up/left available ???
if (xd->up_available) {
xd->above_mi = xd->mi[-xd->mi_stride];
- // above_mi may be NULL in VP9 encoder's first pass.
- xd->above_mbmi = xd->above_mi ? &xd->above_mi->mbmi : NULL;
} else {
xd->above_mi = NULL;
- xd->above_mbmi = NULL;
}
if (xd->left_available) {
xd->left_mi = xd->mi[-1];
- // left_mi may be NULL in VP9 encoder's first pass.
- xd->left_mbmi = xd->left_mi ? &xd->left_mi->mbmi : NULL;
} else {
xd->left_mi = NULL;
- xd->left_mbmi = NULL;
}
}