vp9_decodemv.c 42.5 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
13
14
15
16
17
18
19
20
21
22
#include "vp9_treereader.h"
#include "vp9/common/vp9_entropymv.h"
#include "vp9/common/vp9_entropymode.h"
#include "vp9_onyxd_int.h"
#include "vp9/common/vp9_findnearmv.h"

#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
31
#ifdef DEBUG_DEC_MV
int dec_mvcount = 0;
#endif

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

46
47
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
48
}
Scott LaVarnway's avatar
Scott LaVarnway committed
49

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

55
56
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
57
}
Ronald S. Bultje's avatar
Ronald S. Bultje committed
58
#endif
Scott LaVarnway's avatar
Scott LaVarnway committed
59

60
61
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
62
63
}

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

68
69
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
70
71
}

72
// This function reads the current macro block's segnent id from the bitstream
Paul Wilkins's avatar
Paul Wilkins committed
73
// It should only be called if a segment map update is indicated.
74
75
static void read_mb_segid(vp9_reader *r, MB_MODE_INFO *mi,
                          MACROBLOCKD *xd) {
John Koleszar's avatar
John Koleszar committed
76
  /* Is segmentation enabled */
Paul Wilkins's avatar
Paul Wilkins committed
77
  if (xd->segmentation_enabled && xd->update_mb_segmentation_map) {
John Koleszar's avatar
John Koleszar committed
78
    /* If so then read the segment id. */
79
    if (vp9_read(r, xd->mb_segment_tree_probs[0]))
Paul Wilkins's avatar
Paul Wilkins committed
80
      mi->segment_id =
81
        (unsigned char)(2 + vp9_read(r, xd->mb_segment_tree_probs[2]));
John Koleszar's avatar
John Koleszar committed
82
    else
Paul Wilkins's avatar
Paul Wilkins committed
83
      mi->segment_id =
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
#if CONFIG_NEW_MVREF
89
90
int vp9_read_mv_ref_id(vp9_reader *r,
                       vp9_prob * ref_id_probs) {
91
92
  int ref_index = 0;

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

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

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

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

John Koleszar's avatar
John Koleszar committed
157
158
  if ((m->mbmi.mode = y_mode) == B_PRED) {
    int i = 0;
159
#if CONFIG_COMP_INTRA_PRED
160
    int use_comp_pred = vp9_read(bc, DEFAULT_COMP_INTRA_PROB);
161
#endif
John Koleszar's avatar
John Koleszar committed
162
163
164
    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
165

John Koleszar's avatar
John Koleszar committed
166
      m->bmi[i].as_mode.first =
167
        (B_PREDICTION_MODE) read_kf_bmode(
John Koleszar's avatar
John Koleszar committed
168
          bc, pbi->common.kf_bmode_prob [A] [L]);
169
#if CONFIG_COMP_INTRA_PRED
John Koleszar's avatar
John Koleszar committed
170
171
      if (use_comp_pred) {
        m->bmi[i].as_mode.second =
172
          (B_PREDICTION_MODE) read_kf_bmode(
John Koleszar's avatar
John Koleszar committed
173
174
175
176
            bc, pbi->common.kf_bmode_prob [A] [L]);
      } else {
        m->bmi[i].as_mode.second = (B_PREDICTION_MODE)(B_DC_PRED - 1);
      }
177
#endif
John Koleszar's avatar
John Koleszar committed
178
179
180
181
182
183
    } 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
      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;
190
#if CONFIG_COMP_INTRA_PRED
John Koleszar's avatar
John Koleszar committed
191
192
193
194
      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);
195
#endif
John Koleszar's avatar
John Koleszar committed
196
197
    }
  } else
198
199
    m->mbmi.uv_mode = (MB_PREDICTION_MODE)read_uv_mode(bc,
                                                       pbi->common.kf_uv_mode_prob[m->mbmi.mode]);
200
#if CONFIG_COMP_INTRA_PRED
John Koleszar's avatar
John Koleszar committed
201
  m->mbmi.second_uv_mode = (MB_PREDICTION_MODE)(DC_PRED - 1);
202
#endif
203

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

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

236
  z = vp9_get_mv_mag(c, o);
237
  v = (s ? -(z + 8) : (z + 8));
238
239
240
  return v;
}

241
static int read_nmv_component_fp(vp9_reader *r,
242
243
244
245
246
247
248
                                 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 */
249
  z &= ~7;
250

251
  c = vp9_get_mv_class(z, &o);
252
253
254
  d = o >> 3;

  if (c == MV_CLASS_0) {
255
    f = treed_read(r, vp9_mv_fp_tree, mvcomp->class0_fp[d]);
256
  } else {
257
    f = treed_read(r, vp9_mv_fp_tree, mvcomp->fp);
258
259
260
261
262
  }
  o += (f << 1);

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Ronald S. Bultje's avatar
Ronald S. Bultje committed
477
#if CONFIG_SUPERBLOCKS
478
479
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
480
481
}
#endif
John Koleszar's avatar
John Koleszar committed
482

483
484
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
485
486
}

487
488
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
489
}
Scott LaVarnway's avatar
Scott LaVarnway committed
490
491

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

501
502
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
503
504
505
506
  { 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
507
};
John Koleszar's avatar
John Koleszar committed
508

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

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

527
528
  if (cm->frame_type == KEY_FRAME) {
    if (!cm->kf_ymode_probs_update)
529
      cm->kf_ymode_probs_index = vp9_read_literal(bc, 3);
530
  } else {
531
#if CONFIG_PRED_FILTER
532
    cm->pred_filter_mode = (vp9_prob)vp9_read_literal(bc, 2);
533

John Koleszar's avatar
John Koleszar committed
534
    if (cm->pred_filter_mode == 2)
535
      cm->prob_pred_filter_off = (vp9_prob)vp9_read_literal(bc, 8);
536
537
#endif
    if (cm->mcomp_filter_type == SWITCHABLE)
John Koleszar's avatar
John Koleszar committed
538
      read_switchable_interp_probs(pbi, bc);
539
540
541
542
543
544
#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
545
    // Decode the baseline probabilities for decoding reference frame
546
547
548
    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
549
550
551

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

554
    pbi->common.comp_pred_mode = vp9_read(bc, 128);
John Koleszar's avatar
John Koleszar committed
555
    if (cm->comp_pred_mode)
556
      cm->comp_pred_mode += vp9_read(bc, 128);
John Koleszar's avatar
John Koleszar committed
557
558
559
    if (cm->comp_pred_mode == HYBRID_PREDICTION) {
      int i;
      for (i = 0; i < COMP_PRED_CONTEXTS; i++)
560
        cm->prob_comppred[i] = (vp9_prob)vp9_read_literal(bc, 8);
John Koleszar's avatar
John Koleszar committed
561
    }
John Koleszar's avatar
John Koleszar committed
562

563
    if (vp9_read_bit(bc)) {
John Koleszar's avatar
John Koleszar committed
564
      int i = 0;
John Koleszar's avatar
John Koleszar committed
565

John Koleszar's avatar
John Koleszar committed
566
      do {
567
568
        cm->fc.ymode_prob[i] = (vp9_prob) vp9_read_literal(bc, 8);
      } while (++i < VP9_YMODES - 1);
John Koleszar's avatar
John Koleszar committed
569
    }
570

571
572
573
574
575
576
577
578
579
580
#if CONFIG_SUPERBLOCKS
    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);
    }
#endif

581
582
583
584
585
#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

586
    read_nmvprobs(bc, nmvc, xd->allow_high_precision_mv);
John Koleszar's avatar
John Koleszar committed
587
  }
Scott LaVarnway's avatar
Scott LaVarnway committed
588
}
John Koleszar's avatar
John Koleszar committed
589

590
591
592
// 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
593
static void read_mb_segment_id(VP9D_COMP *pbi,
John Koleszar's avatar
John Koleszar committed
594
595
                               int mb_row, int mb_col,
                               BOOL_DECODER* const bc) {
596
  VP9_COMMON *const cm = &pbi->common;
John Koleszar's avatar
John Koleszar committed
597
  MACROBLOCKD *const xd  = &pbi->mb;
John Koleszar's avatar
John Koleszar committed
598
599
600
601
602
603
604
605
606
607
  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
608
        vp9_prob pred_prob =
Paul Wilkins's avatar
Paul Wilkins committed
609
          vp9_get_pred_prob(cm, xd, PRED_SEG_ID);
610

John Koleszar's avatar
John Koleszar committed
611
612
        // Read the prediction status flag
        unsigned char seg_pred_flag =
613
          (unsigned char)vp9_read(bc, pred_prob);
614

John Koleszar's avatar
John Koleszar committed
615
        // Store the prediction flag.
Paul Wilkins's avatar
Paul Wilkins committed
616
        vp9_set_pred_flag(xd, PRED_SEG_ID, seg_pred_flag);
John Koleszar's avatar
John Koleszar committed
617
618
619
620

        // 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
621
          mbmi->segment_id = vp9_get_pred_mb_segid(cm, xd, index);
622
        }
John Koleszar's avatar
John Koleszar committed
623
624
        // Else .... decode it explicitly
        else {
625
          read_mb_segid(bc, mbmi, xd);
John Koleszar's avatar
John Koleszar committed
626
627
628
629
        }
      }
      // Normal unpredicted coding mode
      else {
630
        read_mb_segid(bc, mbmi, xd);
Ronald S. Bultje's avatar
Ronald S. Bultje committed
631
632
633
      }
#if CONFIG_SUPERBLOCKS
      if (mbmi->encoded_as_sb) {
Ronald S. Bultje's avatar
Ronald S. Bultje committed
634
635
636
637
638
639
640
641
        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
642
643
644
      } else
#endif
      {
John Koleszar's avatar
John Koleszar committed
645
646
        cm->last_frame_seg_map[index] = mbmi->segment_id;
      }
Ronald S. Bultje's avatar
Ronald S. Bultje committed
647
648
649
    } else {
#if CONFIG_SUPERBLOCKS
      if (mbmi->encoded_as_sb) {
Ronald S. Bultje's avatar
Ronald S. Bultje committed
650
651
652
653
654
655
656
657
658
659
660
        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
661
662
663
664
665
      } else
#endif
      {
        mbmi->segment_id = cm->last_frame_seg_map[index];
      }
666
    }
John Koleszar's avatar
John Koleszar committed
667
668
669
670
671
  } else {
    // The encoder explicitly sets the segment_id to 0
    // when segmentation is disabled
    mbmi->segment_id = 0;
  }
672
}
673

674
static void read_mb_modes_mv(VP9D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi,
675
                             MODE_INFO *prev_mi,
John Koleszar's avatar
John Koleszar committed
676
677
                             int mb_row, int mb_col,
                             BOOL_DECODER* const bc) {
678
  VP9_COMMON *const cm = &pbi->common;
679
  nmv_context *const nmvc = &pbi->common.fc.nmvc;
John Koleszar's avatar
John Koleszar committed
680
  const int mis = pbi->common.mode_info_stride;
John Koleszar's avatar
John Koleszar committed
681
  MACROBLOCKD *const xd  = &pbi->mb;
John Koleszar's avatar
John Koleszar committed
682

683
  int_mv *const mv = &mbmi->mv[0];
John Koleszar's avatar
John Koleszar committed
684
685
686
687
688
689
690
691
692
693
694
  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;
695
  mbmi->second_ref_frame = NONE;
John Koleszar's avatar
John Koleszar committed
696
697
698
699
  /* 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
700
    mb_to_left_edge = -((mb_col * 16) << 3);
John Koleszar's avatar
John Koleszar committed
701
  mb_to_left_edge -= LEFT_TOP_MARGIN;
Scott LaVarnway's avatar
Scott LaVarnway committed
702

703
704
705
706
707
708
709
710
711
712
713
#if CONFIG_SUPERBLOCKS
  if (mi->mbmi.encoded_as_sb) {
    xd->mb_to_right_edge =
      mb_to_right_edge = ((pbi->common.mb_cols - 2 - mb_col) * 16) << 3;
  } else {
#endif
    xd->mb_to_right_edge =
      mb_to_right_edge = ((pbi->common.mb_cols - 1 - mb_col) * 16) << 3;
#if CONFIG_SUPERBLOCKS
  }
#endif
John Koleszar's avatar
John Koleszar committed
714
715
716
717
718
  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;
719
  xd->prev_mode_info_context = prev_mi;
John Koleszar's avatar
John Koleszar committed
720
721

  // Read the macroblock segment id.
John Koleszar's avatar
John Koleszar committed
722
  read_mb_segment_id(pbi, mb_row, mb_col, bc);
John Koleszar's avatar
John Koleszar committed
723
724

  if (pbi->common.mb_no_coeff_skip &&
725
726
727
      (!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
728
729
    // Read the macroblock coeff skip flag if this feature is in use,
    // else default to 0
730
    mbmi->mb_skip_coeff = vp9_read(bc, vp9_get_pred_prob(cm, xd, PRED_MBSKIP));
John Koleszar's avatar
John Koleszar committed
731
  } else {
732
733
734
    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
735
736
737
738
739
740
      mbmi->mb_skip_coeff = 1;
    } else
      mbmi->mb_skip_coeff = 0;
  }

  // Read the reference frame
741
742
743
744
745
  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
746
747
748
749
750

  // 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;
751
    vp9_prob mv_ref_p [VP9_MVREFS - 1];
John Koleszar's avatar
John Koleszar committed
752

753
754
755
756
757
    int recon_y_stride, recon_yoffset;
    int recon_uv_stride, recon_uvoffset;

    {
      int ref_fb_idx;
Paul Wilkins's avatar
Paul Wilkins committed
758
      MV_REFERENCE_FRAME ref_frame = mbmi->ref_frame;
759
760

      /* Select the appropriate reference frame for this MB */
Paul Wilkins's avatar
Paul Wilkins committed
761
      if (ref_frame == LAST_FRAME)
762
        ref_fb_idx = cm->lst_fb_idx;
Paul Wilkins's avatar
Paul Wilkins committed
763
      else if (ref_frame == GOLDEN_FRAME)
764
765
766
767
768
769
770
771
772
773
774
775
776
777
        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
778
779
780
      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
781

782
      vp9_find_best_ref_mvs(xd,
783
784
                            xd->pre.y_buffer,
                            recon_y_stride,
Paul Wilkins's avatar
Paul Wilkins committed
785
                            mbmi->ref_mvs[ref_frame],
786
                            &best_mv, &nearest, &nearby);
787

Paul Wilkins's avatar
Paul Wilkins committed
788
789
790
      vp9_mv_ref_probs(&pbi->common, mv_ref_p,
                       mbmi->mb_mode_context[ref_frame]);
    }
John Koleszar's avatar
John Koleszar committed
791
792

    // Is the segment level mode feature enabled for this segment
793
    if (vp9_segfeature_active(xd, mbmi->segment_id, SEG_LVL_MODE)) {
John Koleszar's avatar
John Koleszar committed
794
      mbmi->mode =
795
        vp9_get_segdata(xd, mbmi->segment_id, SEG_LVL_MODE);
John Koleszar's avatar
John Koleszar committed
796
    } else {
Ronald S. Bultje's avatar
Ronald S. Bultje committed
797
798
799
800
801
#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
802
803
      mbmi->mode = read_mv_ref(bc, mv_ref_p);

Paul Wilkins's avatar
Paul Wilkins committed
804
805
      vp9_accum_mv_refs(&pbi->common, mbmi->mode,
                        mbmi->mb_mode_context[mbmi->ref_frame]);
806
    }
John Koleszar's avatar
John Koleszar committed
807

808
#if CONFIG_PRED_FILTER
John Koleszar's avatar
John Koleszar committed
809
810
811
812
    if (mbmi->mode >= NEARESTMV && mbmi->mode < SPLITMV) {
      // Is the prediction filter enabled
      if (cm->pred_filter_mode == 2)
        mbmi->pred_filter_enabled =
813
          vp9_read(bc, cm->prob_pred_filter_off);
John Koleszar's avatar
John Koleszar committed
814
815
816
      else
        mbmi->pred_filter_enabled = cm->pred_filter_mode;
    }
817
#endif
818
819
820
    if (mbmi->mode >= NEARESTMV && mbmi->mode <= SPLITMV)
    {
      if (cm->mcomp_filter_type == SWITCHABLE) {
821
        mbmi->interp_filter = vp9_switchable_interp[
822
823
            treed_read(bc, vp9_switchable_interp_tree,
                       vp9_get_pred_probs(cm, xd, PRED_SWITCHABLE_INTERP))];
824
825
826
827
      } else {
        mbmi->interp_filter = cm->mcomp_filter_type;
      }
    }
828

John Koleszar's avatar
John Koleszar committed
829
830
    if (cm->comp_pred_mode == COMP_PREDICTION_ONLY ||
        (cm->comp_pred_mode == HYBRID_PREDICTION &&
831
         vp9_read(bc, vp9_get_pred_prob(cm, xd, PRED_COMP)))) {
John Koleszar's avatar
John Koleszar committed
832
833
834
835
836
837
838
839
840
841
      /* 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;
842
      if (mbmi->second_ref_frame > 0) {
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
        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
859

Paul Wilkins's avatar
Paul Wilkins committed
860
861
862
863
        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
864

865
        vp9_find_best_ref_mvs(xd,
866
867
                              xd->second_pre.y_buffer,
                              recon_y_stride,
Paul Wilkins's avatar
Paul Wilkins committed
868
                              mbmi->ref_mvs[mbmi->second_ref_frame],
869
870
871
                              &best_mv_second,
                              &nearest_second,
                              &nearby_second);
872
      }
Yaowu Xu's avatar
Yaowu Xu committed
873

John Koleszar's avatar
John Koleszar committed
874
    } else {
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
#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
902
    }
903

John Koleszar's avatar
John Koleszar committed
904
905
906
907
    mbmi->uv_mode = DC_PRED;
    switch (mbmi->mode) {
      case SPLITMV: {
        const int s = mbmi->partitioning =
908
                        treed_read(bc, vp9_mbsplit_tree, cm->fc.mbsplit_prob);
909
        const int num_p = vp9_mbsplit_count [s];
John Koleszar's avatar
John Koleszar committed
910
911
        int j = 0;
        cm->fc.mbsplit_counts[s]++;
John Koleszar's avatar
John Koleszar committed
912

John Koleszar's avatar
John Koleszar committed
913
914
915
916
917
918
919
920
        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;

921
          k = vp9_mbsplit_offset[s][j];
John Koleszar's avatar
John Koleszar committed
922
923
924

          leftmv.as_int = left_block_mv(mi, k);
          abovemv.as_int = above_block_mv(mi, k, mis);
925
          if (mbmi->second_ref_frame > 0) {
John Koleszar's avatar
John Koleszar committed
926
927
928
            second_leftmv.as_int = left_block_second_mv(mi, k);
            second_abovemv.as_int = above_block_second_mv(mi, k, mis);
          }
929
          mv_contz = vp9_mv_cont(&leftmv, &abovemv);
John Koleszar's avatar
John Koleszar committed
930
931
          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
932

John Koleszar's avatar
John Koleszar committed
933
934
          switch (blockmode) {
            case NEW4X4:
935
936
937
              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);
938
              vp9_increment_nmv(&blockmv.as_mv, &best_mv.as_mv,
939
                                &cm->fc.NMVcount, xd->allow_high_precision_mv);
John Koleszar's avatar
John Koleszar committed
940
941
              blockmv.as_mv.row += best_mv.as_mv.row;
              blockmv.as_mv.col += best_mv.as_mv.col;