diff options
Diffstat (limited to 'vp8/encoder/quantize.c')
| -rw-r--r-- | vp8/encoder/quantize.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/vp8/encoder/quantize.c b/vp8/encoder/quantize.c index 7bdacc07d..33c8ef055 100644 --- a/vp8/encoder/quantize.c +++ b/vp8/encoder/quantize.c @@ -588,19 +588,19 @@ void vp8cx_init_quantizer(VP8_COMP *cpi) #define ZBIN_EXTRA_Y \ (( cpi->common.Y1dequant[QIndex][1] * \ ( x->zbin_over_quant + \ - cpi->zbin_mode_boost + \ + x->zbin_mode_boost + \ x->act_zbin_adj ) ) >> 7) #define ZBIN_EXTRA_UV \ (( cpi->common.UVdequant[QIndex][1] * \ ( x->zbin_over_quant + \ - cpi->zbin_mode_boost + \ + x->zbin_mode_boost + \ x->act_zbin_adj ) ) >> 7) #define ZBIN_EXTRA_Y2 \ (( cpi->common.Y2dequant[QIndex][1] * \ ( (x->zbin_over_quant / 2) + \ - cpi->zbin_mode_boost + \ + x->zbin_mode_boost + \ x->act_zbin_adj ) ) >> 7) void vp8cx_mb_init_quantizer(VP8_COMP *cpi, MACROBLOCK *x, int ok_to_skip) @@ -703,14 +703,14 @@ void vp8cx_mb_init_quantizer(VP8_COMP *cpi, MACROBLOCK *x, int ok_to_skip) x->q_index = QIndex; x->last_zbin_over_quant = x->zbin_over_quant; - cpi->last_zbin_mode_boost = cpi->zbin_mode_boost; + x->last_zbin_mode_boost = x->zbin_mode_boost; x->last_act_zbin_adj = x->act_zbin_adj; } else if(x->last_zbin_over_quant != x->zbin_over_quant - || cpi->last_zbin_mode_boost != cpi->zbin_mode_boost + || x->last_zbin_mode_boost != x->zbin_mode_boost || x->last_act_zbin_adj != x->act_zbin_adj) { /* Y */ @@ -730,7 +730,7 @@ void vp8cx_mb_init_quantizer(VP8_COMP *cpi, MACROBLOCK *x, int ok_to_skip) x->block[24].zbin_extra = (short)zbin_extra; x->last_zbin_over_quant = x->zbin_over_quant; - cpi->last_zbin_mode_boost = cpi->zbin_mode_boost; + x->last_zbin_mode_boost = x->zbin_mode_boost; x->last_act_zbin_adj = x->act_zbin_adj; } } @@ -764,7 +764,7 @@ void vp8_update_zbin_extra(VP8_COMP *cpi, MACROBLOCK *x) void vp8cx_frame_init_quantizer(VP8_COMP *cpi) { /* Clear Zbin mode boost for default case */ - cpi->zbin_mode_boost = 0; + cpi->mb.zbin_mode_boost = 0; /* MB level quantizer setup */ vp8cx_mb_init_quantizer(cpi, &cpi->mb, 0); |