From 8986eb5c26bb19e9e797819a72102e1061b68d74 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Tue, 18 Dec 2012 10:49:10 -0800 Subject: Give 4x4 scan and coef_band tables a _4x4 suffix. This matches the names of tables for all other transform sizes. Change-Id: Ia7681b7f8d34c97c27b0eb0e34d490cd0f8d02c6 --- vp9/encoder/vp9_quantize.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'vp9/encoder/vp9_quantize.c') diff --git a/vp9/encoder/vp9_quantize.c b/vp9/encoder/vp9_quantize.c index fcc7d2948..1f5f8f72d 100644 --- a/vp9/encoder/vp9_quantize.c +++ b/vp9/encoder/vp9_quantize.c @@ -40,15 +40,15 @@ void vp9_ht_quantize_b_4x4(BLOCK *b, BLOCKD *d, TX_TYPE tx_type) { switch (tx_type) { case ADST_DCT : - pt_scan = vp9_row_scan; + pt_scan = vp9_row_scan_4x4; break; case DCT_ADST : - pt_scan = vp9_col_scan; + pt_scan = vp9_col_scan_4x4; break; default : - pt_scan = vp9_default_zig_zag1d; + pt_scan = vp9_default_zig_zag1d_4x4; break; } @@ -106,7 +106,7 @@ void vp9_regular_quantize_b_4x4(BLOCK *b, BLOCKD *d) { eob = -1; for (i = 0; i < b->eob_max_offset; i++) { - rc = vp9_default_zig_zag1d[i]; + rc = vp9_default_zig_zag1d_4x4[i]; z = coeff_ptr[rc]; zbin = zbin_ptr[rc] + *zbin_boost_ptr + zbin_oq_value; @@ -192,7 +192,7 @@ void vp9_regular_quantize_b_2x2(BLOCK *b, BLOCKD *d) { eob = -1; for (i = 0; i < b->eob_max_offset_8x8; i++) { - rc = vp9_default_zig_zag1d[i]; + rc = vp9_default_zig_zag1d_4x4[i]; z = coeff_ptr[rc]; zbin_boost_ptr = &b->zrun_zbin_boost[zbin_zrun_index]; @@ -606,7 +606,7 @@ void vp9_init_quantizer(VP9_COMP *cpi) { // all the 4x4 ac values =; for (i = 1; i < 16; i++) { - int rc = vp9_default_zig_zag1d[i]; + int rc = vp9_default_zig_zag1d_4x4[i]; quant_val = vp9_ac_yquant(Q); invert_quant(cpi->Y1quant[Q] + rc, -- cgit v1.2.3