decodemv.c 40.1 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 "treereader.h"
13 14
#include "vp9/common/entropymv.h"
#include "vp9/common/entropymode.h"
John Koleszar's avatar
John Koleszar committed
15
#include "onyxd_int.h"
16
#include "vp9/common/findnearmv.h"
Scott LaVarnway's avatar
Scott LaVarnway committed
17

18 19 20 21
#include "vp9/common/seg_common.h"
#include "vp9/common/pred_common.h"
#include "vp9/common/entropy.h"
#include "vp9/decoder/decodemv.h"
John Koleszar's avatar
John Koleszar committed
22 23 24
#if CONFIG_DEBUG
#include <assert.h>
#endif
25

John Koleszar's avatar
John Koleszar committed
26
// #define DEBUG_DEC_MV
27 28 29 30
#ifdef DEBUG_DEC_MV
int dec_mvcount = 0;
#endif

31
static int read_bmode(vp9_reader *bc, const vp9_prob *p) {
32 33 34 35 36 37 38 39 40 41 42
  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;
}

static int read_kf_bmode(vp9_reader *bc, const vp9_prob *p) {
  return treed_read(bc, vp9_kf_bmode_tree, p);
Scott LaVarnway's avatar
Scott LaVarnway committed
43 44
}

45 46
static int read_ymode(vp9_reader *bc, const vp9_prob *p) {
  return treed_read(bc, vp9_ymode_tree, p);
Ronald S. Bultje's avatar
Ronald S. Bultje committed
47
}
Scott LaVarnway's avatar
Scott LaVarnway committed
48

Ronald S. Bultje's avatar
Ronald S. Bultje committed
49
#if CONFIG_SUPERBLOCKS
50 51
static int read_kf_sb_ymode(vp9_reader *bc, const vp9_prob *p) {
  return treed_read(bc, vp9_uv_mode_tree, p);
Scott LaVarnway's avatar
Scott LaVarnway committed
52
}
Ronald S. Bultje's avatar
Ronald S. Bultje committed
53
#endif
Scott LaVarnway's avatar
Scott LaVarnway committed
54

55 56
static int read_kf_mb_ymode(vp9_reader *bc, const vp9_prob *p) {
  return treed_read(bc, vp9_kf_ymode_tree, p);
Scott LaVarnway's avatar
Scott LaVarnway committed
57 58
}

59 60
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
61
}
Scott LaVarnway's avatar
Scott LaVarnway committed
62

63 64
static int read_uv_mode(vp9_reader *bc, const vp9_prob *p) {
  return treed_read(bc, vp9_uv_mode_tree, p);
Scott LaVarnway's avatar
Scott LaVarnway committed
65 66
}

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

83
#if CONFIG_NEW_MVREF
84 85
int vp9_read_mv_ref_id(vp9_reader *r,
                       vp9_prob * ref_id_probs) {
86 87
  int ref_index = 0;

88
  if (vp9_read(r, ref_id_probs[0])) {
89
    ref_index++;
90
    if (vp9_read(r, ref_id_probs[1])) {
91
      ref_index++;
92
      if (vp9_read(r, ref_id_probs[2]))
93 94 95 96 97 98 99
        ref_index++;
    }
  }
  return ref_index;
}
#endif

100
extern const int vp9_i8x8_block[4];
101
static void kfread_modes(VP9D_COMP *pbi,
John Koleszar's avatar
John Koleszar committed
102 103 104 105
                         MODE_INFO *m,
                         int mb_row,
                         int mb_col,
                         BOOL_DECODER* const bc) {
106
  VP9_COMMON *const cm = &pbi->common;
John Koleszar's avatar
John Koleszar committed
107 108 109 110 111 112 113 114
  const int mis = pbi->common.mode_info_stride;
  int map_index = mb_row * pbi->common.mb_cols + mb_col;
  MB_PREDICTION_MODE y_mode;

  // 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) {
115
    read_mb_segid(bc, &m->mbmi, &pbi->mb);
John Koleszar's avatar
John Koleszar committed
116 117 118 119 120
    pbi->common.last_frame_seg_map[map_index] = m->mbmi.segment_id;
  }

  m->mbmi.mb_skip_coeff = 0;
  if (pbi->common.mb_no_coeff_skip &&
121 122 123 124
      (!vp9_segfeature_active(&pbi->mb,
                              m->mbmi.segment_id, SEG_LVL_EOB) ||
       (vp9_get_segdata(&pbi->mb,
                        m->mbmi.segment_id, SEG_LVL_EOB) != 0))) {
John Koleszar's avatar
John Koleszar committed
125
    MACROBLOCKD *const xd  = &pbi->mb;
Paul Wilkins's avatar
Paul Wilkins committed
126
    m->mbmi.mb_skip_coeff =
127
      vp9_read(bc, vp9_get_pred_prob(cm, xd, PRED_MBSKIP));
John Koleszar's avatar
John Koleszar committed
128
  } else {
129 130 131 132
    if (vp9_segfeature_active(&pbi->mb,
                              m->mbmi.segment_id, SEG_LVL_EOB) &&
        (vp9_get_segdata(&pbi->mb,
                         m->mbmi.segment_id, SEG_LVL_EOB) == 0)) {
John Koleszar's avatar
John Koleszar committed
133 134 135 136 137
      m->mbmi.mb_skip_coeff = 1;
    } else
      m->mbmi.mb_skip_coeff = 0;
  }

Ronald S. Bultje's avatar
Ronald S. Bultje committed
138 139
#if CONFIG_SUPERBLOCKS
  if (m->mbmi.encoded_as_sb) {
140
    y_mode = (MB_PREDICTION_MODE) read_kf_sb_ymode(bc,
Ronald S. Bultje's avatar
Ronald S. Bultje committed
141 142 143
      pbi->common.sb_kf_ymode_prob[pbi->common.kf_ymode_probs_index]);
  } else
#endif
144
  y_mode = (MB_PREDICTION_MODE) read_kf_mb_ymode(bc,
Ronald S. Bultje's avatar
Ronald S. Bultje committed
145
    pbi->common.kf_ymode_prob[pbi->common.kf_ymode_probs_index]);
146
#if CONFIG_COMP_INTRA_PRED
John Koleszar's avatar
John Koleszar committed
147
  m->mbmi.second_mode = (MB_PREDICTION_MODE)(DC_PRED - 1);
148
#endif
149

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

John Koleszar's avatar
John Koleszar committed
152 153
  if ((m->mbmi.mode = y_mode) == B_PRED) {
    int i = 0;
154
#if CONFIG_COMP_INTRA_PRED
155
    int use_comp_pred = vp9_read(bc, DEFAULT_COMP_INTRA_PROB);
156
#endif
John Koleszar's avatar
John Koleszar committed
157 158 159
    do {
      const B_PREDICTION_MODE A = above_block_mode(m, i, mis);
      const B_PREDICTION_MODE L = left_block_mode(m, i);
Paul Wilkins's avatar
Paul Wilkins committed
160

John Koleszar's avatar
John Koleszar committed
161
      m->bmi[i].as_mode.first =
162
        (B_PREDICTION_MODE) read_kf_bmode(
John Koleszar's avatar
John Koleszar committed
163
          bc, pbi->common.kf_bmode_prob [A] [L]);
164
#if CONFIG_COMP_INTRA_PRED
John Koleszar's avatar
John Koleszar committed
165 166
      if (use_comp_pred) {
        m->bmi[i].as_mode.second =
167
          (B_PREDICTION_MODE) read_kf_bmode(
John Koleszar's avatar
John Koleszar committed
168 169 170 171
            bc, pbi->common.kf_bmode_prob [A] [L]);
      } else {
        m->bmi[i].as_mode.second = (B_PREDICTION_MODE)(B_DC_PRED - 1);
      }
172
#endif
John Koleszar's avatar
John Koleszar committed
173 174 175 176 177 178
    } while (++i < 16);
  }
  if ((m->mbmi.mode = y_mode) == I8X8_PRED) {
    int i;
    int mode8x8;
    for (i = 0; i < 4; i++) {
179
      int ib = vp9_i8x8_block[i];
180
      mode8x8 = read_i8x8_mode(bc, pbi->common.fc.i8x8_mode_prob);
John Koleszar's avatar
John Koleszar committed
181 182 183 184
      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;
185
#if CONFIG_COMP_INTRA_PRED
John Koleszar's avatar
John Koleszar committed
186 187 188 189
      m->bmi[ib + 0].as_mode.second = (MB_PREDICTION_MODE)(DC_PRED - 1);
      m->bmi[ib + 1].as_mode.second = (MB_PREDICTION_MODE)(DC_PRED - 1);
      m->bmi[ib + 4].as_mode.second = (MB_PREDICTION_MODE)(DC_PRED - 1);
      m->bmi[ib + 5].as_mode.second = (MB_PREDICTION_MODE)(DC_PRED - 1);
190
#endif
John Koleszar's avatar
John Koleszar committed
191 192
    }
  } else
193 194
    m->mbmi.uv_mode = (MB_PREDICTION_MODE)read_uv_mode(bc,
                                                       pbi->common.kf_uv_mode_prob[m->mbmi.mode]);
195
#if CONFIG_COMP_INTRA_PRED
John Koleszar's avatar
John Koleszar committed
196
  m->mbmi.second_uv_mode = (MB_PREDICTION_MODE)(DC_PRED - 1);
197
#endif
198

199
  if (cm->txfm_mode == TX_MODE_SELECT && m->mbmi.mb_skip_coeff == 0 &&
200
      m->mbmi.mode <= I8X8_PRED) {
201
    // FIXME(rbultje) code ternary symbol once all experiments are merged
202
    m->mbmi.txfm_size = vp9_read(bc, cm->prob_tx[0]);
203
    if (m->mbmi.txfm_size != TX_4X4 && m->mbmi.mode != I8X8_PRED)
204
      m->mbmi.txfm_size += vp9_read(bc, cm->prob_tx[1]);
205
  } else if (cm->txfm_mode >= ALLOW_16X16 && m->mbmi.mode <= TM_PRED) {
206
    m->mbmi.txfm_size = TX_16X16;
207
  } else if (cm->txfm_mode >= ALLOW_8X8 && m->mbmi.mode != B_PRED) {
208 209 210 211
    m->mbmi.txfm_size = TX_8X8;
  } else {
    m->mbmi.txfm_size = TX_4X4;
  }
Scott LaVarnway's avatar
Scott LaVarnway committed
212
}
John Koleszar's avatar
John Koleszar committed
213

214
static int read_nmv_component(vp9_reader *r,
215 216 217
                              int rv,
                              const nmv_component *mvcomp) {
  int v, s, z, c, o, d;
218 219
  s = vp9_read(r, mvcomp->sign);
  c = treed_read(r, vp9_mv_class_tree, mvcomp->classes);
220
  if (c == MV_CLASS_0) {
221
    d = treed_read(r, vp9_mv_class0_tree, mvcomp->class0);
222 223 224 225 226
  } else {
    int i, b;
    d = 0;
    b = c + CLASS0_BITS - 1;  /* number of bits */
    for (i = 0; i < b; ++i)
227
      d |= (vp9_read(r, mvcomp->bits[i]) << i);
228 229 230
  }
  o = d << 3;

231
  z = vp9_get_mv_mag(c, o);
232
  v = (s ? -(z + 8) : (z + 8));
233 234 235
  return v;
}

236
static int read_nmv_component_fp(vp9_reader *r,
237 238 239 240 241 242 243
                                 int v,
                                 int rv,
                                 const nmv_component *mvcomp,
                                 int usehp) {
  int s, z, c, o, d, e, f;
  s = v < 0;
  z = (s ? -v : v) - 1;       /* magnitude - 1 */
244
  z &= ~7;
245

246
  c = vp9_get_mv_class(z, &o);
247 248 249
  d = o >> 3;

  if (c == MV_CLASS_0) {
250
    f = treed_read(r, vp9_mv_fp_tree, mvcomp->class0_fp[d]);
251
  } else {
252
    f = treed_read(r, vp9_mv_fp_tree, mvcomp->fp);
253 254 255 256 257
  }
  o += (f << 1);

  if (usehp) {
    if (c == MV_CLASS_0) {
258
      e = vp9_read(r, mvcomp->class0_hp);
259
    } else {
260
      e = vp9_read(r, mvcomp->hp);
261 262 263 264 265
    }
    o += e;
  } else {
    ++o;  /* Note if hp is not used, the default value of the hp bit is 1 */
  }
266
  z = vp9_get_mv_mag(c, o);
267 268 269 270
  v = (s ? -(z + 1) : (z + 1));
  return v;
}

271
static void read_nmv(vp9_reader *r, MV *mv, const MV *ref,
272
                     const nmv_context *mvctx) {
273
  MV_JOINT_TYPE j = treed_read(r, vp9_mv_joint_tree, mvctx->joints);
274 275 276 277 278 279 280 281 282
  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]);
  }
  if (j == MV_JOINT_HNZVZ || j == MV_JOINT_HNZVNZ) {
    mv->col = read_nmv_component(r, ref->col, &mvctx->comps[1]);
  }
}

283
static void read_nmv_fp(vp9_reader *r, MV *mv, const MV *ref,
284
                        const nmv_context *mvctx, int usehp) {
285 286
  MV_JOINT_TYPE j = vp9_get_mv_joint(*mv);
  usehp = usehp && vp9_use_nmv_hp(ref);
287 288 289 290 291 292 293 294
  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);
  }
295
  //printf("  %d: %d %d ref: %d %d\n", usehp, mv->row, mv-> col, ref->row, ref->col);
296 297
}

298 299 300
static void update_nmv(vp9_reader *bc, vp9_prob *const p,
                       const vp9_prob upd_p) {
  if (vp9_read(bc, upd_p)) {
301
#ifdef LOW_PRECISION_MV_UPDATE
302
    *p = (vp9_read_literal(bc, 7) << 1) | 1;
303
#else
304
    *p = (vp9_read_literal(bc, 8));
305 306 307 308
#endif
  }
}

309
static void read_nmvprobs(vp9_reader *bc, nmv_context *mvctx,
310 311 312
                          int usehp) {
  int i, j, k;
#ifdef MV_GROUP_UPDATE
313
  if (!vp9_read_bit(bc)) return;
314 315 316
#endif
  for (j = 0; j < MV_JOINTS - 1; ++j) {
    update_nmv(bc, &mvctx->joints[j],
317
               VP9_NMV_UPDATE_PROB);
318 319 320
  }
  for (i = 0; i < 2; ++i) {
    update_nmv(bc, &mvctx->comps[i].sign,
321
               VP9_NMV_UPDATE_PROB);
322 323
    for (j = 0; j < MV_CLASSES - 1; ++j) {
      update_nmv(bc, &mvctx->comps[i].classes[j],
324
                 VP9_NMV_UPDATE_PROB);
325 326 327
    }
    for (j = 0; j < CLASS0_SIZE - 1; ++j) {
      update_nmv(bc, &mvctx->comps[i].class0[j],
328
                 VP9_NMV_UPDATE_PROB);
329 330 331
    }
    for (j = 0; j < MV_OFFSET_BITS; ++j) {
      update_nmv(bc, &mvctx->comps[i].bits[j],
332
                 VP9_NMV_UPDATE_PROB);
333 334 335 336 337 338 339
    }
  }

  for (i = 0; i < 2; ++i) {
    for (j = 0; j < CLASS0_SIZE; ++j) {
      for (k = 0; k < 3; ++k)
        update_nmv(bc, &mvctx->comps[i].class0_fp[j][k],
340
                   VP9_NMV_UPDATE_PROB);
341 342 343
    }
    for (j = 0; j < 3; ++j) {
      update_nmv(bc, &mvctx->comps[i].fp[j],
344
                 VP9_NMV_UPDATE_PROB);
345 346 347 348 349 350
    }
  }

  if (usehp) {
    for (i = 0; i < 2; ++i) {
      update_nmv(bc, &mvctx->comps[i].class0_hp,
351
                 VP9_NMV_UPDATE_PROB);
352
      update_nmv(bc, &mvctx->comps[i].hp,
353
                 VP9_NMV_UPDATE_PROB);
354 355 356 357
    }
  }
}

358
// Read the referncence frame
359
static MV_REFERENCE_FRAME read_ref_frame(VP9D_COMP *pbi,
360
                                         vp9_reader *const bc,
John Koleszar's avatar
John Koleszar committed
361 362 363 364 365
                                         unsigned char segment_id) {
  MV_REFERENCE_FRAME ref_frame;
  int seg_ref_active;
  int seg_ref_count = 0;

366
  VP9_COMMON *const cm = &pbi->common;
John Koleszar's avatar
John Koleszar committed
367 368
  MACROBLOCKD *const xd = &pbi->mb;

369 370 371
  seg_ref_active = vp9_segfeature_active(xd,
                                         segment_id,
                                         SEG_LVL_REF_FRAME);
John Koleszar's avatar
John Koleszar committed
372 373 374 375

  // If segment coding enabled does the segment allow for more than one
  // possible reference frame
  if (seg_ref_active) {
376 377 378 379
    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
380 381 382 383 384 385 386
  }

  // 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;
387
    vp9_prob pred_prob;
John Koleszar's avatar
John Koleszar committed
388 389 390
    MV_REFERENCE_FRAME pred_ref;

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

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

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

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

    // If correctly predicted then use the predicted value
    if (prediction_flag) {
      ref_frame = pred_ref;
Paul Wilkins's avatar
Paul Wilkins committed
405
    }
John Koleszar's avatar
John Koleszar committed
406 407
    // else decode the explicitly coded value
    else {
408
      vp9_prob mod_refprobs[PREDICTION_PROBS];
John Koleszar's avatar
John Koleszar committed
409 410 411 412 413 414 415
      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] *=
416
          vp9_check_segref(xd, segment_id, INTRA_FRAME);
John Koleszar's avatar
John Koleszar committed
417
        mod_refprobs[LAST_FRAME] *=
418
          vp9_check_segref(xd, segment_id, LAST_FRAME);
John Koleszar's avatar
John Koleszar committed
419
        mod_refprobs[GOLDEN_FRAME] *=
420 421
          (vp9_check_segref(xd, segment_id, GOLDEN_FRAME) *
           vp9_check_segref(xd, segment_id, ALTREF_FRAME));
John Koleszar's avatar
John Koleszar committed
422 423 424 425 426 427 428
      }

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

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

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

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

  // 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
465 466
    vp9_set_pred_flag(xd, PRED_REF, 1);
    ref_frame = vp9_get_pred_ref(cm, xd);
John Koleszar's avatar
John Koleszar committed
467 468 469
  }

  return (MV_REFERENCE_FRAME)ref_frame;
470
}
John Koleszar's avatar
John Koleszar committed
471

Ronald S. Bultje's avatar
Ronald S. Bultje committed
472
#if CONFIG_SUPERBLOCKS
473 474
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
475 476
}
#endif
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

496 497
static const unsigned char mbsplit_fill_count[4] = {8, 8, 4, 1};
static const unsigned char mbsplit_fill_offset[4][16] = {
John Koleszar's avatar
John Koleszar 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 CONFIG_PRED_FILTER
527
    cm->pred_filter_mode = (vp9_prob)vp9_read_literal(bc, 2);
528

John Koleszar's avatar
John Koleszar committed
529
    if (cm->pred_filter_mode == 2)
530
      cm->prob_pred_filter_off = (vp9_prob)vp9_read_literal(bc, 8);
531 532
#endif
    if (cm->mcomp_filter_type == SWITCHABLE)
John Koleszar's avatar
John Koleszar committed
533
      read_switchable_interp_probs(pbi, bc);
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

#if CONFIG_NEW_MVREF
  // Temp defaults probabilities for ecnoding the MV ref id signal
  vpx_memset(xd->mb_mv_ref_id_probs, 192, sizeof(xd->mb_mv_ref_id_probs));
#endif

565
    read_nmvprobs(bc, nmvc, xd->allow_high_precision_mv);
John Koleszar's avatar
John Koleszar committed
566
  }
Scott LaVarnway's avatar
Scott LaVarnway committed
567
}
John Koleszar's avatar
John Koleszar committed
568

569 570 571
// 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
572
static void read_mb_segment_id(VP9D_COMP *pbi,
John Koleszar's avatar
John Koleszar committed
573 574
                               int mb_row, int mb_col,
                               BOOL_DECODER* const bc) {
575
  VP9_COMMON *const cm = &pbi->common;
John Koleszar's avatar
John Koleszar committed
576
  MACROBLOCKD *const xd  = &pbi->mb;
John Koleszar's avatar
John Koleszar committed
577 578 579 580 581 582 583 584 585 586
  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
587
        vp9_prob pred_prob =
Paul Wilkins's avatar
Paul Wilkins committed
588
          vp9_get_pred_prob(cm, xd, PRED_SEG_ID);
589

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

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

        // 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
600
          mbmi->segment_id = vp9_get_pred_mb_segid(cm, xd, index);
601
        }
John Koleszar's avatar
John Koleszar committed
602 603
        // Else .... decode it explicitly
        else {
604
          read_mb_segid(bc, mbmi, xd);
John Koleszar's avatar
John Koleszar committed
605 606 607 608
        }
      }
      // Normal unpredicted coding mode
      else {
609
        read_mb_segid(bc, mbmi, xd);
Ronald S. Bultje's avatar
Ronald S. Bultje committed
610 611 612
      }
#if CONFIG_SUPERBLOCKS
      if (mbmi->encoded_as_sb) {
Ronald S. Bultje's avatar
Ronald S. Bultje committed
613 614 615 616 617 618 619 620
        cm->last_frame_seg_map[index] = mbmi->segment_id;
        if (mb_col + 1 < cm->mb_cols)
          cm->last_frame_seg_map[index + 1] = mbmi->segment_id;
        if (mb_row + 1 < cm->mb_rows) {
          cm->last_frame_seg_map[index + cm->mb_cols] = mbmi->segment_id;
          if (mb_col + 1 < cm->mb_cols)
            cm->last_frame_seg_map[index + cm->mb_cols + 1] = mbmi->segment_id;
        }
Ronald S. Bultje's avatar
Ronald S. Bultje committed
621 622 623
      } else
#endif
      {
John Koleszar's avatar
John Koleszar committed
624 625
        cm->last_frame_seg_map[index] = mbmi->segment_id;
      }
Ronald S. Bultje's avatar
Ronald S. Bultje committed
626 627 628
    } else {
#if CONFIG_SUPERBLOCKS
      if (mbmi->encoded_as_sb) {
Ronald S. Bultje's avatar
Ronald S. Bultje committed
629 630 631 632 633 634 635 636 637 638 639
        mbmi->segment_id = cm->last_frame_seg_map[index];
        if (mb_col < cm->mb_cols - 1)
          mbmi->segment_id = mbmi->segment_id &&
                             cm->last_frame_seg_map[index + 1];
        if (mb_row < cm->mb_rows - 1) {
          mbmi->segment_id = mbmi->segment_id &&
                             cm->last_frame_seg_map[index + cm->mb_cols];
          if (mb_col < cm->mb_cols - 1)
            mbmi->segment_id = mbmi->segment_id &&
                               cm->last_frame_seg_map[index + cm->mb_cols + 1];
        }
Ronald S. Bultje's avatar
Ronald S. Bultje committed
640 641 642 643 644
      } else
#endif
      {
        mbmi->segment_id = cm->last_frame_seg_map[index];
      }
645
    }
John Koleszar's avatar
John Koleszar committed
646 647 648 649 650
  } else {
    // The encoder explicitly sets the segment_id to 0
    // when segmentation is disabled
    mbmi->segment_id = 0;
  }
651
}
652

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

662
  int_mv *const mv = &mbmi->mv[0];
John Koleszar's avatar
John Koleszar committed
663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678
  int mb_to_left_edge;
  int mb_to_right_edge;
  int mb_to_top_edge;
  int mb_to_bottom_edge;

  mb_to_top_edge = xd->mb_to_top_edge;
  mb_to_bottom_edge = xd->mb_to_bottom_edge;
  mb_to_top_edge -= LEFT_TOP_MARGIN;
  mb_to_bottom_edge += RIGHT_BOTTOM_MARGIN;
  mbmi->need_to_clamp_mvs = 0;
  mbmi->need_to_clamp_secondmv = 0;
  mbmi->second_ref_frame = 0;
  /* 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 =
Scott LaVarnway's avatar
Scott LaVarnway committed
679
    mb_to_left_edge = -((mb_col * 16) << 3);
John Koleszar's avatar
John Koleszar committed
680
  mb_to_left_edge -= LEFT_TOP_MARGIN;
Scott LaVarnway's avatar
Scott LaVarnway committed
681

John Koleszar's avatar
John Koleszar committed
682
  xd->mb_to_right_edge =
Scott LaVarnway's avatar
Scott LaVarnway committed
683
    mb_to_right_edge = ((pbi->common.mb_cols - 1 - mb_col) * 16) << 3;
John Koleszar's avatar
John Koleszar committed
684 685 686 687 688
  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;
689
  xd->prev_mode_info_context = prev_mi;
John Koleszar's avatar
John Koleszar committed
690 691

  // Read the macroblock segment id.
John Koleszar's avatar
John Koleszar committed
692
  read_mb_segment_id(pbi, mb_row, mb_col, bc);
John Koleszar's avatar
John Koleszar committed
693 694

  if (pbi->common.mb_no_coeff_skip &&
695 696 697
      (!vp9_segfeature_active(xd,
                              mbmi->segment_id, SEG_LVL_EOB) ||
       (vp9_get_segdata(xd, mbmi->segment_id, SEG_LVL_EOB) != 0))) {
John Koleszar's avatar
John Koleszar committed
698 699
    // Read the macroblock coeff skip flag if this feature is in use,
    // else default to 0
700
    mbmi->mb_skip_coeff = vp9_read(bc, vp9_get_pred_prob(cm, xd, PRED_MBSKIP));
John Koleszar's avatar
John Koleszar committed
701
  } else {
702 703 704
    if (vp9_segfeature_active(xd,
                              mbmi->segment_id, SEG_LVL_EOB) &&
        (vp9_get_segdata(xd, mbmi->segment_id, SEG_LVL_EOB) == 0)) {
John Koleszar's avatar
John Koleszar committed
705 706 707 708 709 710 711 712 713 714 715 716 717
      mbmi->mb_skip_coeff = 1;
    } else
      mbmi->mb_skip_coeff = 0;
  }

  // Read the reference frame
  mbmi->ref_frame = read_ref_frame(pbi, bc, mbmi->segment_id);

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

720 721 722 723 724
    int recon_y_stride, recon_yoffset;
    int recon_uv_stride, recon_uvoffset;

    {
      int ref_fb_idx;
Paul Wilkins's avatar
Paul Wilkins committed
725
      MV_REFERENCE_FRAME ref_frame = mbmi->ref_frame;
726 727

      /* Select the appropriate reference frame for this MB */
Paul Wilkins's avatar
Paul Wilkins committed
728
      if (ref_frame == LAST_FRAME)
729
        ref_fb_idx = cm->lst_fb_idx;
Paul Wilkins's avatar
Paul Wilkins committed
730
      else if (ref_frame == GOLDEN_FRAME)
731 732 733 734 735 736 737 738 739 740 741 742 743 744
        ref_fb_idx = cm->gld_fb_idx;
      else
        ref_fb_idx = cm->alt_fb_idx;

      recon_y_stride = cm->yv12_fb[ref_fb_idx].y_stride  ;
      recon_uv_stride = cm->yv12_fb[ref_fb_idx].uv_stride;

      recon_yoffset = (mb_row * recon_y_stride * 16) + (mb_col * 16);
      recon_uvoffset = (mb_row * recon_uv_stride * 8) + (mb_col * 8);

      xd->pre.y_buffer = cm->yv12_fb[ref_fb_idx].y_buffer + recon_yoffset;
      xd->pre.u_buffer = cm->yv12_fb[ref_fb_idx].u_buffer + recon_uvoffset;
      xd->pre.v_buffer = cm->yv12_fb[ref_fb_idx].v_buffer + recon_uvoffset;

Paul Wilkins's avatar
Paul Wilkins committed
745 746 747
      vp9_find_mv_refs(xd, mi, prev_mi,
                       ref_frame, mbmi->ref_mvs[ref_frame],
                       cm->ref_frame_sign_bias);
Paul Wilkins's avatar
Paul Wilkins committed
748

749
      vp9_find_best_ref_mvs(xd,
750 751
                            xd->pre.y_buffer,
                            recon_y_stride,
Paul Wilkins's avatar
Paul Wilkins committed
752
                            mbmi->ref_mvs[ref_frame],
753
                            &best_mv, &nearest, &nearby);
754

Paul Wilkins's avatar
Paul Wilkins committed
755 756 757
      vp9_mv_ref_probs(&pbi->common, mv_ref_p,
                       mbmi->mb_mode_context[ref_frame]);
    }
John Koleszar's avatar
John Koleszar committed
758 759

    // Is the segment level mode feature enabled for this segment
760
    if (vp9_segfeature_active(xd, mbmi->segment_id, SEG_LVL_MODE)) {
John Koleszar's avatar
John Koleszar committed
761
      mbmi->mode =
762
        vp9_get_segdata(xd, mbmi->segment_id, SEG_LVL_MODE);
John Koleszar's avatar
John Koleszar committed
763
    } else {
Ronald S. Bultje's avatar
Ronald S. Bultje committed
764 765 766 767 768
#if CONFIG_SUPERBLOCKS
      if (mbmi->encoded_as_sb) {
        mbmi->mode = read_sb_mv_ref(bc, mv_ref_p);
      } else
#endif
John Koleszar's avatar
John Koleszar committed
769 770
      mbmi->mode = read_mv_ref(bc, mv_ref_p);

Paul Wilkins's avatar
Paul Wilkins committed
771 772
      vp9_accum_mv_refs(&pbi->common, mbmi->mode,
                        mbmi->mb_mode_context[mbmi->ref_frame]);
773
    }
John Koleszar's avatar
John Koleszar committed
774

775
#if CONFIG_PRED_FILTER
John Koleszar's avatar
John Koleszar committed
776 777 778 779
    if (mbmi->mode >= NEARESTMV && mbmi->mode < SPLITMV) {
      // Is the prediction filter enabled
      if (cm->pred_filter_mode == 2)
        mbmi->pred_filter_enabled =
780
          vp9_read(bc, cm->prob_pred_filter_off);
John Koleszar's avatar
John Koleszar committed
781 782 783
      else
        mbmi->pred_filter_enabled = cm->pred_filter_mode;
    }
784
#endif
785 786 787
    if (mbmi->mode >= NEARESTMV && mbmi->mode <= SPLITMV)
    {
      if (cm->mcomp_filter_type == SWITCHABLE) {
788
        mbmi->interp_filter = vp9_switchable_interp[
789 790
            treed_read(bc, vp9_switchable_interp_tree,
                       vp9_get_pred_probs(cm, xd, PRED_SWITCHABLE_INTERP))];
791 792 793 794
      } else {
        mbmi->interp_filter = cm->mcomp_filter_type;
      }
    }
795

John Koleszar's avatar
John Koleszar committed
796 797
    if (cm->comp_pred_mode == COMP_PREDICTION_ONLY ||
        (cm->comp_pred_mode == HYBRID_PREDICTION &&
798
         vp9_read(bc, vp9_get_pred_prob(cm, xd, PRED_COMP)))) {
John Koleszar's avatar
John Koleszar committed
799 800 801 802 803 804 805 806 807 808
      /* Since we have 3 reference frames, we can only have 3 unique
       * combinations of combinations of 2 different reference frames
       * (A-G, G-L or A-L). In the bitstream, we use this to simply
       * derive the second reference frame from the first reference
       * frame, by saying it's the next one in the enumerator, and
       * if that's > n_refs, then the second reference frame is the
       * first one in the enumerator. */
      mbmi->second_ref_frame = mbmi->ref_frame + 1;
      if (mbmi->second_ref_frame == 4)
        mbmi->second_ref_frame = 1;
809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825
      if (mbmi->second_ref_frame) {
        int second_ref_fb_idx;
        /* Select the appropriate reference frame for this MB */
        if (mbmi->second_ref_frame == LAST_FRAME)
          second_ref_fb_idx = cm->lst_fb_idx;
        else if (mbmi->second_ref_frame ==
          GOLDEN_FRAME)
          second_ref_fb_idx = cm->gld_fb_idx;
        else
          second_ref_fb_idx = cm->alt_fb_idx;

        xd->second_pre.y_buffer =
          cm->yv12_fb[second_ref_fb_idx].y_buffer + recon_yoffset;
        xd->second_pre.u_buffer =
          cm->yv12_fb[second_ref_fb_idx].u_buffer + recon_uvoffset;
        xd->second_pre.v_buffer =
          cm->yv12_fb[second_ref_fb_idx].v_buffer + recon_uvoffset;
Paul Wilkins's avatar
Paul Wilkins committed
826

Paul Wilkins's avatar
Paul Wilkins committed
827 828 829 830
        vp9_find_mv_refs(xd, mi, prev_mi,
                         mbmi->second_ref_frame,
                         mbmi->ref_mvs[mbmi->second_ref_frame],
                         cm->ref_frame_sign_bias);
Paul Wilkins's avatar
Paul Wilkins committed
831

832
        vp9_find_best_ref_mvs(xd,
833 834
                              xd->second_pre.y_buffer,
                              recon_y_stride,
Paul Wilkins's avatar
Paul Wilkins committed
835
                              mbmi->ref_mvs[mbmi->second_ref_frame],
836 837 838
                              &best_mv_second,
                              &nearest_second,
                              &nearby_second);
839
      }
Yaowu Xu's avatar
Yaowu Xu committed
840

John Koleszar's avatar
John Koleszar committed
841 842 843
    } else {
      mbmi->second_ref_frame = 0;
    }
844

John Koleszar's avatar
John Koleszar committed
845 846 847 848
    mbmi->uv_mode = DC_PRED;
    switch (mbmi->mode) {
      case SPLITMV: {
        const int s = mbmi->partitioning =
849
                        treed_read(bc, vp9_mbsplit_tree, cm->fc.mbsplit_prob);
850
        const int num_p = vp9_mbsplit_count [s];
John Koleszar's avatar
John Koleszar committed
851 852
        int j = 0;
        cm->fc.mbsplit_counts[s]++;
John Koleszar's avatar
John Koleszar committed
853

John Koleszar's avatar
John Koleszar committed
854 855 856 857 858 859 860 861
        mbmi->need_to_clamp_mvs = 0;
        do { /* for each subset j */
          int_mv leftmv, abovemv, second_leftmv, second_abovemv;
          int_mv blockmv, secondmv;
          int k;  /* first block in subset j */
          int mv_contz;
          int blockmode;

862
          k = vp9_mbsplit_offset[s][j];
John Koleszar's avatar
John Koleszar committed
863 864 865 866 867 868 869

          leftmv.as_int = left_block_mv(mi, k);
          abovemv.as_int = above_block_mv(mi, k, mis);
          if (mbmi->second_ref_frame) {
            second_leftmv.as_int = left_block_second_mv(mi, k);
            second_abovemv.as_int = above_block_second_mv(mi, k, mis);
          }
870
          mv_contz = vp9_mv_cont(&leftmv, &abovemv);
John Koleszar's avatar
John Koleszar committed
871 872
          blockmode = sub_mv_ref(bc, cm->fc.sub_mv_ref_prob [mv_contz]);
          cm->fc.sub_mv_ref_counts[mv_contz][blockmode - LEFT4X4]++;
John Koleszar's avatar
John Koleszar committed
873

John Koleszar's avatar
John Koleszar committed
874 875
          switch (blockmode) {
            case NEW4X4:
876 877 878
              read_nmv(bc, &blockmv.as_mv, &best_mv.as_mv, nmvc);
              read_nmv_fp(bc, &blockmv.as_mv, &best_mv.as_mv, nmvc,
                          xd->allow_high_precision_mv);
879
              vp9_increment_nmv(&blockmv.as_mv, &best_mv.as_mv,
880
                                &cm->fc.NMVcount, xd->allow_high_precision_mv);
John Koleszar's avatar
John Koleszar committed
881