Commit c703400b authored by Yaowu Xu's avatar Yaowu Xu Committed by Gerrit Code Review
Browse files

Merge "vp9_prob_diff_update_savings_search_model(): remove params"

parents 5ee16cc0 b9d28e71
...@@ -566,7 +566,7 @@ static void update_coef_probs_common(vp9_writer* const bc, VP9_COMP *cpi, ...@@ -566,7 +566,7 @@ static void update_coef_probs_common(vp9_writer* const bc, VP9_COMP *cpi,
if (t == PIVOT_NODE) if (t == PIVOT_NODE)
s = vp9_prob_diff_update_savings_search_model( s = vp9_prob_diff_update_savings_search_model(
frame_branch_ct[i][j][k][l][0], frame_branch_ct[i][j][k][l][0],
old_frame_coef_probs[i][j][k][l], &newp, upd, i, j); old_frame_coef_probs[i][j][k][l], &newp, upd);
else else
s = vp9_prob_diff_update_savings_search( s = vp9_prob_diff_update_savings_search(
frame_branch_ct[i][j][k][l][t], oldp, &newp, upd); frame_branch_ct[i][j][k][l][t], oldp, &newp, upd);
...@@ -604,7 +604,7 @@ static void update_coef_probs_common(vp9_writer* const bc, VP9_COMP *cpi, ...@@ -604,7 +604,7 @@ static void update_coef_probs_common(vp9_writer* const bc, VP9_COMP *cpi,
if (t == PIVOT_NODE) if (t == PIVOT_NODE)
s = vp9_prob_diff_update_savings_search_model( s = vp9_prob_diff_update_savings_search_model(
frame_branch_ct[i][j][k][l][0], frame_branch_ct[i][j][k][l][0],
old_frame_coef_probs[i][j][k][l], &newp, upd, i, j); old_frame_coef_probs[i][j][k][l], &newp, upd);
else else
s = vp9_prob_diff_update_savings_search( s = vp9_prob_diff_update_savings_search(
frame_branch_ct[i][j][k][l][t], frame_branch_ct[i][j][k][l][t],
...@@ -652,7 +652,7 @@ static void update_coef_probs_common(vp9_writer* const bc, VP9_COMP *cpi, ...@@ -652,7 +652,7 @@ static void update_coef_probs_common(vp9_writer* const bc, VP9_COMP *cpi,
if (t == PIVOT_NODE) if (t == PIVOT_NODE)
s = vp9_prob_diff_update_savings_search_model( s = vp9_prob_diff_update_savings_search_model(
frame_branch_ct[i][j][k][l][0], frame_branch_ct[i][j][k][l][0],
old_frame_coef_probs[i][j][k][l], &newp, upd, i, j); old_frame_coef_probs[i][j][k][l], &newp, upd);
else else
s = vp9_prob_diff_update_savings_search( s = vp9_prob_diff_update_savings_search(
frame_branch_ct[i][j][k][l][t], frame_branch_ct[i][j][k][l][t],
......
...@@ -150,8 +150,7 @@ int vp9_prob_diff_update_savings_search(const unsigned int *ct, ...@@ -150,8 +150,7 @@ int vp9_prob_diff_update_savings_search(const unsigned int *ct,
int vp9_prob_diff_update_savings_search_model(const unsigned int *ct, int vp9_prob_diff_update_savings_search_model(const unsigned int *ct,
const vp9_prob *oldp, const vp9_prob *oldp,
vp9_prob *bestp, vp9_prob *bestp,
vp9_prob upd, vp9_prob upd) {
int b, int r) {
int i, old_b, new_b, update_b, savings, bestsavings, step; int i, old_b, new_b, update_b, savings, bestsavings, step;
int newp; int newp;
vp9_prob bestnewp, newplist[ENTROPY_NODES], oldplist[ENTROPY_NODES]; vp9_prob bestnewp, newplist[ENTROPY_NODES], oldplist[ENTROPY_NODES];
......
...@@ -33,8 +33,7 @@ int vp9_prob_diff_update_savings_search(const unsigned int *ct, ...@@ -33,8 +33,7 @@ int vp9_prob_diff_update_savings_search(const unsigned int *ct,
int vp9_prob_diff_update_savings_search_model(const unsigned int *ct, int vp9_prob_diff_update_savings_search_model(const unsigned int *ct,
const vp9_prob *oldp, const vp9_prob *oldp,
vp9_prob *bestp, vp9_prob *bestp,
vp9_prob upd, vp9_prob upd);
int b, int r);
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment