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/decoder/vp9_onyxd_int.h"
16
#include "vp9/common/vp9_findnearmv.h"
Ronald S. Bultje's avatar
Ronald S. Bultje committed
17
#include "vp9/common/vp9_common.h"
18
19
20
21
22
#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
23
24
25
#if CONFIG_DEBUG
#include <assert.h>
#endif
26

John Koleszar's avatar
John Koleszar committed
27
// #define DEBUG_DEC_MV
28
29
30
#ifdef DEBUG_DEC_MV
int dec_mvcount = 0;
#endif
31
32
33
34
// #define DEC_DEBUG
#ifdef DEC_DEBUG
extern int dec_debug;
#endif
35

36
static int read_bmode(vp9_reader *bc, const vp9_prob *p) {
37
38
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;
}

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
48
49
}

50
51
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
52
}
Scott LaVarnway's avatar
Scott LaVarnway committed
53

54
55
56
57
static int read_sb_ymode(vp9_reader *bc, const vp9_prob *p) {
  return treed_read(bc, vp9_sb_ymode_tree, p);
}

58
59
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
60
61
}

62
63
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
64
65
}

66
67
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
68
}
Scott LaVarnway's avatar
Scott LaVarnway committed
69

70
71
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
72
73
}

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

90
#if CONFIG_NEW_MVREF
91
92
int vp9_read_mv_ref_id(vp9_reader *r,
                       vp9_prob * ref_id_probs) {
93
94
  int ref_index = 0;

95
  if (vp9_read(r, ref_id_probs[0])) {
96
    ref_index++;
97
    if (vp9_read(r, ref_id_probs[1])) {
98
      ref_index++;
99
      if (vp9_read(r, ref_id_probs[2]))
100
101
102
103
104
105
106
        ref_index++;
    }
  }
  return ref_index;
}
#endif

107
extern const int vp9_i8x8_block[4];
108
static void kfread_modes(VP9D_COMP *pbi,
John Koleszar's avatar
John Koleszar committed
109
110
111
112
                         MODE_INFO *m,
                         int mb_row,
                         int mb_col,
                         BOOL_DECODER* const bc) {
113
  VP9_COMMON *const cm = &pbi->common;
John Koleszar's avatar
John Koleszar committed
114
115
116
117
118
119
120
121
  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) {
122
    read_mb_segid(bc, &m->mbmi, &pbi->mb);
Ronald S. Bultje's avatar
Ronald S. Bultje committed
123
124
125
126
127
128
129
130
131
132
133
134
    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;
        }
      }
135
    } else {
Ronald S. Bultje's avatar
Ronald S. Bultje committed
136
137
      cm->last_frame_seg_map[map_index] = m->mbmi.segment_id;
    }
John Koleszar's avatar
John Koleszar committed
138
139
140
141
  }

  m->mbmi.mb_skip_coeff = 0;
  if (pbi->common.mb_no_coeff_skip &&
142
143
144
145
      (!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
146
    MACROBLOCKD *const xd  = &pbi->mb;
Paul Wilkins's avatar
Paul Wilkins committed
147
    m->mbmi.mb_skip_coeff =
148
      vp9_read(bc, vp9_get_pred_prob(cm, xd, PRED_MBSKIP));
John Koleszar's avatar
John Koleszar committed
149
  } else {
150
151
152
153
    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
154
155
156
157
158
      m->mbmi.mb_skip_coeff = 1;
    } else
      m->mbmi.mb_skip_coeff = 0;
  }

Ronald S. Bultje's avatar
Ronald S. Bultje committed
159
  if (m->mbmi.sb_type) {
160
    y_mode = (MB_PREDICTION_MODE) read_kf_sb_ymode(bc,
Ronald S. Bultje's avatar
Ronald S. Bultje committed
161
      pbi->common.sb_kf_ymode_prob[pbi->common.kf_ymode_probs_index]);
162
163
164
165
  } else {
    y_mode = (MB_PREDICTION_MODE) read_kf_mb_ymode(bc,
      pbi->common.kf_ymode_prob[pbi->common.kf_ymode_probs_index]);
  }
166

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

John Koleszar's avatar
John Koleszar committed
169
170
171
172
173
  if ((m->mbmi.mode = y_mode) == B_PRED) {
    int i = 0;
    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
174

John Koleszar's avatar
John Koleszar committed
175
      m->bmi[i].as_mode.first =
176
        (B_PREDICTION_MODE) read_kf_bmode(
John Koleszar's avatar
John Koleszar committed
177
178
179
180
181
182
183
          bc, pbi->common.kf_bmode_prob [A] [L]);
    } while (++i < 16);
  }
  if ((m->mbmi.mode = y_mode) == I8X8_PRED) {
    int i;
    int mode8x8;
    for (i = 0; i < 4; i++) {
184
      int ib = vp9_i8x8_block[i];
185
      mode8x8 = read_i8x8_mode(bc, pbi->common.fc.i8x8_mode_prob);
John Koleszar's avatar
John Koleszar committed
186
187
188
189
190
191
      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;
    }
  } else
192
193
    m->mbmi.uv_mode = (MB_PREDICTION_MODE)read_uv_mode(bc,
                                                       pbi->common.kf_uv_mode_prob[m->mbmi.mode]);
194

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

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

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

237
static int read_nmv_component_fp(vp9_reader *r,
238
239
240
241
242
243
244
                                 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 */
245
  z &= ~7;
246

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

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

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

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

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

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

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

  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],
344
                   VP9_NMV_UPDATE_PROB);
345
346
347
    }
    for (j = 0; j < 3; ++j) {
      update_nmv(bc, &mvctx->comps[i].fp[j],
348
                 VP9_NMV_UPDATE_PROB);
349
350
351
352
353
354
    }
  }

  if (usehp) {
    for (i = 0; i < 2; ++i) {
      update_nmv(bc, &mvctx->comps[i].class0_hp,
355
                 VP9_NMV_UPDATE_PROB);
356
      update_nmv(bc, &mvctx->comps[i].hp,
357
                 VP9_NMV_UPDATE_PROB);
358
359
360
361
    }
  }
}

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

370
  VP9_COMMON *const cm = &pbi->common;
John Koleszar's avatar
John Koleszar committed
371
372
  MACROBLOCKD *const xd = &pbi->mb;

373
374
375
  seg_ref_active = vp9_segfeature_active(xd,
                                         segment_id,
                                         SEG_LVL_REF_FRAME);
John Koleszar's avatar
John Koleszar committed
376
377
378
379

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

  // 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;
391
    vp9_prob pred_prob;
John Koleszar's avatar
John Koleszar committed
392
393
394
    MV_REFERENCE_FRAME pred_ref;

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

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

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

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

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

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

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

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

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

  // 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
469
470
    vp9_set_pred_flag(xd, PRED_REF, 1);
    ref_frame = vp9_get_pred_ref(cm, xd);
John Koleszar's avatar
John Koleszar committed
471
472
473
  }

  return (MV_REFERENCE_FRAME)ref_frame;
474
}
John Koleszar's avatar
John Koleszar committed
475

476
477
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
478
}
John Koleszar's avatar
John Koleszar committed
479

480
481
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
482
483
}

484
485
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
486
}
Scott LaVarnway's avatar
Scott LaVarnway committed
487
488

#ifdef VPX_MODE_COUNT
489
unsigned int vp9_mv_cont_count[5][4] = {
John Koleszar's avatar
John Koleszar committed
490
491
492
493
494
  { 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
495
};
Scott LaVarnway's avatar
Scott LaVarnway committed
496
#endif
John Koleszar's avatar
John Koleszar committed
497

498
499
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
500
501
502
503
  { 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
504
};
John Koleszar's avatar
John Koleszar committed
505

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

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

524
525
  if (cm->frame_type == KEY_FRAME) {
    if (!cm->kf_ymode_probs_update)
526
      cm->kf_ymode_probs_index = vp9_read_literal(bc, 3);
527
  } else {
528
    if (cm->mcomp_filter_type == SWITCHABLE)
John Koleszar's avatar
John Koleszar committed
529
      read_switchable_interp_probs(pbi, bc);
530
531
532
533
534
535
#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
536
    // Decode the baseline probabilities for decoding reference frame
537
538
539
    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
540
541
542

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

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

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

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

562
563
564
565
566
567
568
569
    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);
    }

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

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

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

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

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

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

667
  int_mv *const mv = &mbmi->mv[0];
John Koleszar's avatar
John Koleszar committed
668
669
670
671
  int mb_to_left_edge;
  int mb_to_right_edge;
  int mb_to_top_edge;
  int mb_to_bottom_edge;
Ronald S. Bultje's avatar
Ronald S. Bultje committed
672
  const int mb_size = 1 << mi->mbmi.sb_type;
John Koleszar's avatar
John Koleszar committed
673
674
675
676
677
678
679

  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;
680
  mbmi->second_ref_frame = NONE;
John Koleszar's avatar
John Koleszar committed
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 =
Scott LaVarnway's avatar
Scott LaVarnway committed
685
    mb_to_left_edge = -((mb_col * 16) << 3);
John Koleszar's avatar
John Koleszar committed
686
  mb_to_left_edge -= LEFT_TOP_MARGIN;
Ronald S. Bultje's avatar
Ronald S. Bultje committed
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 &&
700
701
702
      (!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
703
704
    // Read the macroblock coeff skip flag if this feature is in use,
    // else default to 0
705
    mbmi->mb_skip_coeff = vp9_read(bc, vp9_get_pred_prob(cm, xd, PRED_MBSKIP));
John Koleszar's avatar
John Koleszar committed
706
  } else {
707
708
709
    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
710
711
712
713
714
715
      mbmi->mb_skip_coeff = 1;
    } else
      mbmi->mb_skip_coeff = 0;
  }

  // Read the reference frame
716
717
718
719
720
  if (vp9_segfeature_active(xd, mbmi->segment_id, SEG_LVL_MODE)
      && vp9_get_segdata(xd, mbmi->segment_id, SEG_LVL_MODE) < NEARESTMV)
    mbmi->ref_frame = INTRA_FRAME;
  else
    mbmi->ref_frame = read_ref_frame(pbi, bc, mbmi->segment_id);
John Koleszar's avatar
John Koleszar committed
721

722
723
724
725
726
  /*
  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
727
728
729
730
  // 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;
731
    vp9_prob mv_ref_p [VP9_MVREFS - 1];
John Koleszar's avatar
John Koleszar committed
732

733
734
    int recon_y_stride, recon_yoffset;
    int recon_uv_stride, recon_uvoffset;
735
    MV_REFERENCE_FRAME ref_frame = mbmi->ref_frame;
736
737
738
739
740

    {
      int ref_fb_idx;

      /* Select the appropriate reference frame for this MB */
741
      ref_fb_idx = cm->active_ref_idx[ref_frame - 1];
742
743
744
745
746
747
748
749
750
751
752

      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;

753
754
755
756
757
#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
758
759
760
      // if (cm->current_video_frame == 1 && mb_row == 4 && mb_col == 5)
      //  printf("Dello\n");
      vp9_find_mv_refs(xd, mi, cm->error_resilient_mode ? 0 : prev_mi,
Paul Wilkins's avatar
Paul Wilkins committed
761
762
                       ref_frame, mbmi->ref_mvs[ref_frame],
                       cm->ref_frame_sign_bias);
Paul Wilkins's avatar
Paul Wilkins committed
763

Paul Wilkins's avatar
Paul Wilkins committed
764
765
      vp9_mv_ref_probs(&pbi->common, mv_ref_p,
                       mbmi->mb_mode_context[ref_frame]);
766
767
768
769
770
771
772
773
774
775
776
      /*
      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]);
      }
      */
777

778
779
780
781
782
      // Is the segment level mode feature enabled for this segment
      if (vp9_segfeature_active(xd, mbmi->segment_id, SEG_LVL_MODE)) {
        mbmi->mode =
          vp9_get_segdata(xd, mbmi->segment_id, SEG_LVL_MODE);
      } else {
Ronald S. Bultje's avatar
Ronald S. Bultje committed
783
        if (mbmi->sb_type)
784
785
          mbmi->mode = read_sb_mv_ref(bc, mv_ref_p);
        else
786
          mbmi->mode = read_mv_ref(bc, mv_ref_p);
787
788
789
790
791
792
793

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

      if (mbmi->mode != ZEROMV) {
        vp9_find_best_ref_mvs(xd,
794
795
                              pbi->common.error_resilient_mode ||
                              pbi->common.frame_parallel_decoding_mode ?
796
                              0 : xd->pre.y_buffer,
797
798
799
800
801
802
                              recon_y_stride,
                              mbmi->ref_mvs[ref_frame],
                              &nearest, &nearby);

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

804
805
806
807
808
809
#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
810
    }
John Koleszar's avatar
John Koleszar committed
811

812
813
814
    if (mbmi->mode >= NEARESTMV && mbmi->mode <= SPLITMV)
    {
      if (cm->mcomp_filter_type == SWITCHABLE) {
815
        mbmi->interp_filter = vp9_switchable_interp[
816
817
            treed_read(bc, vp9_switchable_interp_tree,
                       vp9_get_pred_probs(cm, xd, PRED_SWITCHABLE_INTERP))];
818
819
820
821
      } else {
        mbmi->interp_filter = cm->mcomp_filter_type;
      }
    }
822

John Koleszar's avatar
John Koleszar committed
823
824
    if (cm->comp_pred_mode == COMP_PREDICTION_ONLY ||
        (cm->comp_pred_mode == HYBRID_PREDICTION &&
825
         vp9_read(bc, vp9_get_pred_prob(cm, xd, PRED_COMP)))) {
John Koleszar's avatar
John Koleszar committed
826
827
828
829
830
831
832
833
834
835
      /* 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;
836
      if (mbmi->second_ref_frame > 0) {
837
838
        int second_ref_fb_idx;
        /* Select the appropriate reference frame for this MB */
839
        second_ref_fb_idx = cm->active_ref_idx[mbmi->second_ref_frame - 1];
840
841
842
843
844
845
846

        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
847

848
        vp9_find_mv_refs(xd, mi, cm->error_resilient_mode ? 0 : prev_mi,
Paul Wilkins's avatar
Paul Wilkins committed
849
850
851
                         mbmi->second_ref_frame,
                         mbmi->ref_mvs[mbmi->second_ref_frame],
                         cm->ref_frame_sign_bias);
Paul Wilkins's avatar
Paul Wilkins committed
852

853
854
        if (mbmi->mode != ZEROMV) {
          vp9_find_best_ref_mvs(xd,
855
856
                                pbi->common.error_resilient_mode ||
                                pbi->common.frame_parallel_decoding_mode ?
857
                                0 : xd->second_pre.y_buffer,
858
859
860
861
862
863
                                recon_y_stride,
                                mbmi->ref_mvs[mbmi->second_ref_frame],
                                &nearest_second,
                                &nearby_second);
          best_mv_second = mbmi->ref_mvs[mbmi->second_ref_frame][0];
        }
864
      }
Yaowu Xu's avatar
Yaowu Xu committed
865

John Koleszar's avatar
John Koleszar committed
866
    } else {
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
#if CONFIG_COMP_INTERINTRA_PRED
      if (pbi->common.use_interintra &&
          mbmi->mode >= NEARESTMV && mbmi->mode < SPLITMV &&
          mbmi->second_ref_frame == NONE) {
        mbmi->second_ref_frame = (vp9_read(bc, pbi->common.fc.interintra_prob) ?
                                  INTRA_FRAME : NONE);
        // printf("-- %d (%d)\n", mbmi->second_ref_frame == INTRA_FRAME,
        //        pbi->common.fc.interintra_prob);
        pbi->common.fc.interintra_counts[
            mbmi->second_ref_frame == INTRA_FRAME]++;
        if (mbmi->second_ref_frame == INTRA_FRAME) {
          mbmi->interintra_mode = (MB_PREDICTION_MODE)read_ymode(
              bc, pbi->common.fc.ymode_prob);
          pbi->common.fc.ymode_counts[mbmi->interintra_mode]++;
#if SEPARATE_INTERINTRA_UV
          mbmi->interintra_uv_mode = (MB_PREDICTION_MODE)read_uv_mode(
              bc, pbi->common.fc.uv_mode_prob[mbmi->interintra_mode]);
          pbi->common.fc.uv_mode_counts[mbmi->interintra_mode]
                                       [mbmi->interintra_uv_mode]++;
#else
          mbmi->interintra_uv_mode = mbmi->interintra_mode;
#endif
          // printf("** %d %d\n",
          //        mbmi->interintra_mode, mbmi->interintra_uv_mode);
        }
      }
#endif
John Koleszar's avatar
John Koleszar committed
894
    }
895

896
897
898
899
900
901
902
903
#if CONFIG_NEW_MVREF
    // if ((mbmi->mode == NEWMV) || (mbmi->mode == SPLITMV))
    if (mbmi->mode == NEWMV) {
      int best_index;
      MV_REFERENCE_FRAME ref_frame = mbmi->ref_frame;

      // Encode the index of the choice.
      best_index =
904
        vp9_read_mv_ref_id(bc, xd->mb_mv_ref_probs[ref_frame]);
905
906
907
908
909
910
911
912

      best_mv.as_int = mbmi->ref_mvs[ref_frame][best_index].as_int;

      if (mbmi->second_ref_frame > 0) {
        ref_frame = mbmi->second_ref_frame;

        // Encode the index of the choice.
        best_index =
913
          vp9_read_mv_ref_id(bc, xd->mb_mv_ref_probs[ref_frame]);
914
915
916
917
918
        best_mv_second.as_int = mbmi->ref_mvs[ref_frame][best_index].as_int;
      }
    }
#endif

John Koleszar's avatar
John Koleszar committed
919
920
921
922
    mbmi->uv_mode = DC_PRED;
    switch (mbmi->mode) {
      case SPLITMV: {
        const int s = mbmi->partitioning =
923
                        treed_read(bc, vp9_mbsplit_tree, cm->fc.mbsplit_prob);
924
        const int num_p = vp9_mbsplit_count [s];
John Koleszar's avatar
John Koleszar committed
925
926
        int j = 0;
        cm->fc.mbsplit_counts[s]++;
John Koleszar's avatar
John Koleszar committed
927

John Koleszar's avatar
John Koleszar committed
928
929
930
931
932
933
934
935
        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;

936
          k = vp9_mbsplit_offset[s][j];
John Koleszar's avatar
John Koleszar committed
937
938
939

          leftmv.as_int = left_block_mv(mi, k);
          abovemv.as_int = above_block_mv(mi, k, mis);
940
941
          second_leftmv.as_int = 0;
          second_abovemv.as_int = 0;
942
          if (mbmi->second_ref_frame > 0) {
John Koleszar's avatar
John Koleszar committed
943
944
945
            second_leftmv.as_int = left_block_second_mv(mi, k);
            second_abovemv.as_int = above_block_second_mv(mi, k, mis);
          }
946
          mv_contz = vp9_mv_cont(&leftmv, &abovemv);
John Koleszar's avatar
John Koleszar committed
947
948
          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
949

John Koleszar's avatar
John Koleszar committed
950
951
          switch (blockmode) {
            case NEW4X4:
952
953
954
              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);
955
              vp9_increment_nmv(&blockmv.as_mv, &best_mv.as_mv,
956
                                &cm->fc.NMVcount, xd->allow_high_precision_mv);
John Koleszar's avatar
John Koleszar committed
957
958
              blockmv.as_mv.row += best_mv.as_mv.row;
              blockmv.as_mv.col += best_mv.as_mv.col;
959

960
              if (mbmi->second_ref_frame > 0) {
961
962
963
                read_nmv(bc, &secondmv.as_mv, &best_mv_second.as_mv, nmvc);
                read_nmv_fp(bc, &secondmv.as_mv, &best_mv_second.as_mv, nmvc,
                            xd->allow_high_precision_mv);
964
                vp9_increment_nmv(&secondmv.as_mv, &best_mv_second.as_mv,
965
                                  &cm->fc.NMVcount, xd->allow_high_precision_mv);
John Koleszar's avatar
John Koleszar committed
966
967
968
                secondmv.as_mv.row += best_mv_second.as_mv.row;
                secondmv.as_mv.col += best_mv_second.as_mv.col;
              }
969
#ifdef VPX_MODE_COUNT
970
              vp9_mv_cont_count[mv_contz][3]++;
971
#endif
John Koleszar's avatar
John Koleszar committed
972
973
974
              break;
            case LEFT4X4:
              blockmv.as_int = leftmv.as_int;
975
              if (mbmi->second_ref_frame > 0)
John Koleszar's avatar
John Koleszar committed
976
                secondmv.as_int = second_leftmv.as_int;
977
#ifdef VPX_MODE_COUNT
978
              vp9_mv_cont_count[mv_contz][0]++;