diff options
author | Alex Converse <aconverse@google.com> | 2016-06-08 17:49:52 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-06-08 17:49:52 +0000 |
commit | d00aaa9c12c85469fc51d690915476769c7d9e58 (patch) | |
tree | 43f43d43c7e80b77614618c99fe338e11a6fbcce /vp9/encoder/vp9_bitstream.c | |
parent | 97b4f8fe9299498e1e86c94f91e6dbe2f8b6e574 (diff) | |
parent | 19e0b406c9601ec79f96cba654347e48650929ed (diff) | |
download | libvpx-d00aaa9c12c85469fc51d690915476769c7d9e58.tar libvpx-d00aaa9c12c85469fc51d690915476769c7d9e58.tar.gz libvpx-d00aaa9c12c85469fc51d690915476769c7d9e58.tar.bz2 libvpx-d00aaa9c12c85469fc51d690915476769c7d9e58.zip |
Merge "Refactor probability savings search."
Diffstat (limited to 'vp9/encoder/vp9_bitstream.c')
-rw-r--r-- | vp9/encoder/vp9_bitstream.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c index 5600ed458..61cca397b 100644 --- a/vp9/encoder/vp9_bitstream.c +++ b/vp9/encoder/vp9_bitstream.c @@ -545,8 +545,8 @@ static void update_coef_probs_common(vpx_writer* const bc, VP9_COMP *cpi, int u = 0; if (t == PIVOT_NODE) s = vp9_prob_diff_update_savings_search_model( - frame_branch_ct[i][j][k][l][0], - old_coef_probs[i][j][k][l], &newp, upd, stepsize); + frame_branch_ct[i][j][k][l][0], oldp, &newp, upd, + stepsize); else s = vp9_prob_diff_update_savings_search( frame_branch_ct[i][j][k][l][t], oldp, &newp, upd); @@ -584,7 +584,7 @@ static void update_coef_probs_common(vpx_writer* const bc, VP9_COMP *cpi, if (t == PIVOT_NODE) s = vp9_prob_diff_update_savings_search_model( frame_branch_ct[i][j][k][l][0], - old_coef_probs[i][j][k][l], &newp, upd, stepsize); + *oldp, &newp, upd, stepsize); else s = vp9_prob_diff_update_savings_search( frame_branch_ct[i][j][k][l][t], @@ -622,7 +622,7 @@ static void update_coef_probs_common(vpx_writer* const bc, VP9_COMP *cpi, if (t == PIVOT_NODE) { s = vp9_prob_diff_update_savings_search_model( frame_branch_ct[i][j][k][l][0], - old_coef_probs[i][j][k][l], &newp, upd, stepsize); + *oldp, &newp, upd, stepsize); } else { s = vp9_prob_diff_update_savings_search( frame_branch_ct[i][j][k][l][t], |