vp9_decodemv.c 42.2 KB
Newer Older
John Koleszar's avatar
John Koleszar committed
1
/*
2
  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
John Koleszar's avatar
John Koleszar committed
3
 *
4
 *  Use of this source code is governed by a BSD-style license
5 6
 *  that can be found in the LICENSE file in the root of the source
 *  tree. An additional intellectual property rights grant can be found
7
 *  in the file PATENTS.  All contributing project authors may
8
 *  be found in the AUTHORS file in the root of the source tree.
John Koleszar's avatar
John Koleszar committed
9 10 11
 */


12
#include "vp9/decoder/vp9_treereader.h"
13 14
#include "vp9/common/vp9_entropymv.h"
#include "vp9/common/vp9_entropymode.h"
15
#include "vp9/common/vp9_reconinter.h"
16
#include "vp9/decoder/vp9_onyxd_int.h"
17
#include "vp9/common/vp9_findnearmv.h"
Ronald S. Bultje's avatar
Ronald S. Bultje committed
18
#include "vp9/common/vp9_common.h"
19 20 21 22 23
#include "vp9/common/vp9_seg_common.h"
#include "vp9/common/vp9_pred_common.h"
#include "vp9/common/vp9_entropy.h"
#include "vp9/decoder/vp9_decodemv.h"
#include "vp9/common/vp9_mvref_common.h"
John Koleszar's avatar
John Koleszar committed
24 25 26
#if CONFIG_DEBUG
#include <assert.h>
#endif
27

John Koleszar's avatar
John Koleszar committed
28
// #define DEBUG_DEC_MV
29 30 31
#ifdef DEBUG_DEC_MV
int dec_mvcount = 0;
#endif
Dmitry Kovalev's avatar
Dmitry Kovalev committed
32

33 34 35 36
// #define DEC_DEBUG
#ifdef DEC_DEBUG
extern int dec_debug;
#endif
37

Dmitry Kovalev's avatar
Dmitry Kovalev committed
38
static B_PREDICTION_MODE read_bmode(vp9_reader *bc, const vp9_prob *p) {
39 40 41 42 43 44 45 46 47
  B_PREDICTION_MODE m = treed_read(bc, vp9_bmode_tree, p);
#if CONFIG_NEWBINTRAMODES
  if (m == B_CONTEXT_PRED - CONTEXT_PRED_REPLACEMENTS)
    m = B_CONTEXT_PRED;
  assert(m < B_CONTEXT_PRED - CONTEXT_PRED_REPLACEMENTS || m == B_CONTEXT_PRED);
#endif
  return m;
}

Dmitry Kovalev's avatar
Dmitry Kovalev committed
48 49
static B_PREDICTION_MODE read_kf_bmode(vp9_reader *bc, const vp9_prob *p) {
  return (B_PREDICTION_MODE)treed_read(bc, vp9_kf_bmode_tree, p);
Scott LaVarnway's avatar
Scott LaVarnway committed
50 51
}

Dmitry Kovalev's avatar
Dmitry Kovalev committed
52 53
static MB_PREDICTION_MODE read_ymode(vp9_reader *bc, const vp9_prob *p) {
  return (MB_PREDICTION_MODE)treed_read(bc, vp9_ymode_tree, p);
Ronald S. Bultje's avatar
Ronald S. Bultje committed
54
}
Scott LaVarnway's avatar
Scott LaVarnway committed
55

Dmitry Kovalev's avatar
Dmitry Kovalev committed
56 57
static MB_PREDICTION_MODE read_sb_ymode(vp9_reader *bc, const vp9_prob *p) {
  return (MB_PREDICTION_MODE)treed_read(bc, vp9_sb_ymode_tree, p);
58 59
}

Dmitry Kovalev's avatar
Dmitry Kovalev committed
60 61
static MB_PREDICTION_MODE read_kf_sb_ymode(vp9_reader *bc, const vp9_prob *p) {
  return (MB_PREDICTION_MODE)treed_read(bc, vp9_uv_mode_tree, p);
Scott LaVarnway's avatar
Scott LaVarnway committed
62 63
}

Dmitry Kovalev's avatar
Dmitry Kovalev committed
64 65
static MB_PREDICTION_MODE read_kf_mb_ymode(vp9_reader *bc, const vp9_prob *p) {
  return (MB_PREDICTION_MODE)treed_read(bc, vp9_kf_ymode_tree, p);
Scott LaVarnway's avatar
Scott LaVarnway committed
66 67
}

68 69
static int read_i8x8_mode(vp9_reader *bc, const vp9_prob *p) {
  return treed_read(bc, vp9_i8x8_mode_tree, p);
Yaowu Xu's avatar
Yaowu Xu committed
70
}
Scott LaVarnway's avatar
Scott LaVarnway committed
71

Dmitry Kovalev's avatar
Dmitry Kovalev committed
72 73
static MB_PREDICTION_MODE read_uv_mode(vp9_reader *bc, const vp9_prob *p) {
  return (MB_PREDICTION_MODE)treed_read(bc, vp9_uv_mode_tree, p);
Scott LaVarnway's avatar
Scott LaVarnway committed
74 75
}

76
// This function reads the current macro block's segnent id from the bitstream
Paul Wilkins's avatar
Paul Wilkins committed
77
// It should only be called if a segment map update is indicated.
Dmitry Kovalev's avatar
Dmitry Kovalev committed
78
static void read_mb_segid(vp9_reader *r, MB_MODE_INFO *mi, MACROBLOCKD *xd) {
John Koleszar's avatar
John Koleszar committed
79
  /* Is segmentation enabled */
Paul Wilkins's avatar
Paul Wilkins committed
80
  if (xd->segmentation_enabled && xd->update_mb_segmentation_map) {
John Koleszar's avatar
John Koleszar committed
81
    /* If so then read the segment id. */
Dmitry Kovalev's avatar
Dmitry Kovalev committed
82 83
    mi->segment_id = vp9_read(r, xd->mb_segment_tree_probs[0]) ?
        (unsigned char)(2 + vp9_read(r, xd->mb_segment_tree_probs[2])):
84
        (unsigned char)(vp9_read(r, xd->mb_segment_tree_probs[1]));
John Koleszar's avatar
John Koleszar committed
85
  }
Scott LaVarnway's avatar
Scott LaVarnway committed
86
}
87

88 89 90 91 92 93 94 95 96 97 98 99 100 101
// This function reads the current macro block's segnent id from the bitstream
// It should only be called if a segment map update is indicated.
static void read_mb_segid_except(VP9_COMMON *cm,
                                 vp9_reader *r, MB_MODE_INFO *mi,
                                 MACROBLOCKD *xd, int mb_row, int mb_col) {
  int pred_seg_id = vp9_get_pred_mb_segid(cm, xd,
                                          mb_row * cm->mb_cols + mb_col);
  const vp9_prob *p = xd->mb_segment_tree_probs;
  vp9_prob p1 = xd->mb_segment_mispred_tree_probs[pred_seg_id];

  /* Is segmentation enabled */
  if (xd->segmentation_enabled && xd->update_mb_segmentation_map) {
    /* If so then read the segment id. */
    if (vp9_read(r, p1)) {
Dmitry Kovalev's avatar
Dmitry Kovalev committed
102 103
      mi->segment_id = 2 +
          (pred_seg_id < 2 ? vp9_read(r, p[2]) : (pred_seg_id == 2));
104
    } else {
Dmitry Kovalev's avatar
Dmitry Kovalev committed
105 106
      mi->segment_id =
          pred_seg_id >= 2 ? vp9_read(r, p[1]) : (pred_seg_id == 0);
107 108 109 110
    }
  }
}

111
#if CONFIG_NEW_MVREF
Dmitry Kovalev's avatar
Dmitry Kovalev committed
112
int vp9_read_mv_ref_id(vp9_reader *r, vp9_prob *ref_id_probs) {
113 114
  int ref_index = 0;

115
  if (vp9_read(r, ref_id_probs[0])) {
116
    ref_index++;
117
    if (vp9_read(r, ref_id_probs[1])) {
118
      ref_index++;
119
      if (vp9_read(r, ref_id_probs[2]))
120 121 122 123 124 125 126
        ref_index++;
    }
  }
  return ref_index;
}
#endif

127
extern const int vp9_i8x8_block[4];
128
static void kfread_modes(VP9D_COMP *pbi,
John Koleszar's avatar
John Koleszar committed
129 130 131 132
                         MODE_INFO *m,
                         int mb_row,
                         int mb_col,
                         BOOL_DECODER* const bc) {
133
  VP9_COMMON *const cm = &pbi->common;
134
  MACROBLOCKD *const xd  = &pbi->mb;
John Koleszar's avatar
John Koleszar committed
135 136 137 138
  const int mis = pbi->common.mode_info_stride;
  int map_index = mb_row * pbi->common.mb_cols + mb_col;
  MB_PREDICTION_MODE y_mode;

139 140
  m->mbmi.ref_frame = INTRA_FRAME;

John Koleszar's avatar
John Koleszar committed
141 142 143 144
  // Read the Macroblock segmentation map if it is being updated explicitly
  // this frame (reset to 0 by default).
  m->mbmi.segment_id = 0;
  if (pbi->mb.update_mb_segmentation_map) {
145
    read_mb_segid(bc, &m->mbmi, &pbi->mb);
Ronald S. Bultje's avatar
Ronald S. Bultje committed
146 147 148 149 150 151 152 153 154 155 156 157
    if (m->mbmi.sb_type) {
      const int nmbs = 1 << m->mbmi.sb_type;
      const int ymbs = MIN(cm->mb_rows - mb_row, nmbs);
      const int xmbs = MIN(cm->mb_cols - mb_col, nmbs);
      int x, y;

      for (y = 0; y < ymbs; y++) {
        for (x = 0; x < xmbs; x++) {
          cm->last_frame_seg_map[map_index + x + y * cm->mb_cols] =
              m->mbmi.segment_id;
        }
      }
158
    } else {
Ronald S. Bultje's avatar
Ronald S. Bultje committed
159 160
      cm->last_frame_seg_map[map_index] = m->mbmi.segment_id;
    }
John Koleszar's avatar
John Koleszar committed
161 162 163 164
  }

  m->mbmi.mb_skip_coeff = 0;
  if (pbi->common.mb_no_coeff_skip &&
Dmitry Kovalev's avatar
Dmitry Kovalev committed
165
      (!vp9_segfeature_active(&pbi->mb, m->mbmi.segment_id, SEG_LVL_SKIP))) {
John Koleszar's avatar
John Koleszar committed
166
    MACROBLOCKD *const xd  = &pbi->mb;
Paul Wilkins's avatar
Paul Wilkins committed
167
    m->mbmi.mb_skip_coeff =
Dmitry Kovalev's avatar
Dmitry Kovalev committed
168
        vp9_read(bc, vp9_get_pred_prob(cm, xd, PRED_MBSKIP));
John Koleszar's avatar
John Koleszar committed
169
  } else {
Dmitry Kovalev's avatar
Dmitry Kovalev committed
170
    if (vp9_segfeature_active(&pbi->mb, m->mbmi.segment_id, SEG_LVL_SKIP))
John Koleszar's avatar
John Koleszar committed
171
      m->mbmi.mb_skip_coeff = 1;
Dmitry Kovalev's avatar
Dmitry Kovalev committed
172
    else
John Koleszar's avatar
John Koleszar committed
173 174 175
      m->mbmi.mb_skip_coeff = 0;
  }

Dmitry Kovalev's avatar
Dmitry Kovalev committed
176 177 178 179 180 181

  y_mode = m->mbmi.sb_type ?
      read_kf_sb_ymode(bc,
          pbi->common.sb_kf_ymode_prob[pbi->common.kf_ymode_probs_index]):
      read_kf_mb_ymode(bc,
          pbi->common.kf_ymode_prob[pbi->common.kf_ymode_probs_index]);
182

John Koleszar's avatar
John Koleszar committed
183
  m->mbmi.ref_frame = INTRA_FRAME;
Paul Wilkins's avatar
Paul Wilkins committed
184

John Koleszar's avatar
John Koleszar committed
185 186 187
  if ((m->mbmi.mode = y_mode) == B_PRED) {
    int i = 0;
    do {
Dmitry Kovalev's avatar
Dmitry Kovalev committed
188 189
      const B_PREDICTION_MODE a = above_block_mode(m, i, mis);
      const B_PREDICTION_MODE l = (xd->left_available || (i & 3)) ?
190
                                  left_block_mode(m, i) : B_DC_PRED;
Paul Wilkins's avatar
Paul Wilkins committed
191

Dmitry Kovalev's avatar
Dmitry Kovalev committed
192 193
      m->bmi[i].as_mode.first = read_kf_bmode(bc,
                                              pbi->common.kf_bmode_prob[a][l]);
John Koleszar's avatar
John Koleszar committed
194 195
    } while (++i < 16);
  }
Dmitry Kovalev's avatar
Dmitry Kovalev committed
196

John Koleszar's avatar
John Koleszar committed
197 198 199
  if ((m->mbmi.mode = y_mode) == I8X8_PRED) {
    int i;
    for (i = 0; i < 4; i++) {
Dmitry Kovalev's avatar
Dmitry Kovalev committed
200 201 202
      const int ib = vp9_i8x8_block[i];
      const int mode8x8 = read_i8x8_mode(bc, pbi->common.fc.i8x8_mode_prob);

John Koleszar's avatar
John Koleszar committed
203 204 205 206 207
      m->bmi[ib + 0].as_mode.first = mode8x8;
      m->bmi[ib + 1].as_mode.first = mode8x8;
      m->bmi[ib + 4].as_mode.first = mode8x8;
      m->bmi[ib + 5].as_mode.first = mode8x8;
    }
Dmitry Kovalev's avatar
Dmitry Kovalev committed
208 209 210 211
  } else {
    m->mbmi.uv_mode = read_uv_mode(bc,
                                   pbi->common.kf_uv_mode_prob[m->mbmi.mode]);
  }
212

Dmitry Kovalev's avatar
Dmitry Kovalev committed
213 214
  if (cm->txfm_mode == TX_MODE_SELECT &&
      m->mbmi.mb_skip_coeff == 0 &&
215
      m->mbmi.mode <= I8X8_PRED) {
216
    // FIXME(rbultje) code ternary symbol once all experiments are merged
217
    m->mbmi.txfm_size = vp9_read(bc, cm->prob_tx[0]);
218
    if (m->mbmi.txfm_size != TX_4X4 && m->mbmi.mode != I8X8_PRED) {
219
      m->mbmi.txfm_size += vp9_read(bc, cm->prob_tx[1]);
Ronald S. Bultje's avatar
Ronald S. Bultje committed
220
      if (m->mbmi.txfm_size != TX_8X8 && m->mbmi.sb_type)
221 222
        m->mbmi.txfm_size += vp9_read(bc, cm->prob_tx[2]);
    }
Ronald S. Bultje's avatar
Ronald S. Bultje committed
223
  } else if (cm->txfm_mode >= ALLOW_32X32 && m->mbmi.sb_type) {
224
    m->mbmi.txfm_size = TX_32X32;
225
  } else if (cm->txfm_mode >= ALLOW_16X16 && m->mbmi.mode <= TM_PRED) {
226
    m->mbmi.txfm_size = TX_16X16;
227
  } else if (cm->txfm_mode >= ALLOW_8X8 && m->mbmi.mode != B_PRED) {
228 229 230 231
    m->mbmi.txfm_size = TX_8X8;
  } else {
    m->mbmi.txfm_size = TX_4X4;
  }
Scott LaVarnway's avatar
Scott LaVarnway committed
232
}
John Koleszar's avatar
John Koleszar committed
233

234
static int read_nmv_component(vp9_reader *r,
235 236
                              int rv,
                              const nmv_component *mvcomp) {
Dmitry Kovalev's avatar
Dmitry Kovalev committed
237 238 239 240 241
  int mag, d;
  const int sign = vp9_read(r, mvcomp->sign);
  const int mv_class = treed_read(r, vp9_mv_class_tree, mvcomp->classes);

  if (mv_class == MV_CLASS_0) {
242
    d = treed_read(r, vp9_mv_class0_tree, mvcomp->class0);
243
  } else {
Dmitry Kovalev's avatar
Dmitry Kovalev committed
244 245 246
    int i;
    int n = mv_class + CLASS0_BITS - 1;  // number of bits

247
    d = 0;
Dmitry Kovalev's avatar
Dmitry Kovalev committed
248 249
    for (i = 0; i < n; ++i)
      d |= vp9_read(r, mvcomp->bits[i]) << i;
250 251
  }

Dmitry Kovalev's avatar
Dmitry Kovalev committed
252 253
  mag = vp9_get_mv_mag(mv_class, d << 3);
  return sign ? -(mag + 8) : (mag + 8);
254 255
}

256
static int read_nmv_component_fp(vp9_reader *r,
257 258 259 260
                                 int v,
                                 int rv,
                                 const nmv_component *mvcomp,
                                 int usehp) {
Dmitry Kovalev's avatar
Dmitry Kovalev committed
261 262 263 264 265 266 267
  const int sign = v < 0;
  int mag = ((sign ? -v : v) - 1) & ~7;  // magnitude - 1
  int offset;
  const int mv_class = vp9_get_mv_class(mag, &offset);
  const int f = mv_class == MV_CLASS_0 ?
      treed_read(r, vp9_mv_fp_tree, mvcomp->class0_fp[offset >> 3]):
      treed_read(r, vp9_mv_fp_tree, mvcomp->fp);
268

Dmitry Kovalev's avatar
Dmitry Kovalev committed
269
  offset += f << 1;
270 271

  if (usehp) {
Dmitry Kovalev's avatar
Dmitry Kovalev committed
272 273
    offset += mv_class == MV_CLASS_0 ?
        vp9_read(r, mvcomp->class0_hp) : vp9_read(r, mvcomp->hp);
274
  } else {
Dmitry Kovalev's avatar
Dmitry Kovalev committed
275
    offset += 1;  // If hp is not used, the default value of the hp bit is 1
276
  }
Dmitry Kovalev's avatar
Dmitry Kovalev committed
277 278
  mag = vp9_get_mv_mag(mv_class, offset);
  return sign ? -(mag + 1) : (mag + 1);
279 280
}

281
static void read_nmv(vp9_reader *r, MV *mv, const MV *ref,
282
                     const nmv_context *mvctx) {
Dmitry Kovalev's avatar
Dmitry Kovalev committed
283
  const MV_JOINT_TYPE j = treed_read(r, vp9_mv_joint_tree, mvctx->joints);
284 285 286 287
  mv->row = mv-> col = 0;
  if (j == MV_JOINT_HZVNZ || j == MV_JOINT_HNZVNZ) {
    mv->row = read_nmv_component(r, ref->row, &mvctx->comps[0]);
  }
Dmitry Kovalev's avatar
Dmitry Kovalev committed
288

289 290 291 292 293
  if (j == MV_JOINT_HNZVZ || j == MV_JOINT_HNZVNZ) {
    mv->col = read_nmv_component(r, ref->col, &mvctx->comps[1]);
  }
}

294
static void read_nmv_fp(vp9_reader *r, MV *mv, const MV *ref,
295
                        const nmv_context *mvctx, int usehp) {
Dmitry Kovalev's avatar
Dmitry Kovalev committed
296
  const MV_JOINT_TYPE j = vp9_get_mv_joint(*mv);
297
  usehp = usehp && vp9_use_nmv_hp(ref);
298 299 300 301 302 303 304 305
  if (j == MV_JOINT_HZVNZ || j == MV_JOINT_HNZVNZ) {
    mv->row = read_nmv_component_fp(r, mv->row, ref->row, &mvctx->comps[0],
                                    usehp);
  }
  if (j == MV_JOINT_HNZVZ || j == MV_JOINT_HNZVNZ) {
    mv->col = read_nmv_component_fp(r, mv->col, ref->col, &mvctx->comps[1],
                                    usehp);
  }
306 307 308 309
  /*
  printf("MV: %d %d REF: %d %d\n", mv->row + ref->row, mv->col + ref->col,
	 ref->row, ref->col);
	 */
310 311
}

312 313 314
static void update_nmv(vp9_reader *bc, vp9_prob *const p,
                       const vp9_prob upd_p) {
  if (vp9_read(bc, upd_p)) {
315
#ifdef LOW_PRECISION_MV_UPDATE
316
    *p = (vp9_read_literal(bc, 7) << 1) | 1;
317
#else
318
    *p = (vp9_read_literal(bc, 8));
319 320 321 322
#endif
  }
}

323
static void read_nmvprobs(vp9_reader *bc, nmv_context *mvctx,
324 325
                          int usehp) {
  int i, j, k;
Dmitry Kovalev's avatar
Dmitry Kovalev committed
326

327
#ifdef MV_GROUP_UPDATE
Dmitry Kovalev's avatar
Dmitry Kovalev committed
328 329
  if (!vp9_read_bit(bc))
    return;
330
#endif
Dmitry Kovalev's avatar
Dmitry Kovalev committed
331 332 333
  for (j = 0; j < MV_JOINTS - 1; ++j)
    update_nmv(bc, &mvctx->joints[j], VP9_NMV_UPDATE_PROB);

334
  for (i = 0; i < 2; ++i) {
Dmitry Kovalev's avatar
Dmitry Kovalev committed
335 336 337 338 339 340 341 342 343
    update_nmv(bc, &mvctx->comps[i].sign, VP9_NMV_UPDATE_PROB);
    for (j = 0; j < MV_CLASSES - 1; ++j)
      update_nmv(bc, &mvctx->comps[i].classes[j], VP9_NMV_UPDATE_PROB);

    for (j = 0; j < CLASS0_SIZE - 1; ++j)
      update_nmv(bc, &mvctx->comps[i].class0[j], VP9_NMV_UPDATE_PROB);

    for (j = 0; j < MV_OFFSET_BITS; ++j)
      update_nmv(bc, &mvctx->comps[i].bits[j], VP9_NMV_UPDATE_PROB);
344 345 346 347 348
  }

  for (i = 0; i < 2; ++i) {
    for (j = 0; j < CLASS0_SIZE; ++j) {
      for (k = 0; k < 3; ++k)
Dmitry Kovalev's avatar
Dmitry Kovalev committed
349
        update_nmv(bc, &mvctx->comps[i].class0_fp[j][k], VP9_NMV_UPDATE_PROB);
350
    }
Dmitry Kovalev's avatar
Dmitry Kovalev committed
351 352 353

    for (j = 0; j < 3; ++j)
      update_nmv(bc, &mvctx->comps[i].fp[j], VP9_NMV_UPDATE_PROB);
354 355 356 357
  }

  if (usehp) {
    for (i = 0; i < 2; ++i) {
Dmitry Kovalev's avatar
Dmitry Kovalev committed
358 359
      update_nmv(bc, &mvctx->comps[i].class0_hp, VP9_NMV_UPDATE_PROB);
      update_nmv(bc, &mvctx->comps[i].hp, VP9_NMV_UPDATE_PROB);
360 361 362 363
    }
  }
}

364
// Read the referncence frame
365
static MV_REFERENCE_FRAME read_ref_frame(VP9D_COMP *pbi,
366
                                         vp9_reader *const bc,
John Koleszar's avatar
John Koleszar committed
367 368
                                         unsigned char segment_id) {
  MV_REFERENCE_FRAME ref_frame;
369
  VP9_COMMON *const cm = &pbi->common;
John Koleszar's avatar
John Koleszar committed
370 371
  MACROBLOCKD *const xd = &pbi->mb;

Dmitry Kovalev's avatar
Dmitry Kovalev committed
372 373
  int seg_ref_count = 0;
  int seg_ref_active = vp9_segfeature_active(xd, segment_id, SEG_LVL_REF_FRAME);
John Koleszar's avatar
John Koleszar committed
374 375 376 377

  // If segment coding enabled does the segment allow for more than one
  // possible reference frame
  if (seg_ref_active) {
378 379 380 381
    seg_ref_count = vp9_check_segref(xd, segment_id, INTRA_FRAME) +
                    vp9_check_segref(xd, segment_id, LAST_FRAME) +
                    vp9_check_segref(xd, segment_id, GOLDEN_FRAME) +
                    vp9_check_segref(xd, segment_id, ALTREF_FRAME);
John Koleszar's avatar
John Koleszar committed
382 383 384 385 386 387 388
  }

  // Segment reference frame features not available or allows for
  // multiple reference frame options
  if (!seg_ref_active || (seg_ref_count > 1)) {
    // Values used in prediction model coding
    unsigned char prediction_flag;
389
    vp9_prob pred_prob;
John Koleszar's avatar
John Koleszar committed
390 391 392
    MV_REFERENCE_FRAME pred_ref;

    // Get the context probability the prediction flag
Paul Wilkins's avatar
Paul Wilkins committed
393
    pred_prob = vp9_get_pred_prob(cm, xd, PRED_REF);
John Koleszar's avatar
John Koleszar committed
394 395

    // Read the prediction status flag
396
    prediction_flag = (unsigned char)vp9_read(bc, pred_prob);
John Koleszar's avatar
John Koleszar committed
397 398

    // Store the prediction flag.
Paul Wilkins's avatar
Paul Wilkins committed
399
    vp9_set_pred_flag(xd, PRED_REF, prediction_flag);
John Koleszar's avatar
John Koleszar committed
400 401

    // Get the predicted reference frame.
Paul Wilkins's avatar
Paul Wilkins committed
402
    pred_ref = vp9_get_pred_ref(cm, xd);
John Koleszar's avatar
John Koleszar committed
403 404 405 406

    // If correctly predicted then use the predicted value
    if (prediction_flag) {
      ref_frame = pred_ref;
Paul Wilkins's avatar
Paul Wilkins committed
407
    }
John Koleszar's avatar
John Koleszar committed
408 409
    // else decode the explicitly coded value
    else {
410
      vp9_prob mod_refprobs[PREDICTION_PROBS];
John Koleszar's avatar
John Koleszar committed
411 412 413 414 415 416 417
      vpx_memcpy(mod_refprobs,
                 cm->mod_refprobs[pred_ref], sizeof(mod_refprobs));

      // If segment coding enabled blank out options that cant occur by
      // setting the branch probability to 0.
      if (seg_ref_active) {
        mod_refprobs[INTRA_FRAME] *=
418
          vp9_check_segref(xd, segment_id, INTRA_FRAME);
John Koleszar's avatar
John Koleszar committed
419
        mod_refprobs[LAST_FRAME] *=
420
          vp9_check_segref(xd, segment_id, LAST_FRAME);
John Koleszar's avatar
John Koleszar committed
421
        mod_refprobs[GOLDEN_FRAME] *=
422 423
          (vp9_check_segref(xd, segment_id, GOLDEN_FRAME) *
           vp9_check_segref(xd, segment_id, ALTREF_FRAME));
John Koleszar's avatar
John Koleszar committed
424 425 426 427 428 429 430
      }

      // Default to INTRA_FRAME (value 0)
      ref_frame = INTRA_FRAME;

      // Do we need to decode the Intra/Inter branch
      if (mod_refprobs[0])
431
        ref_frame = (MV_REFERENCE_FRAME) vp9_read(bc, mod_refprobs[0]);
John Koleszar's avatar
John Koleszar committed
432 433 434 435 436 437
      else
        ref_frame++;

      if (ref_frame) {
        // Do we need to decode the Last/Gf_Arf branch
        if (mod_refprobs[1])
438
          ref_frame += vp9_read(bc, mod_refprobs[1]);
439
        else
John Koleszar's avatar
John Koleszar committed
440 441 442 443 444
          ref_frame++;

        if (ref_frame > 1) {
          // Do we need to decode the GF/Arf branch
          if (mod_refprobs[2])
445
            ref_frame += vp9_read(bc, mod_refprobs[2]);
John Koleszar's avatar
John Koleszar committed
446 447 448
          else {
            if (seg_ref_active) {
              if ((pred_ref == GOLDEN_FRAME) ||
449
                  !vp9_check_segref(xd, segment_id, GOLDEN_FRAME)) {
John Koleszar's avatar
John Koleszar committed
450 451 452 453 454 455 456
                ref_frame = ALTREF_FRAME;
              } else
                ref_frame = GOLDEN_FRAME;
            } else
              ref_frame = (pred_ref == GOLDEN_FRAME)
                          ? ALTREF_FRAME : GOLDEN_FRAME;
          }
457
        }
John Koleszar's avatar
John Koleszar committed
458
      }
459
    }
John Koleszar's avatar
John Koleszar committed
460 461 462 463 464 465 466
  }

  // Segment reference frame features are enabled
  else {
    // The reference frame for the mb is considered as correclty predicted
    // if it is signaled at the segment level for the purposes of the
    // common prediction model
Paul Wilkins's avatar
Paul Wilkins committed
467 468
    vp9_set_pred_flag(xd, PRED_REF, 1);
    ref_frame = vp9_get_pred_ref(cm, xd);
John Koleszar's avatar
John Koleszar committed
469 470 471
  }

  return (MV_REFERENCE_FRAME)ref_frame;
472
}
John Koleszar's avatar
John Koleszar committed
473

474 475
static MB_PREDICTION_MODE read_sb_mv_ref(vp9_reader *bc, const vp9_prob *p) {
  return (MB_PREDICTION_MODE) treed_read(bc, vp9_sb_mv_ref_tree, p);
Ronald S. Bultje's avatar
Ronald S. Bultje committed
476
}
John Koleszar's avatar
John Koleszar committed
477

478 479
static MB_PREDICTION_MODE read_mv_ref(vp9_reader *bc, const vp9_prob *p) {
  return (MB_PREDICTION_MODE) treed_read(bc, vp9_mv_ref_tree, p);
John Koleszar's avatar
John Koleszar committed
480 481
}

482 483
static B_PREDICTION_MODE sub_mv_ref(vp9_reader *bc, const vp9_prob *p) {
  return (B_PREDICTION_MODE) treed_read(bc, vp9_sub_mv_ref_tree, p);
John Koleszar's avatar
John Koleszar committed
484
}
Scott LaVarnway's avatar
Scott LaVarnway committed
485 486

#ifdef VPX_MODE_COUNT
487
unsigned int vp9_mv_cont_count[5][4] = {
John Koleszar's avatar
John Koleszar committed
488 489 490 491 492
  { 0, 0, 0, 0 },
  { 0, 0, 0, 0 },
  { 0, 0, 0, 0 },
  { 0, 0, 0, 0 },
  { 0, 0, 0, 0 }
John Koleszar's avatar
John Koleszar committed
493
};
Scott LaVarnway's avatar
Scott LaVarnway committed
494
#endif
John Koleszar's avatar
John Koleszar committed
495

Dmitry Kovalev's avatar
Dmitry Kovalev committed
496
static const unsigned char mbsplit_fill_count[4] = { 8, 8, 4, 1 };
497
static const unsigned char mbsplit_fill_offset[4][16] = {
Dmitry Kovalev's avatar
Dmitry Kovalev committed
498 499 500 501
  { 0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15 },
  { 0,  1,  4,  5,  8,  9, 12, 13,  2,  3,   6,  7, 10, 11, 14, 15 },
  { 0,  1,  4,  5,  2,  3,  6,  7,  8,  9,  12, 13, 10, 11, 14, 15 },
  { 0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15 }
Scott LaVarnway's avatar
Scott LaVarnway committed
502
};
John Koleszar's avatar
John Koleszar committed
503

504
static void read_switchable_interp_probs(VP9D_COMP* const pbi,
John Koleszar's avatar
John Koleszar committed
505
                                         BOOL_DECODER* const bc) {
506
  VP9_COMMON *const cm = &pbi->common;
507
  int i, j;
508 509 510
  for (j = 0; j <= VP9_SWITCHABLE_FILTERS; ++j) {
    for (i = 0; i < VP9_SWITCHABLE_FILTERS - 1; ++i) {
      cm->fc.switchable_interp_prob[j][i] = vp9_read_literal(bc, 8);
511 512 513 514 515
    }
  }
  //printf("DECODER: %d %d\n", cm->fc.switchable_interp_prob[0],
  //cm->fc.switchable_interp_prob[1]);
}
John Koleszar's avatar
John Koleszar committed
516

517
static void mb_mode_mv_init(VP9D_COMP *pbi, vp9_reader *bc) {
518
  VP9_COMMON *const cm = &pbi->common;
519
  nmv_context *const nmvc = &pbi->common.fc.nmvc;
John Koleszar's avatar
John Koleszar committed
520
  MACROBLOCKD *const xd  = &pbi->mb;
John Koleszar's avatar
John Koleszar committed
521

522 523
  if (cm->frame_type == KEY_FRAME) {
    if (!cm->kf_ymode_probs_update)
524
      cm->kf_ymode_probs_index = vp9_read_literal(bc, 3);
525
  } else {
526
    if (cm->mcomp_filter_type == SWITCHABLE)
John Koleszar's avatar
John Koleszar committed
527
      read_switchable_interp_probs(pbi, bc);
528 529 530 531 532 533
#if CONFIG_COMP_INTERINTRA_PRED
    if (cm->use_interintra) {
      if (vp9_read(bc, VP9_UPD_INTERINTRA_PROB))
        cm->fc.interintra_prob  = (vp9_prob)vp9_read_literal(bc, 8);
    }
#endif
John Koleszar's avatar
John Koleszar committed
534
    // Decode the baseline probabilities for decoding reference frame
535 536 537
    cm->prob_intra_coded = (vp9_prob)vp9_read_literal(bc, 8);
    cm->prob_last_coded  = (vp9_prob)vp9_read_literal(bc, 8);
    cm->prob_gf_coded    = (vp9_prob)vp9_read_literal(bc, 8);
John Koleszar's avatar
John Koleszar committed
538 539 540

    // Computes a modified set of probabilities for use when reference
    // frame prediction fails.
Paul Wilkins's avatar
Paul Wilkins committed
541
    vp9_compute_mod_refprobs(cm);
John Koleszar's avatar
John Koleszar committed
542

543
    pbi->common.comp_pred_mode = vp9_read(bc, 128);
John Koleszar's avatar
John Koleszar committed
544
    if (cm->comp_pred_mode)
545
      cm->comp_pred_mode += vp9_read(bc, 128);
John Koleszar's avatar
John Koleszar committed
546 547 548
    if (cm->comp_pred_mode == HYBRID_PREDICTION) {
      int i;
      for (i = 0; i < COMP_PRED_CONTEXTS; i++)
549
        cm->prob_comppred[i] = (vp9_prob)vp9_read_literal(bc, 8);
John Koleszar's avatar
John Koleszar committed
550
    }
John Koleszar's avatar
John Koleszar committed
551

552
    if (vp9_read_bit(bc)) {
John Koleszar's avatar
John Koleszar committed
553
      int i = 0;
John Koleszar's avatar
John Koleszar committed
554

John Koleszar's avatar
John Koleszar committed
555
      do {
556 557
        cm->fc.ymode_prob[i] = (vp9_prob) vp9_read_literal(bc, 8);
      } while (++i < VP9_YMODES - 1);
John Koleszar's avatar
John Koleszar committed
558
    }
559

560 561 562 563 564 565 566 567
    if (vp9_read_bit(bc)) {
      int i = 0;

      do {
        cm->fc.sb_ymode_prob[i] = (vp9_prob) vp9_read_literal(bc, 8);
      } while (++i < VP9_I32X32_MODES - 1);
    }

568
    read_nmvprobs(bc, nmvc, xd->allow_high_precision_mv);
John Koleszar's avatar
John Koleszar committed
569
  }
Scott LaVarnway's avatar
Scott LaVarnway committed
570
}
John Koleszar's avatar
John Koleszar committed
571

572 573 574
// This function either reads the segment id for the current macroblock from
// the bitstream or if the value is temporally predicted asserts the predicted
// value
575
static void read_mb_segment_id(VP9D_COMP *pbi,
John Koleszar's avatar
John Koleszar committed
576 577
                               int mb_row, int mb_col,
                               BOOL_DECODER* const bc) {
578
  VP9_COMMON *const cm = &pbi->common;
John Koleszar's avatar
John Koleszar committed
579
  MACROBLOCKD *const xd  = &pbi->mb;
John Koleszar's avatar
John Koleszar committed
580 581 582 583 584 585 586 587 588 589
  MODE_INFO *mi = xd->mode_info_context;
  MB_MODE_INFO *mbmi = &mi->mbmi;
  int index = mb_row * pbi->common.mb_cols + mb_col;

  if (xd->segmentation_enabled) {
    if (xd->update_mb_segmentation_map) {
      // Is temporal coding of the segment id for this mb enabled.
      if (cm->temporal_update) {
        // Get the context based probability for reading the
        // prediction status flag
590
        vp9_prob pred_prob =
Paul Wilkins's avatar
Paul Wilkins committed
591
          vp9_get_pred_prob(cm, xd, PRED_SEG_ID);
592

John Koleszar's avatar
John Koleszar committed
593 594
        // Read the prediction status flag
        unsigned char seg_pred_flag =
595
          (unsigned char)vp9_read(bc, pred_prob);
596

John Koleszar's avatar
John Koleszar committed
597
        // Store the prediction flag.
Paul Wilkins's avatar
Paul Wilkins committed
598
        vp9_set_pred_flag(xd, PRED_SEG_ID, seg_pred_flag);
John Koleszar's avatar
John Koleszar committed
599 600 601 602

        // If the value is flagged as correctly predicted
        // then use the predicted value
        if (seg_pred_flag) {
Ronald S. Bultje's avatar
Ronald S. Bultje committed
603
          mbmi->segment_id = vp9_get_pred_mb_segid(cm, xd, index);
604
        }
John Koleszar's avatar
John Koleszar committed
605 606
        // Else .... decode it explicitly
        else {
607
          read_mb_segid_except(cm, bc, mbmi, xd, mb_row, mb_col);
John Koleszar's avatar
John Koleszar committed
608 609 610 611
        }
      }
      // Normal unpredicted coding mode
      else {
612
        read_mb_segid(bc, mbmi, xd);
Ronald S. Bultje's avatar
Ronald S. Bultje committed
613
      }
Ronald S. Bultje's avatar
Ronald S. Bultje committed
614 615 616 617 618 619 620 621 622 623 624
      if (mbmi->sb_type) {
        const int nmbs = 1 << mbmi->sb_type;
        const int ymbs = MIN(cm->mb_rows - mb_row, nmbs);
        const int xmbs = MIN(cm->mb_cols - mb_col, nmbs);
        int x, y;

        for (y = 0; y < ymbs; y++) {
          for (x = 0; x < xmbs; x++) {
            cm->last_frame_seg_map[index + x + y * cm->mb_cols] =
                mbmi->segment_id;
          }
Ronald S. Bultje's avatar
Ronald S. Bultje committed
625
        }
626
      } else {
John Koleszar's avatar
John Koleszar committed
627 628
        cm->last_frame_seg_map[index] = mbmi->segment_id;
      }
Ronald S. Bultje's avatar
Ronald S. Bultje committed
629
    } else {
Ronald S. Bultje's avatar
Ronald S. Bultje committed
630 631 632 633 634 635 636 637 638 639
      if (mbmi->sb_type) {
        const int nmbs = 1 << mbmi->sb_type;
        const int ymbs = MIN(cm->mb_rows - mb_row, nmbs);
        const int xmbs = MIN(cm->mb_cols - mb_col, nmbs);
        unsigned segment_id = -1;
        int x, y;

        for (y = 0; y < ymbs; y++) {
          for (x = 0; x < xmbs; x++) {
            segment_id = MIN(segment_id,
Dmitry Kovalev's avatar
Dmitry Kovalev committed
640
                cm->last_frame_seg_map[index + x + y * cm->mb_cols]);
Ronald S. Bultje's avatar
Ronald S. Bultje committed
641
          }
Ronald S. Bultje's avatar
Ronald S. Bultje committed
642
        }
Ronald S. Bultje's avatar
Ronald S. Bultje committed
643
        mbmi->segment_id = segment_id;
644
      } else {
Ronald S. Bultje's avatar
Ronald S. Bultje committed
645 646
        mbmi->segment_id = cm->last_frame_seg_map[index];
      }
647
    }
John Koleszar's avatar
John Koleszar committed
648 649 650 651 652
  } else {
    // The encoder explicitly sets the segment_id to 0
    // when segmentation is disabled
    mbmi->segment_id = 0;
  }
653
}
654

655
static void read_mb_modes_mv(VP9D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi,
656
                             MODE_INFO *prev_mi,
John Koleszar's avatar
John Koleszar committed
657 658
                             int mb_row, int mb_col,
                             BOOL_DECODER* const bc) {
659
  VP9_COMMON *const cm = &pbi->common;
660
  nmv_context *const nmvc = &pbi->common.fc.nmvc;
John Koleszar's avatar
John Koleszar committed
661
  const int mis = pbi->common.mode_info_stride;
John Koleszar's avatar
John Koleszar committed
662
  MACROBLOCKD *const xd  = &pbi->mb;
John Koleszar's avatar
John Koleszar committed
663

664
  int_mv *const mv = &mbmi->mv[0];
John Koleszar's avatar
John Koleszar committed
665 666
  int mb_to_left_edge;
  int mb_to_right_edge;
Ronald S. Bultje's avatar
Ronald S. Bultje committed
667
  const int mb_size = 1 << mi->mbmi.sb_type;
Dmitry Kovalev's avatar
Dmitry Kovalev committed
668

669 670 671
  const int use_prev_in_find_mv_refs = cm->Width == cm->last_width &&
                                       cm->Height == cm->last_height &&
                                       !cm->error_resilient_mode;
John Koleszar's avatar
John Koleszar committed
672

Dmitry Kovalev's avatar
Dmitry Kovalev committed
673 674 675
  int mb_to_top_edge = xd->mb_to_top_edge - LEFT_TOP_MARGIN;
  int mb_to_bottom_edge = xd->mb_to_bottom_edge + RIGHT_BOTTOM_MARGIN;

John Koleszar's avatar
John Koleszar committed
676 677
  mbmi->need_to_clamp_mvs = 0;
  mbmi->need_to_clamp_secondmv = 0;
678
  mbmi->second_ref_frame = NONE;
Dmitry Kovalev's avatar
Dmitry Kovalev committed
679 680 681 682 683 684

  // Distance of Mb to the various image edges.
  // These specified to 8th pel as they are always compared to MV values
  // that are in 1/8th pel units
  xd->mb_to_left_edge = mb_to_left_edge
                      = -((mb_col * 16) << 3);
John Koleszar's avatar
John Koleszar committed
685
  mb_to_left_edge -= LEFT_TOP_MARGIN;
Dmitry Kovalev's avatar
Dmitry Kovalev committed
686 687 688

  xd->mb_to_right_edge = mb_to_right_edge
                       = ((pbi->common.mb_cols - mb_size - mb_col) * 16) << 3;
John Koleszar's avatar
John Koleszar committed
689 690 691 692 693
  mb_to_right_edge += RIGHT_BOTTOM_MARGIN;

  // Make sure the MACROBLOCKD mode info pointer is pointed at the
  // correct entry for the current macroblock.
  xd->mode_info_context = mi;
694
  xd->prev_mode_info_context = prev_mi;
John Koleszar's avatar
John Koleszar committed
695 696

  // Read the macroblock segment id.
John Koleszar's avatar
John Koleszar committed
697
  read_mb_segment_id(pbi, mb_row, mb_col, bc);
John Koleszar's avatar
John Koleszar committed
698 699

  if (pbi->common.mb_no_coeff_skip &&
Paul Wilkins's avatar
Paul Wilkins committed
700
      (!vp9_segfeature_active(xd, mbmi->segment_id, SEG_LVL_SKIP))) {
John Koleszar's avatar
John Koleszar committed
701 702
    // Read the macroblock coeff skip flag if this feature is in use,
    // else default to 0
703
    mbmi->mb_skip_coeff = vp9_read(bc, vp9_get_pred_prob(cm, xd, PRED_MBSKIP));
John Koleszar's avatar
John Koleszar committed
704
  } else {
Dmitry Kovalev's avatar
Dmitry Kovalev committed
705 706
    mbmi->mb_skip_coeff =
        vp9_segfeature_active(xd, mbmi->segment_id, SEG_LVL_SKIP) ? 1 : 0;
John Koleszar's avatar
John Koleszar committed
707 708 709
  }

  // Read the reference frame
Paul Wilkins's avatar
Paul Wilkins committed
710
  mbmi->ref_frame = read_ref_frame(pbi, bc, mbmi->segment_id);
John Koleszar's avatar
John Koleszar committed
711

712 713 714 715 716
  /*
  if (pbi->common.current_video_frame == 1)
    printf("ref frame: %d [%d %d]\n", mbmi->ref_frame, mb_row, mb_col);
    */

John Koleszar's avatar
John Koleszar committed
717 718 719 720
  // If reference frame is an Inter frame
  if (mbmi->ref_frame) {
    int_mv nearest, nearby, best_mv;
    int_mv nearest_second, nearby_second, best_mv_second;
Dmitry Kovalev's avatar
Dmitry Kovalev committed
721
    vp9_prob mv_ref_p[VP9_MVREFS - 1];
John Koleszar's avatar
John Koleszar committed
722

723
    MV_REFERENCE_FRAME ref_frame = mbmi->ref_frame;
724
    xd->scale_factor[0] = cm->active_ref_scale[mbmi->ref_frame - 1];
725 726 727

    {
      int ref_fb_idx;
728 729 730 731 732
      const int use_prev_in_find_best_ref =
          xd->scale_factor[0].x_num == xd->scale_factor[0].x_den &&
          xd->scale_factor[0].y_num == xd->scale_factor[0].y_den &&
          !cm->error_resilient_mode &&
          !cm->frame_parallel_decoding_mode;
733 734

      /* Select the appropriate reference frame for this MB */
735
      ref_fb_idx = cm->active_ref_idx[ref_frame - 1];
736

737 738
      setup_pred_block(&xd->pre, &cm->yv12_fb[ref_fb_idx],
          mb_row, mb_col, &xd->scale_factor[0], &xd->scale_factor_uv[0]);
739

740 741 742 743 744
#ifdef DEC_DEBUG
      if (dec_debug)
        printf("%d %d\n", xd->mode_info_context->mbmi.mv[0].as_mv.row,
               xd->mode_info_context->mbmi.mv[0].as_mv.col);
#endif
745 746
      // if (cm->current_video_frame == 1 && mb_row == 4 && mb_col == 5)
      //  printf("Dello\n");
747
      vp9_find_mv_refs(cm, xd, mi, use_prev_in_find_mv_refs ? prev_mi : NULL,
Paul Wilkins's avatar
Paul Wilkins committed
748 749
                       ref_frame, mbmi->ref_mvs[ref_frame],
                       cm->ref_frame_sign_bias);
Paul Wilkins's avatar
Paul Wilkins committed
750

Paul Wilkins's avatar
Paul Wilkins committed
751 752
      vp9_mv_ref_probs(&pbi->common, mv_ref_p,
                       mbmi->mb_mode_context[ref_frame]);
753 754 755 756 757 758 759 760 761 762 763
      /*
      if (pbi->common.current_video_frame == 1) {
	int k = mbmi->mb_mode_context[ref_frame];
	printf("vp9_mode_contexts: [%d %d %d %d] %d %d %d %d\n",
	       mb_row, mb_col, ref_frame, k,
	       cm->fc.vp9_mode_contexts[k][0],
	       cm->fc.vp9_mode_contexts[k][1],
	       cm->fc.vp9_mode_contexts[k][2],
	       cm->fc.vp9_mode_contexts[k][3]);
      }
      */
764

765
      // If the segment level skip mode enabled
Paul Wilkins's avatar
Paul Wilkins committed
766 767
      if (vp9_segfeature_active(xd, mbmi->segment_id, SEG_LVL_SKIP)) {
        mbmi->mode = ZEROMV;
768
      } else {
Ronald S. Bultje's avatar
Ronald S. Bultje committed
769
        if (mbmi->sb_type)
770 771
          mbmi->mode = read_sb_mv_ref(bc, mv_ref_p);
        else
772
          mbmi->mode = read_mv_ref(bc, mv_ref_p);
773 774 775 776 777 778 779

        vp9_accum_mv_refs(&pbi->common, mbmi->mode,
                          mbmi->mb_mode_context[ref_frame]);
      }

      if (mbmi->mode != ZEROMV) {
        vp9_find_best_ref_mvs(xd,
780 781 782
                              use_prev_in_find_best_ref ?
                                  xd->pre.y_buffer : NULL,
                              xd->pre.y_stride,
783 784 785 786 787
                              mbmi->ref_mvs[ref_frame],
                              &nearest, &nearby);

        best_mv.as_int = (mbmi->ref_mvs[ref_frame][0]).as_int;
      }
788

789 790 791 792 793 794
#ifdef DEC_DEBUG
      if (dec_debug)
        printf("[D %d %d] %d %d %d %d\n", ref_frame,
               mbmi->mb_mode_context[ref_frame],
               mv_ref_p[0], mv_ref_p[1], mv_ref_p[2], mv_ref_p[3]);
#endif
Paul Wilkins's avatar
Paul Wilkins committed
795
    }
John Koleszar's avatar
John Koleszar committed
796

Dmitry Kovalev's avatar
Dmitry Kovalev committed
797
    if (mbmi->mode >= NEARESTMV && mbmi->mode <= SPLITMV) {
798
      if (cm->mcomp_filter_type == SWITCHABLE) {
799
        mbmi->interp_filter = vp9_switchable_interp[
800 801
            treed_read(bc, vp9_switchable_interp_tree,
                       vp9_get_pred_probs(cm, xd, PRED_SWITCHABLE_INTERP))];
802 803 804 805
      } else {
        mbmi->interp_filter = cm->mcomp_filter_type;
      }
    }
806

John Koleszar's avatar
John Koleszar committed
807 808
    if (cm->comp_pred_mode == COMP_PREDICTION_ONLY ||
        (cm->comp_pred_mode == HYBRID_PREDICTION &&