diff options
| author | Deb Mukherjee <debargha@google.com> | 2012-10-15 16:41:41 -0700 |
|---|---|---|
| committer | Deb Mukherjee <debargha@google.com> | 2012-10-19 06:58:15 -0700 |
| commit | f3208f362b0a08b815a3439c7d71890eef49f174 (patch) | |
| tree | 744eee097bc63243b18b532a2995d5a12f12a600 /vp8/encoder/quantize.c | |
| parent | b44397ebcdc714965f7c12f9512164d2cb3c1aa1 (diff) | |
| download | libvpx-f3208f362b0a08b815a3439c7d71890eef49f174.tar libvpx-f3208f362b0a08b815a3439c7d71890eef49f174.tar.gz libvpx-f3208f362b0a08b815a3439c7d71890eef49f174.tar.bz2 libvpx-f3208f362b0a08b815a3439c7d71890eef49f174.zip | |
Some cleanups and fixes.
Separates the logic on transform type selection previously spread out
over a number of files into a separate function. Currently the tx_type
field in b_mode_info is not used, but still left in there to eventually
use for signaling the transform type in the bitstream.
Also, now for tx_type = DCT_DCT, the regular integer DCT is used, as
opposed to the floating point DCT used in conjuction with hybrid
transform.
Results change somewhat due to the transform change, but are within
reasonable limits. The hd/std-hd sets are slightly up, while derf/yt
are slightly down.
Change-Id: I5776840c2239ca2da31ca6cfd7fd1148dc5f9e0f
Diffstat (limited to 'vp8/encoder/quantize.c')
| -rw-r--r-- | vp8/encoder/quantize.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vp8/encoder/quantize.c b/vp8/encoder/quantize.c index 8ae3029ee..b6a1f27f8 100644 --- a/vp8/encoder/quantize.c +++ b/vp8/encoder/quantize.c @@ -22,7 +22,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 +39,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; @@ -653,12 +653,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 |