diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-03-28 12:53:00 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-03-28 12:53:00 -0700 |
| commit | 6cb2fcf601b98875ec8b6e40823f7156b046e04b (patch) | |
| tree | ab5838fff42787b6b503295695f02833cbe64322 /vp9/encoder | |
| parent | e071fe15b20f73014b529f1ef3bdf66f55aec023 (diff) | |
| parent | 9eea9fa20637df99da6d7a70fb89a6dfb415c33d (diff) | |
| download | libvpx-6cb2fcf601b98875ec8b6e40823f7156b046e04b.tar libvpx-6cb2fcf601b98875ec8b6e40823f7156b046e04b.tar.gz libvpx-6cb2fcf601b98875ec8b6e40823f7156b046e04b.tar.bz2 libvpx-6cb2fcf601b98875ec8b6e40823f7156b046e04b.zip | |
Merge "Fix mix-up in pt token indexing." into experimental
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 2 | ||||
| -rw-r--r-- | vp9/encoder/vp9_tokenize.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index ad9b96050..0083e8ae1 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -595,7 +595,7 @@ static INLINE int cost_coeffs(VP9_COMMON *const cm, MACROBLOCK *mb, [get_coef_band(scan, tx_size, c)] [pt][0], 1); #endif - pt = vp9_get_coef_context(scan, nb, pad, token_cache, c, default_eob); + pt = vp9_get_coef_context(scan, nb, pad, token_cache, c + 1, default_eob); } #if CONFIG_CODE_NONZEROCOUNT cost += nzc_cost[nzc]; diff --git a/vp9/encoder/vp9_tokenize.c b/vp9/encoder/vp9_tokenize.c index 6e2b8474d..21401d175 100644 --- a/vp9/encoder/vp9_tokenize.c +++ b/vp9/encoder/vp9_tokenize.c @@ -291,7 +291,7 @@ static void tokenize_b(VP9_COMP *cpi, #endif token_cache[c] = token; - pt = vp9_get_coef_context(scan, nb, pad, token_cache, c, default_eob); + pt = vp9_get_coef_context(scan, nb, pad, token_cache, c + 1, default_eob); ++t; } while (c < eob && ++c < seg_eob); #if CONFIG_CODE_NONZEROCOUNT |