diff options
Diffstat (limited to 'vp8/encoder/quantize.c')
-rw-r--r-- | vp8/encoder/quantize.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/vp8/encoder/quantize.c b/vp8/encoder/quantize.c index 8ae3029ee..16b4e6e1d 100644 --- a/vp8/encoder/quantize.c +++ b/vp8/encoder/quantize.c @@ -21,8 +21,7 @@ extern int enc_debug; #endif -#if CONFIG_HYBRIDTRANSFORM -void vp8_ht_quantize_b_4x4(BLOCK *b, BLOCKD *d) { +void vp8_ht_quantize_b_4x4(BLOCK *b, BLOCKD *d, TX_TYPE tx_type) { int i, rc, eob; int zbin; int x, y, z, sz; @@ -39,7 +38,7 @@ void vp8_ht_quantize_b_4x4(BLOCK *b, BLOCKD *d) { int const *pt_scan ; - switch(d->bmi.as_mode.tx_type) { + switch (tx_type) { case ADST_DCT : pt_scan = vp8_row_scan; break; @@ -85,7 +84,6 @@ void vp8_ht_quantize_b_4x4(BLOCK *b, BLOCKD *d) { d->eob = eob + 1; } -#endif void vp8_regular_quantize_b_4x4(BLOCK *b, BLOCKD *d) { int i, rc, eob; @@ -653,12 +651,12 @@ void vp8cx_mb_init_quantizer(VP8_COMP *cpi, MACROBLOCK *x) { } /* save this macroblock QIndex for vp8_update_zbin_extra() */ - x->q_index = QIndex; + x->e_mbd.q_index = QIndex; } void vp8_update_zbin_extra(VP8_COMP *cpi, MACROBLOCK *x) { int i; - int QIndex = x->q_index; + int QIndex = x->e_mbd.q_index; int zbin_extra; // Y |