diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-02-15 17:11:20 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-02-15 17:11:20 -0800 |
| commit | 5bb103c48682a030a650045249870cecabaed868 (patch) | |
| tree | 3a90a782e8b173c382abb1c2a8158028eb278c70 /vp9/encoder/vp9_rdopt.c | |
| parent | e343732a92bddb3e8764e4757487bab6667f744c (diff) | |
| parent | 3af36ea8cc2e532c648e1d76d9aac96a0d612e1f (diff) | |
| download | libvpx-5bb103c48682a030a650045249870cecabaed868.tar libvpx-5bb103c48682a030a650045249870cecabaed868.tar.gz libvpx-5bb103c48682a030a650045249870cecabaed868.tar.bz2 libvpx-5bb103c48682a030a650045249870cecabaed868.zip | |
Merge "Remove Y2 and Y-no-DC token types from the bitstream." into experimental
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 1c4dd5834..400190c41 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -155,7 +155,7 @@ static void fill_token_costs(vp9_coeff_count *c, for (i = 0; i < block_type_counts; i++) for (j = 0; j < COEF_BANDS; j++) for (k = 0; k < PREV_COEF_CONTEXTS; k++) { - if (k == 0 && ((j > 0 && i > 0) || (j > 1 && i == 0))) + if (k == 0 && j > 0) vp9_cost_tokens_skip((int *)(c[i][j][k]), p[i][j][k], vp9_coef_tree); @@ -280,17 +280,20 @@ void vp9_initialize_rd_consts(VP9_COMP *cpi, int QIndex) { fill_token_costs(cpi->mb.token_costs[TX_4X4], cpi->common.fc.coef_probs_4x4, BLOCK_TYPES_4X4); fill_token_costs(cpi->mb.hybrid_token_costs[TX_4X4], - cpi->common.fc.hybrid_coef_probs_4x4, BLOCK_TYPES_4X4); + cpi->common.fc.hybrid_coef_probs_4x4, + BLOCK_TYPES_4X4_HYBRID); fill_token_costs(cpi->mb.token_costs[TX_8X8], cpi->common.fc.coef_probs_8x8, BLOCK_TYPES_8X8); fill_token_costs(cpi->mb.hybrid_token_costs[TX_8X8], - cpi->common.fc.hybrid_coef_probs_8x8, BLOCK_TYPES_8X8); + cpi->common.fc.hybrid_coef_probs_8x8, + BLOCK_TYPES_8X8_HYBRID); fill_token_costs(cpi->mb.token_costs[TX_16X16], cpi->common.fc.coef_probs_16x16, BLOCK_TYPES_16X16); fill_token_costs(cpi->mb.hybrid_token_costs[TX_16X16], - cpi->common.fc.hybrid_coef_probs_16x16, BLOCK_TYPES_16X16); + cpi->common.fc.hybrid_coef_probs_16x16, + BLOCK_TYPES_16X16_HYBRID); fill_token_costs(cpi->mb.token_costs[TX_32X32], cpi->common.fc.coef_probs_32x32, BLOCK_TYPES_32X32); |