diff options
Diffstat (limited to 'vp9/decoder')
| -rw-r--r-- | vp9/decoder/vp9_decodeframe.c | 8 | ||||
| -rw-r--r-- | vp9/decoder/vp9_decodemv.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c index 1608aa6aa..cee2c327c 100644 --- a/vp9/decoder/vp9_decodeframe.c +++ b/vp9/decoder/vp9_decodeframe.c @@ -136,17 +136,17 @@ static REFERENCE_MODE read_reference_mode(VP9_COMMON *cm, vp9_reader *r) { static void read_reference_mode_probs(VP9_COMMON *cm, vp9_reader *r) { int i; - if (cm->comp_pred_mode == REFERENCE_MODE_SELECT) + if (cm->reference_mode == REFERENCE_MODE_SELECT) for (i = 0; i < COMP_INTER_CONTEXTS; i++) vp9_diff_update_prob(r, &cm->fc.comp_inter_prob[i]); - if (cm->comp_pred_mode != COMPOUND_REFERENCE) + if (cm->reference_mode != COMPOUND_REFERENCE) for (i = 0; i < REF_CONTEXTS; i++) { vp9_diff_update_prob(r, &cm->fc.single_ref_prob[i][0]); vp9_diff_update_prob(r, &cm->fc.single_ref_prob[i][1]); } - if (cm->comp_pred_mode != SINGLE_REFERENCE) + if (cm->reference_mode != SINGLE_REFERENCE) for (i = 0; i < REF_CONTEXTS; i++) vp9_diff_update_prob(r, &cm->fc.comp_ref_prob[i]); } @@ -1199,7 +1199,7 @@ static int read_compressed_header(VP9D_COMP *pbi, const uint8_t *data, for (i = 0; i < INTRA_INTER_CONTEXTS; i++) vp9_diff_update_prob(&r, &fc->intra_inter_prob[i]); - cm->comp_pred_mode = read_reference_mode(cm, &r); + cm->reference_mode = read_reference_mode(cm, &r); read_reference_mode_probs(cm, &r); for (j = 0; j < BLOCK_SIZE_GROUPS; j++) diff --git a/vp9/decoder/vp9_decodemv.c b/vp9/decoder/vp9_decodemv.c index 996fd129c..01caee657 100644 --- a/vp9/decoder/vp9_decodemv.c +++ b/vp9/decoder/vp9_decodemv.c @@ -278,9 +278,9 @@ static void read_ref_frames(VP9_COMMON *const cm, MACROBLOCKD *const xd, ref_frame[0] = vp9_get_segdata(&cm->seg, segment_id, SEG_LVL_REF_FRAME); ref_frame[1] = NONE; } else { - const REFERENCE_MODE mode = (cm->comp_pred_mode == REFERENCE_MODE_SELECT) + const REFERENCE_MODE mode = (cm->reference_mode == REFERENCE_MODE_SELECT) ? read_reference_mode(cm, xd, r) - : cm->comp_pred_mode; + : cm->reference_mode; // FIXME(rbultje) I'm pretty sure this breaks segmentation ref frame coding if (mode == COMPOUND_REFERENCE) { |