diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-03-26 19:16:44 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-03-26 19:16:44 -0700 |
| commit | 3c77ab4c0ff53fec33b21f8f0c55bd083697770e (patch) | |
| tree | 737a573415d88f6c55a514c259cb482d4995eaf1 /vp9/encoder/vp9_rdopt.c | |
| parent | c6efbbcfe40ca321f5cb7735e104feb6b7991e4e (diff) | |
| parent | 3120dbddb12b6299c2d4f2b09c529c6fb2633c47 (diff) | |
| download | libvpx-3c77ab4c0ff53fec33b21f8f0c55bd083697770e.tar libvpx-3c77ab4c0ff53fec33b21f8f0c55bd083697770e.tar.gz libvpx-3c77ab4c0ff53fec33b21f8f0c55bd083697770e.tar.bz2 libvpx-3c77ab4c0ff53fec33b21f8f0c55bd083697770e.zip | |
Merge "Redo banding for all transforms." into experimental
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 5386fbedf..177584956 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -565,12 +565,12 @@ static INLINE int cost_coeffs(VP9_COMMON *const cm, MACROBLOCK *mb, nzc += (v != 0); #endif token_cache[c] = t; - cost += token_costs[get_coef_band(tx_size, c)][pt][t]; + cost += token_costs[get_coef_band(scan, tx_size, c)][pt][t]; cost += vp9_dct_value_cost_ptr[v]; #if !CONFIG_CODE_NONZEROCOUNT if (!c || token_cache[c - 1]) cost += vp9_cost_bit(coef_probs[type][ref] - [get_coef_band(tx_size, c)] + [get_coef_band(scan, tx_size, c)] [pt][0], 1); #endif pt = vp9_get_coef_context(scan, nb, pad, token_cache, c, default_eob); @@ -579,8 +579,9 @@ static INLINE int cost_coeffs(VP9_COMMON *const cm, MACROBLOCK *mb, cost += nzc_cost[nzc]; #else if (c < seg_eob) - cost += mb->token_costs[tx_size][type][ref][get_coef_band(tx_size, c)] - [pt][DCT_EOB_TOKEN]; + cost += mb->token_costs[tx_size][type][ref] + [get_coef_band(scan, tx_size, c)] + [pt][DCT_EOB_TOKEN]; #endif } |