diff options
author | Ronald S. Bultje <rbultje@google.com> | 2012-12-12 10:34:14 -0800 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-12-12 10:34:14 -0800 |
commit | 39de1e14ed8bed14981849dd4e9c4369ac41a9cd (patch) | |
tree | e134ae444451629195624d3de248e75cf807f8ab /vp9/encoder/vp9_rdopt.c | |
parent | 0c35b27689171503ac47f46f35a61d72bc5886c8 (diff) | |
parent | 4d0ec7aacd2227b1b98d1f5100bde64c7797b962 (diff) | |
download | libvpx-39de1e14ed8bed14981849dd4e9c4369ac41a9cd.tar libvpx-39de1e14ed8bed14981849dd4e9c4369ac41a9cd.tar.gz libvpx-39de1e14ed8bed14981849dd4e9c4369ac41a9cd.tar.bz2 libvpx-39de1e14ed8bed14981849dd4e9c4369ac41a9cd.zip |
Merge "Consistently use get_prob(), clip_prob() and newly added clip_pixel()." into experimental
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
-rw-r--r-- | vp9/encoder/vp9_rdopt.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index cce9746a2..29fafc08b 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -3051,7 +3051,6 @@ static void estimate_ref_frame_costs(VP9_COMP *cpi, int segment_id, unsigned int int pred_flag; int pred_ctx; int i; - int tot_count; vp9_prob pred_prob, new_pred_prob; int seg_ref_active; @@ -3075,13 +3074,8 @@ static void estimate_ref_frame_costs(VP9_COMP *cpi, int segment_id, unsigned int // Predict probability for current frame based on stats so far pred_ctx = vp9_get_pred_context(cm, xd, PRED_REF); - tot_count = cpi->ref_pred_count[pred_ctx][0] + cpi->ref_pred_count[pred_ctx][1]; - if (tot_count) { - new_pred_prob = - (cpi->ref_pred_count[pred_ctx][0] * 255 + (tot_count >> 1)) / tot_count; - new_pred_prob += !new_pred_prob; - } else - new_pred_prob = 128; + new_pred_prob = get_binary_prob(cpi->ref_pred_count[pred_ctx][0], + cpi->ref_pred_count[pred_ctx][1]); // Get the set of probabilities to use if prediction fails mod_refprobs = cm->mod_refprobs[pred_ref]; |