diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2012-12-18 10:49:10 -0800 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@google.com> | 2012-12-18 10:49:10 -0800 |
| commit | 8986eb5c26bb19e9e797819a72102e1061b68d74 (patch) | |
| tree | 7c79e5f107f2e426a1e101221a91e2d863898fdb /vp9/encoder/vp9_tokenize.c | |
| parent | ebb5f2f7bd27f1d0bb2b8f49ed717c85b9d49c95 (diff) | |
| download | libvpx-8986eb5c26bb19e9e797819a72102e1061b68d74.tar libvpx-8986eb5c26bb19e9e797819a72102e1061b68d74.tar.gz libvpx-8986eb5c26bb19e9e797819a72102e1061b68d74.tar.bz2 libvpx-8986eb5c26bb19e9e797819a72102e1061b68d74.zip | |
Give 4x4 scan and coef_band tables a _4x4 suffix.
This matches the names of tables for all other transform sizes.
Change-Id: Ia7681b7f8d34c97c27b0eb0e34d490cd0f8d02c6
Diffstat (limited to 'vp9/encoder/vp9_tokenize.c')
| -rw-r--r-- | vp9/encoder/vp9_tokenize.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/vp9/encoder/vp9_tokenize.c b/vp9/encoder/vp9_tokenize.c index fb9e3ed72..796d108cd 100644 --- a/vp9/encoder/vp9_tokenize.c +++ b/vp9/encoder/vp9_tokenize.c @@ -134,15 +134,15 @@ static void tokenize_b(VP9_COMP *cpi, default: case TX_4X4: seg_eob = 16; - bands = vp9_coef_bands; - scan = vp9_default_zig_zag1d; + bands = vp9_coef_bands_4x4; + scan = vp9_default_zig_zag1d_4x4; if (tx_type != DCT_DCT) { counts = cpi->hybrid_coef_counts_4x4; probs = cpi->common.fc.hybrid_coef_probs_4x4; if (tx_type == ADST_DCT) { - scan = vp9_row_scan; + scan = vp9_row_scan_4x4; } else if (tx_type == DCT_ADST) { - scan = vp9_col_scan; + scan = vp9_col_scan_4x4; } } else { counts = cpi->coef_counts_4x4; @@ -152,8 +152,8 @@ static void tokenize_b(VP9_COMP *cpi, case TX_8X8: if (type == PLANE_TYPE_Y2) { seg_eob = 4; - bands = vp9_coef_bands; - scan = vp9_default_zig_zag1d; + bands = vp9_coef_bands_4x4; + scan = vp9_default_zig_zag1d_4x4; } else { #if CONFIG_CNVCONTEXT a_ec = (a[0] + a[1]) != 0; @@ -729,7 +729,7 @@ static __inline void stuff_b(VP9_COMP *cpi, switch (tx_size) { default: case TX_4X4: - bands = vp9_coef_bands; + bands = vp9_coef_bands_4x4; if (tx_type != DCT_DCT) { counts = cpi->hybrid_coef_counts_4x4; probs = cpi->common.fc.hybrid_coef_probs_4x4; |