summaryrefslogtreecommitdiff
path: root/vp8/encoder/encodeintra.c
diff options
context:
space:
mode:
authorPaul Wilkins <paulwilkins@google.com>2012-08-10 14:12:43 +0100
committerPaul Wilkins <paulwilkins@google.com>2012-08-10 14:12:43 +0100
commitbd9e5eceb8f0e29d8c17140e2c43594ee132243b (patch)
tree340d875561d860e3c6cb637ffcd0cc0123f42531 /vp8/encoder/encodeintra.c
parentbf474e170fefbed60cf20fa3d2e9e229776469f0 (diff)
downloadlibvpx-bd9e5eceb8f0e29d8c17140e2c43594ee132243b.tar
libvpx-bd9e5eceb8f0e29d8c17140e2c43594ee132243b.tar.gz
libvpx-bd9e5eceb8f0e29d8c17140e2c43594ee132243b.tar.bz2
libvpx-bd9e5eceb8f0e29d8c17140e2c43594ee132243b.zip
Code cleanup.
Add local variable in several places to reference the MB mode info structure. Currently this is usually accessed in the code as x->e_mbd.mode_info_context->mbmi.* or in some places xd->mode_info_context->mbmi.* Resolved some uses of x-> for the MACROBLOCKD structure. Rebased without dependency on motion reference experiment. Change-Id: If6718276ee4f2ef131825d1524dfdb02a3793aed
Diffstat (limited to 'vp8/encoder/encodeintra.c')
-rw-r--r--vp8/encoder/encodeintra.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/vp8/encoder/encodeintra.c b/vp8/encoder/encodeintra.c
index c40490163..70ef55a1b 100644
--- a/vp8/encoder/encodeintra.c
+++ b/vp8/encoder/encodeintra.c
@@ -39,15 +39,16 @@ extern void vp8_ht_quantize_b(BLOCK *b, BLOCKD *d);
int vp8_encode_intra(VP8_COMP *cpi, MACROBLOCK *x, int use_16x16_pred) {
int i;
int intra_pred_var = 0;
+ MB_MODE_INFO * mbmi = &x->e_mbd.mode_info_context->mbmi;
(void) cpi;
if (use_16x16_pred) {
- x->e_mbd.mode_info_context->mbmi.mode = DC_PRED;
+ mbmi->mode = DC_PRED;
#if CONFIG_COMP_INTRA_PRED
- x->e_mbd.mode_info_context->mbmi.second_mode = (MB_PREDICTION_MODE)(DC_PRED - 1);
+ mbmi->second_mode = (MB_PREDICTION_MODE)(DC_PRED - 1);
#endif
- x->e_mbd.mode_info_context->mbmi.uv_mode = DC_PRED;
- x->e_mbd.mode_info_context->mbmi.ref_frame = INTRA_FRAME;
+ mbmi->uv_mode = DC_PRED;
+ mbmi->ref_frame = INTRA_FRAME;
vp8_encode_intra16x16mby(IF_RTCD(&cpi->rtcd), x);
} else {