diff options
| author | Scott LaVarnway <slavarnway@google.com> | 2010-08-12 16:25:43 -0400 |
|---|---|---|
| committer | Scott LaVarnway <slavarnway@google.com> | 2010-08-12 16:25:43 -0400 |
| commit | 9c7a0090e0c8e4dda45570d273b9cd228b58e9d6 (patch) | |
| tree | 53ffc762ba908ace52f0ba20f86e16a80e5e9d7e /vp8/encoder/quantize.c | |
| parent | f5615b6149037aa1c18703d6272c7273c43b5c6a (diff) | |
| download | libvpx-9c7a0090e0c8e4dda45570d273b9cd228b58e9d6.tar libvpx-9c7a0090e0c8e4dda45570d273b9cd228b58e9d6.tar.gz libvpx-9c7a0090e0c8e4dda45570d273b9cd228b58e9d6.tar.bz2 libvpx-9c7a0090e0c8e4dda45570d273b9cd228b58e9d6.zip | |
Removed unnecessary MB_MODE_INFO copies
These copies occurred for each macroblock in the encoder and decoder.
Thetemp MB_MODE_INFO mbmi was removed from MACROBLOCKD. As a result,
a large number compile errors had to be fixed.
Change-Id: I4cf0ffae3ce244f6db04a4c217d52dd256382cf3
Diffstat (limited to 'vp8/encoder/quantize.c')
| -rw-r--r-- | vp8/encoder/quantize.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/vp8/encoder/quantize.c b/vp8/encoder/quantize.c index 353217c93..2ea16d8f0 100644 --- a/vp8/encoder/quantize.c +++ b/vp8/encoder/quantize.c @@ -277,34 +277,34 @@ void vp8_strict_quantize_b(BLOCK *b, BLOCKD *d) void vp8_quantize_mby(MACROBLOCK *x) { int i; - int has_2nd_order = (x->e_mbd.mbmi.mode != B_PRED - && x->e_mbd.mbmi.mode != SPLITMV); + int has_2nd_order = (x->e_mbd.mode_info_context->mbmi.mode != B_PRED + && x->e_mbd.mode_info_context->mbmi.mode != SPLITMV); for (i = 0; i < 16; i++) { x->quantize_b(&x->block[i], &x->e_mbd.block[i]); - x->e_mbd.mbmi.mb_skip_coeff &= + x->e_mbd.mode_info_context->mbmi.mb_skip_coeff &= (x->e_mbd.block[i].eob <= has_2nd_order); } if(has_2nd_order) { x->quantize_b(&x->block[24], &x->e_mbd.block[24]); - x->e_mbd.mbmi.mb_skip_coeff &= (!x->e_mbd.block[24].eob); + x->e_mbd.mode_info_context->mbmi.mb_skip_coeff &= (!x->e_mbd.block[24].eob); } } void vp8_quantize_mb(MACROBLOCK *x) { int i; - int has_2nd_order=(x->e_mbd.mbmi.mode != B_PRED - && x->e_mbd.mbmi.mode != SPLITMV); + int has_2nd_order=(x->e_mbd.mode_info_context->mbmi.mode != B_PRED + && x->e_mbd.mode_info_context->mbmi.mode != SPLITMV); - x->e_mbd.mbmi.mb_skip_coeff = 1; + x->e_mbd.mode_info_context->mbmi.mb_skip_coeff = 1; for (i = 0; i < 24+has_2nd_order; i++) { x->quantize_b(&x->block[i], &x->e_mbd.block[i]); - x->e_mbd.mbmi.mb_skip_coeff &= + x->e_mbd.mode_info_context->mbmi.mb_skip_coeff &= (x->e_mbd.block[i].eob <= (has_2nd_order && i<16)); } } @@ -317,6 +317,6 @@ void vp8_quantize_mbuv(MACROBLOCK *x) for (i = 16; i < 24; i++) { x->quantize_b(&x->block[i], &x->e_mbd.block[i]); - x->e_mbd.mbmi.mb_skip_coeff &= (!x->e_mbd.block[i].eob); + x->e_mbd.mode_info_context->mbmi.mb_skip_coeff &= (!x->e_mbd.block[i].eob); } } |