diff options
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_bitstream.c | 4 | ||||
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 2 | ||||
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c index 7ee775b74..c0610b569 100644 --- a/vp9/encoder/vp9_bitstream.c +++ b/vp9/encoder/vp9_bitstream.c @@ -233,10 +233,10 @@ static void encode_ref_frame(VP9_COMP *cpi, vp9_writer *bc) { // (if not specified at the frame/segment level) if (cm->comp_pred_mode == REFERENCE_MODE_SELECT) { vp9_write(bc, mi->ref_frame[1] > INTRA_FRAME, - vp9_get_pred_prob_comp_inter_inter(cm, xd)); + vp9_get_reference_mode_prob(cm, xd)); } else { assert((mi->ref_frame[1] <= INTRA_FRAME) == - (cm->comp_pred_mode == SINGLE_REFERENCE)); + (cm->comp_pred_mode == SINGLE_REFERENCE)); } if (mi->ref_frame[1] > INTRA_FRAME) { diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 2fa9dcc6e..8f995830a 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -759,7 +759,7 @@ static void update_stats(VP9_COMP *cpi) { // the reference frame counts used to work out probabilities. if (is_inter_block(mbmi) && !seg_ref_active) { if (cm->comp_pred_mode == REFERENCE_MODE_SELECT) - cpi->comp_inter_count[vp9_get_pred_context_comp_inter_inter(cm, xd)] + cpi->comp_inter_count[vp9_get_reference_mode_context(cm, xd)] [has_second_ref(mbmi)]++; if (has_second_ref(mbmi)) { diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 85cb443c9..45f1f3654 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -2149,7 +2149,7 @@ static void estimate_ref_frame_costs(VP9_COMP *cpi, int segment_id, vp9_prob comp_inter_p = 128; if (cm->comp_pred_mode == REFERENCE_MODE_SELECT) { - comp_inter_p = vp9_get_pred_prob_comp_inter_inter(cm, xd); + comp_inter_p = vp9_get_reference_mode_prob(cm, xd); *comp_mode_p = comp_inter_p; } else { *comp_mode_p = 128; |