diff options
| author | Deb Mukherjee <debargha@google.com> | 2013-05-22 10:38:35 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-05-22 10:38:35 -0700 |
| commit | ddb23095686f10243af9751760b3d9889dc947ea (patch) | |
| tree | 84e2379d2d08c811da422911c4831fe7544334a5 /vp9/encoder/vp9_rdopt.c | |
| parent | d2cacdc5306198ef6a35636f9039511e30d894f3 (diff) | |
| parent | de4d682ca4af4b7780c038cdd762c9de51917fe3 (diff) | |
| download | libvpx-ddb23095686f10243af9751760b3d9889dc947ea.tar libvpx-ddb23095686f10243af9751760b3d9889dc947ea.tar.gz libvpx-ddb23095686f10243af9751760b3d9889dc947ea.tar.bz2 libvpx-ddb23095686f10243af9751760b3d9889dc947ea.zip | |
Merge "Using 128 entry look up table for coef models" into experimental
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 3cc4e845e..1d50eede9 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -115,7 +115,7 @@ static void fill_token_costs(vp9_coeff_count *c, for (k = 0; k < COEF_BANDS; k++) for (l = 0; l < PREV_COEF_CONTEXTS; l++) { vp9_prob probs[ENTROPY_NODES]; - vp9_model_to_full_probs(p[i][j][k][l], i, j, probs); + vp9_model_to_full_probs(p[i][j][k][l], probs); vp9_cost_tokens_skip((int *)c[i][j][k][l], probs, vp9_coef_tree); } @@ -292,7 +292,7 @@ static INLINE int cost_coeffs(VP9_COMMON *const cm, MACROBLOCK *mb, above_ec = A[0] != 0; left_ec = L[0] != 0; vp9_model_to_full_probs_sb(cm->fc.coef_probs_4x4[type][ref], - type, ref, coef_probs); + coef_probs); seg_eob = 16; scan = get_scan_4x4(tx_type); band_translate = vp9_coefband_trans_4x4; @@ -308,7 +308,7 @@ static INLINE int cost_coeffs(VP9_COMMON *const cm, MACROBLOCK *mb, left_ec = (L[0] + L[1]) != 0; scan = get_scan_8x8(tx_type); vp9_model_to_full_probs_sb(cm->fc.coef_probs_8x8[type][ref], - type, ref, coef_probs); + coef_probs); seg_eob = 64; band_translate = vp9_coefband_trans_8x8plus; break; @@ -321,7 +321,7 @@ static INLINE int cost_coeffs(VP9_COMMON *const cm, MACROBLOCK *mb, get_tx_type_16x16(xd, y + (x >> 2)) : DCT_DCT; scan = get_scan_16x16(tx_type); vp9_model_to_full_probs_sb(cm->fc.coef_probs_16x16[type][ref], - type, ref, coef_probs); + coef_probs); seg_eob = 256; above_ec = (A[0] + A[1] + A[2] + A[3]) != 0; left_ec = (L[0] + L[1] + L[2] + L[3]) != 0; @@ -331,7 +331,7 @@ static INLINE int cost_coeffs(VP9_COMMON *const cm, MACROBLOCK *mb, case TX_32X32: scan = vp9_default_zig_zag1d_32x32; vp9_model_to_full_probs_sb(cm->fc.coef_probs_32x32[type][ref], - type, ref, coef_probs); + coef_probs); seg_eob = 1024; 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; |