diff options
| author | Paul Wilkins <paulwilkins@google.com> | 2013-05-22 14:09:55 +0100 |
|---|---|---|
| committer | Paul Wilkins <paulwilkins@google.com> | 2013-05-23 13:09:27 +0100 |
| commit | 33ecd6ad548f9e8c34c695fcef0c822164ec9fae (patch) | |
| tree | df608d922acfbc7d727bab2bcf6b4a31f910cf52 /vp9/encoder | |
| parent | 7ac5ac52f917380ca3ed51757efad0b157bb08e9 (diff) | |
| download | libvpx-33ecd6ad548f9e8c34c695fcef0c822164ec9fae.tar libvpx-33ecd6ad548f9e8c34c695fcef0c822164ec9fae.tar.gz libvpx-33ecd6ad548f9e8c34c695fcef0c822164ec9fae.tar.bz2 libvpx-33ecd6ad548f9e8c34c695fcef0c822164ec9fae.zip | |
Merge Scatter Scan experiment.
Removal from under configure flag.
A bit renaming
Change-Id: I2213229dfe852001dfec16b149f47c52ce88f3aa
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_encodemb.c | 2 | ||||
| -rw-r--r-- | vp9/encoder/vp9_quantize.c | 4 | ||||
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 2 | ||||
| -rw-r--r-- | vp9/encoder/vp9_tokenize.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/vp9/encoder/vp9_encodemb.c b/vp9/encoder/vp9_encodemb.c index a4991f21a..3f2061c64 100644 --- a/vp9/encoder/vp9_encodemb.c +++ b/vp9/encoder/vp9_encodemb.c @@ -167,7 +167,7 @@ static void optimize_b(VP9_COMMON *const cm, MACROBLOCK *mb, break; } case TX_32X32: - scan = vp9_default_zig_zag1d_32x32; + scan = vp9_default_scan_32x32; default_eob = 1024; band_translate = vp9_coefband_trans_8x8plus; break; diff --git a/vp9/encoder/vp9_quantize.c b/vp9/encoder/vp9_quantize.c index 9beda3466..53d8be775 100644 --- a/vp9/encoder/vp9_quantize.c +++ b/vp9/encoder/vp9_quantize.c @@ -93,7 +93,7 @@ void vp9_quantize(MACROBLOCK *mb, int plane, int block, int n_coeffs, scan = get_scan_16x16(tx_type); break; default: - scan = vp9_default_zig_zag1d_32x32; + scan = vp9_default_scan_32x32; break; } @@ -197,7 +197,7 @@ void vp9_init_quantizer(VP9_COMP *cpi) { #endif // all the 4x4 ac values =; for (i = 1; i < 16; i++) { - int rc = vp9_default_zig_zag1d_4x4[i]; + int rc = vp9_default_scan_4x4[i]; invert_quant(cpi->y_quant[q] + rc, cpi->y_quant_shift[q] + rc, quant_val); cpi->y_zbin[q][rc] = ROUND_POWER_OF_TWO(qzbin_factor * quant_val, 7); diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 51f2e47b5..815fa05d7 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -329,7 +329,7 @@ static INLINE int cost_coeffs(VP9_COMMON *const cm, MACROBLOCK *mb, break; } case TX_32X32: - scan = vp9_default_zig_zag1d_32x32; + scan = vp9_default_scan_32x32; vp9_model_to_full_probs_sb(cm->fc.coef_probs_32x32[type][ref], coef_probs); seg_eob = 1024; diff --git a/vp9/encoder/vp9_tokenize.c b/vp9/encoder/vp9_tokenize.c index 759d4bb64..08efc84d4 100644 --- a/vp9/encoder/vp9_tokenize.c +++ b/vp9/encoder/vp9_tokenize.c @@ -186,7 +186,7 @@ static void tokenize_b(int plane, int block, BLOCK_SIZE_TYPE bsize, above_ec = (A[0] + A[1] + A[2] + A[3] + A[4] + A[5] + A[6] + A[7]) != 0; left_ec = (L[0] + L[1] + L[2] + L[3] + L[4] + L[5] + L[6] + L[7]) != 0; seg_eob = 1024; - scan = vp9_default_zig_zag1d_32x32; + scan = vp9_default_scan_32x32; counts = cpi->coef_counts_32x32; coef_probs = cpi->common.fc.coef_probs_32x32; band_translate = vp9_coefband_trans_8x8plus; |