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


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

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

37
static int read_bmode(vp9_reader *bc, const vp9_prob *p) {
38
39
40
41
42
43
44
45
46
47
48
  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
49
50
}

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

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

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

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

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

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

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

91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
// This function reads the current macro block's segnent id from the bitstream
// It should only be called if a segment map update is indicated.
static void read_mb_segid_except(VP9_COMMON *cm,
                                 vp9_reader *r, MB_MODE_INFO *mi,
                                 MACROBLOCKD *xd, int mb_row, int mb_col) {
  int pred_seg_id = vp9_get_pred_mb_segid(cm, xd,
                                          mb_row * cm->mb_cols + mb_col);
  const vp9_prob *p = xd->mb_segment_tree_probs;
  vp9_prob p1 = xd->mb_segment_mispred_tree_probs[pred_seg_id];

  /* Is segmentation enabled */
  if (xd->segmentation_enabled && xd->update_mb_segmentation_map) {
    /* If so then read the segment id. */
    if (vp9_read(r, p1)) {
      if (pred_seg_id < 2)
        mi->segment_id = 2 + vp9_read(r, p[2]);
      else
        mi->segment_id = 2 + (pred_seg_id == 2);
    } else {
      if (pred_seg_id >= 2)
        mi->segment_id = vp9_read(r, p[1]);
      else
        mi->segment_id = pred_seg_id == 0;
    }
  }
}

118
#if CONFIG_NEW_MVREF
119
120
int vp9_read_mv_ref_id(vp9_reader *r,
                       vp9_prob * ref_id_probs) {
121
122
  int ref_index = 0;

123
  if (vp9_read(r, ref_id_probs[0])) {
124
    ref_index++;
125
    if (vp9_read(r, ref_id_probs[1])) {
126
      ref_index++;
127
      if (vp9_read(r, ref_id_probs[2]))
128
129
130
131
132
133
134
        ref_index++;
    }
  }
  return ref_index;
}
#endif

135
extern const int vp9_i8x8_block[4];
136
static void kfread_modes(VP9D_COMP *pbi,
John Koleszar's avatar
John Koleszar committed
137
138
139
140
                         MODE_INFO *m,
                         int mb_row,
                         int mb_col,
                         BOOL_DECODER* const bc) {
141
  VP9_COMMON *const cm = &pbi->common;
142
  MACROBLOCKD *const xd  = &pbi->mb;
John Koleszar's avatar
John Koleszar committed
143
144
145
146
  const int mis = pbi->common.mode_info_stride;
  int map_index = mb_row * pbi->common.mb_cols + mb_col;
  MB_PREDICTION_MODE y_mode;

147
148
  m->mbmi.ref_frame = INTRA_FRAME;

John Koleszar's avatar
John Koleszar committed
149
150
151
152
  // 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) {
153
    read_mb_segid(bc, &m->mbmi, &pbi->mb);
Ronald S. Bultje's avatar
Ronald S. Bultje committed
154
155
156
157
158
159
160
161
162
163
164
165
    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;
        }
      }
166
    } else {
Ronald S. Bultje's avatar
Ronald S. Bultje committed
167
168
      cm->last_frame_seg_map[map_index] = m->mbmi.segment_id;
    }
John Koleszar's avatar
John Koleszar committed
169
170
171
172
  }

  m->mbmi.mb_skip_coeff = 0;
  if (pbi->common.mb_no_coeff_skip &&
173
      (!vp9_segfeature_active(&pbi->mb,
Paul Wilkins's avatar
Paul Wilkins committed
174
                              m->mbmi.segment_id, SEG_LVL_SKIP))) {
John Koleszar's avatar
John Koleszar committed
175
    MACROBLOCKD *const xd  = &pbi->mb;
Paul Wilkins's avatar
Paul Wilkins committed
176
    m->mbmi.mb_skip_coeff =
177
      vp9_read(bc, vp9_get_pred_prob(cm, xd, PRED_MBSKIP));
John Koleszar's avatar
John Koleszar committed
178
  } else {
179
    if (vp9_segfeature_active(&pbi->mb,
Paul Wilkins's avatar
Paul Wilkins committed
180
                              m->mbmi.segment_id, SEG_LVL_SKIP)) {
John Koleszar's avatar
John Koleszar committed
181
182
183
184
185
      m->mbmi.mb_skip_coeff = 1;
    } else
      m->mbmi.mb_skip_coeff = 0;
  }

Ronald S. Bultje's avatar
Ronald S. Bultje committed
186
  if (m->mbmi.sb_type) {
187
    y_mode = (MB_PREDICTION_MODE) read_kf_sb_ymode(bc,
Ronald S. Bultje's avatar
Ronald S. Bultje committed
188
      pbi->common.sb_kf_ymode_prob[pbi->common.kf_ymode_probs_index]);
189
190
191
192
  } else {
    y_mode = (MB_PREDICTION_MODE) read_kf_mb_ymode(bc,
      pbi->common.kf_ymode_prob[pbi->common.kf_ymode_probs_index]);
  }
193

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

John Koleszar's avatar
John Koleszar committed
196
197
198
199
  if ((m->mbmi.mode = y_mode) == B_PRED) {
    int i = 0;
    do {
      const B_PREDICTION_MODE A = above_block_mode(m, i, mis);
200
201
      const B_PREDICTION_MODE L = (xd->left_available || (i & 3)) ?
                                  left_block_mode(m, i) : B_DC_PRED;
Paul Wilkins's avatar
Paul Wilkins committed
202

John Koleszar's avatar
John Koleszar committed
203
      m->bmi[i].as_mode.first =
204
        (B_PREDICTION_MODE) read_kf_bmode(
John Koleszar's avatar
John Koleszar committed
205
206
207
208
209
210
211
          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++) {
212
      int ib = vp9_i8x8_block[i];
213
      mode8x8 = read_i8x8_mode(bc, pbi->common.fc.i8x8_mode_prob);
John Koleszar's avatar
John Koleszar committed
214
215
216
217
218
219
      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
220
221
    m->mbmi.uv_mode = (MB_PREDICTION_MODE)read_uv_mode(bc,
                                                       pbi->common.kf_uv_mode_prob[m->mbmi.mode]);
222

223
  if (cm->txfm_mode == TX_MODE_SELECT && m->mbmi.mb_skip_coeff == 0 &&
224
      m->mbmi.mode <= I8X8_PRED) {
225
    // FIXME(rbultje) code ternary symbol once all experiments are merged
226
    m->mbmi.txfm_size = vp9_read(bc, cm->prob_tx[0]);
227
    if (m->mbmi.txfm_size != TX_4X4 && m->mbmi.mode != I8X8_PRED) {
228
      m->mbmi.txfm_size += vp9_read(bc, cm->prob_tx[1]);
Ronald S. Bultje's avatar
Ronald S. Bultje committed
229
      if (m->mbmi.txfm_size != TX_8X8 && m->mbmi.sb_type)
230
231
        m->mbmi.txfm_size += vp9_read(bc, cm->prob_tx[2]);
    }
Ronald S. Bultje's avatar
Ronald S. Bultje committed
232
  } else if (cm->txfm_mode >= ALLOW_32X32 && m->mbmi.sb_type) {
233
    m->mbmi.txfm_size = TX_32X32;
234
  } else if (cm->txfm_mode >= ALLOW_16X16 && m->mbmi.mode <= TM_PRED) {
235
    m->mbmi.txfm_size = TX_16X16;
236
  } else if (cm->txfm_mode >= ALLOW_8X8 && m->mbmi.mode != B_PRED) {
237
238
239
240
    m->mbmi.txfm_size = TX_8X8;
  } else {
    m->mbmi.txfm_size = TX_4X4;
  }
Scott LaVarnway's avatar
Scott LaVarnway committed
241
}
John Koleszar's avatar
John Koleszar committed
242

243
static int read_nmv_component(vp9_reader *r,
244
245
246
                              int rv,
                              const nmv_component *mvcomp) {
  int v, s, z, c, o, d;
247
248
  s = vp9_read(r, mvcomp->sign);
  c = treed_read(r, vp9_mv_class_tree, mvcomp->classes);
249
  if (c == MV_CLASS_0) {
250
    d = treed_read(r, vp9_mv_class0_tree, mvcomp->class0);
251
252
253
254
255
  } else {
    int i, b;
    d = 0;
    b = c + CLASS0_BITS - 1;  /* number of bits */
    for (i = 0; i < b; ++i)
256
      d |= (vp9_read(r, mvcomp->bits[i]) << i);
257
258
259
  }
  o = d << 3;

260
  z = vp9_get_mv_mag(c, o);
261
  v = (s ? -(z + 8) : (z + 8));
262
263
264
  return v;
}

265
static int read_nmv_component_fp(vp9_reader *r,
266
267
268
269
270
271
272
                                 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 */
273
  z &= ~7;
274

275
  c = vp9_get_mv_class(z, &o);
276
277
278
  d = o >> 3;

  if (c == MV_CLASS_0) {
279
    f = treed_read(r, vp9_mv_fp_tree, mvcomp->class0_fp[d]);
280
  } else {
281
    f = treed_read(r, vp9_mv_fp_tree, mvcomp->fp);
282
283
284
285
286
  }
  o += (f << 1);

  if (usehp) {
    if (c == MV_CLASS_0) {
287
      e = vp9_read(r, mvcomp->class0_hp);
288
    } else {
289
      e = vp9_read(r, mvcomp->hp);
290
291
292
293
294
    }
    o += e;
  } else {
    ++o;  /* Note if hp is not used, the default value of the hp bit is 1 */
  }
295
  z = vp9_get_mv_mag(c, o);
296
297
298
299
  v = (s ? -(z + 1) : (z + 1));
  return v;
}

300
static void read_nmv(vp9_reader *r, MV *mv, const MV *ref,
301
                     const nmv_context *mvctx) {
302
  MV_JOINT_TYPE j = treed_read(r, vp9_mv_joint_tree, mvctx->joints);
303
304
305
306
307
308
309
310
311
  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]);
  }
}

312
static void read_nmv_fp(vp9_reader *r, MV *mv, const MV *ref,
313
                        const nmv_context *mvctx, int usehp) {
314
315
  MV_JOINT_TYPE j = vp9_get_mv_joint(*mv);
  usehp = usehp && vp9_use_nmv_hp(ref);
316
317
318
319
320
321
322
323
  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);
  }
324
325
326
327
  /*
  printf("MV: %d %d REF: %d %d\n", mv->row + ref->row, mv->col + ref->col,
	 ref->row, ref->col);
	 */
328
329
}

330
331
332
static void update_nmv(vp9_reader *bc, vp9_prob *const p,
                       const vp9_prob upd_p) {
  if (vp9_read(bc, upd_p)) {
333
#ifdef LOW_PRECISION_MV_UPDATE
334
    *p = (vp9_read_literal(bc, 7) << 1) | 1;
335
#else
336
    *p = (vp9_read_literal(bc, 8));
337
338
339
340
#endif
  }
}

341
static void read_nmvprobs(vp9_reader *bc, nmv_context *mvctx,
342
343
344
                          int usehp) {
  int i, j, k;
#ifdef MV_GROUP_UPDATE
345
  if (!vp9_read_bit(bc)) return;
346
347
348
#endif
  for (j = 0; j < MV_JOINTS - 1; ++j) {
    update_nmv(bc, &mvctx->joints[j],
349
               VP9_NMV_UPDATE_PROB);
350
351
352
  }
  for (i = 0; i < 2; ++i) {
    update_nmv(bc, &mvctx->comps[i].sign,
353
               VP9_NMV_UPDATE_PROB);
354
355
    for (j = 0; j < MV_CLASSES - 1; ++j) {
      update_nmv(bc, &mvctx->comps[i].classes[j],
356
                 VP9_NMV_UPDATE_PROB);
357
358
359
    }
    for (j = 0; j < CLASS0_SIZE - 1; ++j) {
      update_nmv(bc, &mvctx->comps[i].class0[j],
360
                 VP9_NMV_UPDATE_PROB);
361
362
363
    }
    for (j = 0; j < MV_OFFSET_BITS; ++j) {
      update_nmv(bc, &mvctx->comps[i].bits[j],
364
                 VP9_NMV_UPDATE_PROB);
365
366
367
368
369
370
371
    }
  }

  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],
372
                   VP9_NMV_UPDATE_PROB);
373
374
375
    }
    for (j = 0; j < 3; ++j) {
      update_nmv(bc, &mvctx->comps[i].fp[j],
376
                 VP9_NMV_UPDATE_PROB);
377
378
379
380
381
382
    }
  }

  if (usehp) {
    for (i = 0; i < 2; ++i) {
      update_nmv(bc, &mvctx->comps[i].class0_hp,
383
                 VP9_NMV_UPDATE_PROB);
384
      update_nmv(bc, &mvctx->comps[i].hp,
385
                 VP9_NMV_UPDATE_PROB);
386
387
388
389
    }
  }
}

390
// Read the referncence frame
391
static MV_REFERENCE_FRAME read_ref_frame(VP9D_COMP *pbi,
392
                                         vp9_reader *const bc,
John Koleszar's avatar
John Koleszar committed
393
394
395
396
397
                                         unsigned char segment_id) {
  MV_REFERENCE_FRAME ref_frame;
  int seg_ref_active;
  int seg_ref_count = 0;

398
  VP9_COMMON *const cm = &pbi->common;
John Koleszar's avatar
John Koleszar committed
399
400
  MACROBLOCKD *const xd = &pbi->mb;

401
402
403
  seg_ref_active = vp9_segfeature_active(xd,
                                         segment_id,
                                         SEG_LVL_REF_FRAME);
John Koleszar's avatar
John Koleszar committed
404
405
406
407

  // If segment coding enabled does the segment allow for more than one
  // possible reference frame
  if (seg_ref_active) {
408
409
410
411
    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
412
413
414
415
416
417
418
  }

  // 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;
419
    vp9_prob pred_prob;
John Koleszar's avatar
John Koleszar committed
420
421
422
    MV_REFERENCE_FRAME pred_ref;

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

    // Read the prediction status flag
426
    prediction_flag = (unsigned char)vp9_read(bc, pred_prob);
John Koleszar's avatar
John Koleszar committed
427
428

    // Store the prediction flag.
Paul Wilkins's avatar
Paul Wilkins committed
429
    vp9_set_pred_flag(xd, PRED_REF, prediction_flag);
John Koleszar's avatar
John Koleszar committed
430
431

    // Get the predicted reference frame.
Paul Wilkins's avatar
Paul Wilkins committed
432
    pred_ref = vp9_get_pred_ref(cm, xd);
John Koleszar's avatar
John Koleszar committed
433
434
435
436

    // If correctly predicted then use the predicted value
    if (prediction_flag) {
      ref_frame = pred_ref;
Paul Wilkins's avatar
Paul Wilkins committed
437
    }
John Koleszar's avatar
John Koleszar committed
438
439
    // else decode the explicitly coded value
    else {
440
      vp9_prob mod_refprobs[PREDICTION_PROBS];
John Koleszar's avatar
John Koleszar committed
441
442
443
444
445
446
447
      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] *=
448
          vp9_check_segref(xd, segment_id, INTRA_FRAME);
John Koleszar's avatar
John Koleszar committed
449
        mod_refprobs[LAST_FRAME] *=
450
          vp9_check_segref(xd, segment_id, LAST_FRAME);
John Koleszar's avatar
John Koleszar committed
451
        mod_refprobs[GOLDEN_FRAME] *=
452
453
          (vp9_check_segref(xd, segment_id, GOLDEN_FRAME) *
           vp9_check_segref(xd, segment_id, ALTREF_FRAME));
John Koleszar's avatar
John Koleszar committed
454
455
456
457
458
459
460
      }

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

      // Do we need to decode the Intra/Inter branch
      if (mod_refprobs[0])
461
        ref_frame = (MV_REFERENCE_FRAME) vp9_read(bc, mod_refprobs[0]);
John Koleszar's avatar
John Koleszar committed
462
463
464
465
466
467
      else
        ref_frame++;

      if (ref_frame) {
        // Do we need to decode the Last/Gf_Arf branch
        if (mod_refprobs[1])
468
          ref_frame += vp9_read(bc, mod_refprobs[1]);
469
        else
John Koleszar's avatar
John Koleszar committed
470
471
472
473
474
          ref_frame++;

        if (ref_frame > 1) {
          // Do we need to decode the GF/Arf branch
          if (mod_refprobs[2])
475
            ref_frame += vp9_read(bc, mod_refprobs[2]);
John Koleszar's avatar
John Koleszar committed
476
477
478
          else {
            if (seg_ref_active) {
              if ((pred_ref == GOLDEN_FRAME) ||
479
                  !vp9_check_segref(xd, segment_id, GOLDEN_FRAME)) {
John Koleszar's avatar
John Koleszar committed
480
481
482
483
484
485
486
                ref_frame = ALTREF_FRAME;
              } else
                ref_frame = GOLDEN_FRAME;
            } else
              ref_frame = (pred_ref == GOLDEN_FRAME)
                          ? ALTREF_FRAME : GOLDEN_FRAME;
          }
487
        }
John Koleszar's avatar
John Koleszar committed
488
      }
489
    }
John Koleszar's avatar
John Koleszar committed
490
491
492
493
494
495
496
  }

  // 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
497
498
    vp9_set_pred_flag(xd, PRED_REF, 1);
    ref_frame = vp9_get_pred_ref(cm, xd);
John Koleszar's avatar
John Koleszar committed
499
500
501
  }

  return (MV_REFERENCE_FRAME)ref_frame;
502
}
John Koleszar's avatar
John Koleszar committed
503

504
505
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
506
}
John Koleszar's avatar
John Koleszar committed
507

508
509
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
510
511
}

512
513
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
514
}
Scott LaVarnway's avatar
Scott LaVarnway committed
515
516

#ifdef VPX_MODE_COUNT
517
unsigned int vp9_mv_cont_count[5][4] = {
John Koleszar's avatar
John Koleszar committed
518
519
520
521
522
  { 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
523
};
Scott LaVarnway's avatar
Scott LaVarnway committed
524
#endif
John Koleszar's avatar
John Koleszar committed
525

526
527
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
528
529
530
531
  { 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
532
};
John Koleszar's avatar
John Koleszar committed
533

534
static void read_switchable_interp_probs(VP9D_COMP* const pbi,
John Koleszar's avatar
John Koleszar committed
535
                                         BOOL_DECODER* const bc) {
536
  VP9_COMMON *const cm = &pbi->common;
537
  int i, j;
538
539
540
  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);
541
542
543
544
545
    }
  }
  //printf("DECODER: %d %d\n", cm->fc.switchable_interp_prob[0],
  //cm->fc.switchable_interp_prob[1]);
}
John Koleszar's avatar
John Koleszar committed
546

547
static void mb_mode_mv_init(VP9D_COMP *pbi, vp9_reader *bc) {
548
  VP9_COMMON *const cm = &pbi->common;
549
  nmv_context *const nmvc = &pbi->common.fc.nmvc;
John Koleszar's avatar
John Koleszar committed
550
  MACROBLOCKD *const xd  = &pbi->mb;
John Koleszar's avatar
John Koleszar committed
551

552
553
  if (cm->frame_type == KEY_FRAME) {
    if (!cm->kf_ymode_probs_update)
554
      cm->kf_ymode_probs_index = vp9_read_literal(bc, 3);
555
  } else {
556
    if (cm->mcomp_filter_type == SWITCHABLE)
John Koleszar's avatar
John Koleszar committed
557
      read_switchable_interp_probs(pbi, bc);
558
559
560
561
562
563
#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
564
    // Decode the baseline probabilities for decoding reference frame
565
566
567
    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
568
569
570

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

573
    pbi->common.comp_pred_mode = vp9_read(bc, 128);
John Koleszar's avatar
John Koleszar committed
574
    if (cm->comp_pred_mode)
575
      cm->comp_pred_mode += vp9_read(bc, 128);
John Koleszar's avatar
John Koleszar committed
576
577
578
    if (cm->comp_pred_mode == HYBRID_PREDICTION) {
      int i;
      for (i = 0; i < COMP_PRED_CONTEXTS; i++)
579
        cm->prob_comppred[i] = (vp9_prob)vp9_read_literal(bc, 8);
John Koleszar's avatar
John Koleszar committed
580
    }
John Koleszar's avatar
John Koleszar committed
581

582
    if (vp9_read_bit(bc)) {
John Koleszar's avatar
John Koleszar committed
583
      int i = 0;
John Koleszar's avatar
John Koleszar committed
584

John Koleszar's avatar
John Koleszar committed
585
      do {
586
587
        cm->fc.ymode_prob[i] = (vp9_prob) vp9_read_literal(bc, 8);
      } while (++i < VP9_YMODES - 1);
John Koleszar's avatar
John Koleszar committed
588
    }
589

590
591
592
593
594
595
596
597
    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);
    }

598
    read_nmvprobs(bc, nmvc, xd->allow_high_precision_mv);
John Koleszar's avatar
John Koleszar committed
599
  }
Scott LaVarnway's avatar
Scott LaVarnway committed
600
}
John Koleszar's avatar
John Koleszar committed
601

602
603
604
// 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
605
static void read_mb_segment_id(VP9D_COMP *pbi,
John Koleszar's avatar
John Koleszar committed
606
607
                               int mb_row, int mb_col,
                               BOOL_DECODER* const bc) {
608
  VP9_COMMON *const cm = &pbi->common;
John Koleszar's avatar
John Koleszar committed
609
  MACROBLOCKD *const xd  = &pbi->mb;
John Koleszar's avatar
John Koleszar committed
610
611
612
613
614
615
616
617
618
619
  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
620
        vp9_prob pred_prob =
Paul Wilkins's avatar
Paul Wilkins committed
621
          vp9_get_pred_prob(cm, xd, PRED_SEG_ID);
622

John Koleszar's avatar
John Koleszar committed
623
624
        // Read the prediction status flag
        unsigned char seg_pred_flag =
625
          (unsigned char)vp9_read(bc, pred_prob);
626

John Koleszar's avatar
John Koleszar committed
627
        // Store the prediction flag.
Paul Wilkins's avatar
Paul Wilkins committed
628
        vp9_set_pred_flag(xd, PRED_SEG_ID, seg_pred_flag);
John Koleszar's avatar
John Koleszar committed
629
630
631
632

        // 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
633
          mbmi->segment_id = vp9_get_pred_mb_segid(cm, xd, index);
634
        }
John Koleszar's avatar
John Koleszar committed
635
636
        // Else .... decode it explicitly
        else {
637
          read_mb_segid_except(cm, bc, mbmi, xd, mb_row, mb_col);
John Koleszar's avatar
John Koleszar committed
638
639
640
641
        }
      }
      // Normal unpredicted coding mode
      else {
642
        read_mb_segid(bc, mbmi, xd);
Ronald S. Bultje's avatar
Ronald S. Bultje committed
643
      }
Ronald S. Bultje's avatar
Ronald S. Bultje committed
644
645
646
647
648
649
650
651
652
653
654
      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
655
        }
656
      } else {
John Koleszar's avatar
John Koleszar committed
657
658
        cm->last_frame_seg_map[index] = mbmi->segment_id;
      }
Ronald S. Bultje's avatar
Ronald S. Bultje committed
659
    } else {
Ronald S. Bultje's avatar
Ronald S. Bultje committed
660
661
662
663
664
665
666
667
668
669
670
671
672
      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
673
        }
Ronald S. Bultje's avatar
Ronald S. Bultje committed
674
        mbmi->segment_id = segment_id;
675
      } else {
Ronald S. Bultje's avatar
Ronald S. Bultje committed
676
677
        mbmi->segment_id = cm->last_frame_seg_map[index];
      }
678
    }
John Koleszar's avatar
John Koleszar committed
679
680
681
682
683
  } else {
    // The encoder explicitly sets the segment_id to 0
    // when segmentation is disabled
    mbmi->segment_id = 0;
  }
684
}
685

686
static void read_mb_modes_mv(VP9D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi,
687
                             MODE_INFO *prev_mi,
John Koleszar's avatar
John Koleszar committed
688
689
                             int mb_row, int mb_col,
                             BOOL_DECODER* const bc) {
690
  VP9_COMMON *const cm = &pbi->common;
691
  nmv_context *const nmvc = &pbi->common.fc.nmvc;
John Koleszar's avatar
John Koleszar committed
692
  const int mis = pbi->common.mode_info_stride;
John Koleszar's avatar
John Koleszar committed
693
  MACROBLOCKD *const xd  = &pbi->mb;
John Koleszar's avatar
John Koleszar committed
694

695
  int_mv *const mv = &mbmi->mv[0];
John Koleszar's avatar
John Koleszar committed
696
697
698
699
  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
700
  const int mb_size = 1 << mi->mbmi.sb_type;
701
702
703
  const int use_prev_in_find_mv_refs = cm->Width == cm->last_width &&
                                       cm->Height == cm->last_height &&
                                       !cm->error_resilient_mode;
John Koleszar's avatar
John Koleszar committed
704
705
706
707
708
709
710

  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;
711
  mbmi->second_ref_frame = NONE;
John Koleszar's avatar
John Koleszar committed
712
713
714
715
  /* 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
716
    mb_to_left_edge = -((mb_col * 16) << 3);
John Koleszar's avatar
John Koleszar committed
717
  mb_to_left_edge -= LEFT_TOP_MARGIN;
Ronald S. Bultje's avatar
Ronald S. Bultje committed
718
719
  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
720
721
722
723
724
  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;
725
  xd->prev_mode_info_context = prev_mi;
John Koleszar's avatar
John Koleszar committed
726
727

  // Read the macroblock segment id.
John Koleszar's avatar
John Koleszar committed
728
  read_mb_segment_id(pbi, mb_row, mb_col, bc);
John Koleszar's avatar
John Koleszar committed
729
730

  if (pbi->common.mb_no_coeff_skip &&
Paul Wilkins's avatar
Paul Wilkins committed
731
      (!vp9_segfeature_active(xd, mbmi->segment_id, SEG_LVL_SKIP))) {
John Koleszar's avatar
John Koleszar committed
732
733
    // Read the macroblock coeff skip flag if this feature is in use,
    // else default to 0
734
    mbmi->mb_skip_coeff = vp9_read(bc, vp9_get_pred_prob(cm, xd, PRED_MBSKIP));
John Koleszar's avatar
John Koleszar committed
735
  } else {
Paul Wilkins's avatar
Paul Wilkins committed
736
    if (vp9_segfeature_active(xd, mbmi->segment_id, SEG_LVL_SKIP)) {
John Koleszar's avatar
John Koleszar committed
737
738
739
740
741
742
      mbmi->mb_skip_coeff = 1;
    } else
      mbmi->mb_skip_coeff = 0;
  }

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

745
746
747
748
749
  /*
  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
750
751
752
753
  // 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;
754
    vp9_prob mv_ref_p [VP9_MVREFS - 1];
John Koleszar's avatar
John Koleszar committed
755

756
    MV_REFERENCE_FRAME ref_frame = mbmi->ref_frame;
757
    xd->scale_factor[0] = cm->active_ref_scale[mbmi->ref_frame - 1];
758
759
760

    {
      int ref_fb_idx;
761
762
763
764
765
      const int use_prev_in_find_best_ref =
          xd->scale_factor[0].x_num == xd->scale_factor[0].x_den &&
          xd->scale_factor[0].y_num == xd->scale_factor[0].y_den &&
          !cm->error_resilient_mode &&
          !cm->frame_parallel_decoding_mode;
766
767

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

770
771
      setup_pred_block(&xd->pre, &cm->yv12_fb[ref_fb_idx],
          mb_row, mb_col, &xd->scale_factor[0], &xd->scale_factor_uv[0]);
772

773
774
775
776
777
#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
778
779
      // if (cm->current_video_frame == 1 && mb_row == 4 && mb_col == 5)
      //  printf("Dello\n");
780
      vp9_find_mv_refs(cm, xd, mi, use_prev_in_find_mv_refs ? prev_mi : NULL,
Paul Wilkins's avatar
Paul Wilkins committed
781
782
                       ref_frame, mbmi->ref_mvs[ref_frame],
                       cm->ref_frame_sign_bias);
Paul Wilkins's avatar
Paul Wilkins committed
783

Paul Wilkins's avatar
Paul Wilkins committed
784
785
      vp9_mv_ref_probs(&pbi->common, mv_ref_p,
                       mbmi->mb_mode_context[ref_frame]);
786
787
788
789
790
791
792
793
794
795
796
      /*
      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]);
      }
      */
797

798
      // If the segment level skip mode enabled
Paul Wilkins's avatar
Paul Wilkins committed
799
800
      if (vp9_segfeature_active(xd, mbmi->segment_id, SEG_LVL_SKIP)) {
        mbmi->mode = ZEROMV;
801
      } else {
Ronald S. Bultje's avatar
Ronald S. Bultje committed
802
        if (mbmi->sb_type)
803
804
          mbmi->mode = read_sb_mv_ref(bc, mv_ref_p);
        else
805
          mbmi->mode = read_mv_ref(bc, mv_ref_p);
806
807
808
809
810
811
812

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

      if (mbmi->mode != ZEROMV) {
        vp9_find_best_ref_mvs(xd,
813
814
815
                              use_prev_in_find_best_ref ?
                                  xd->pre.y_buffer : NULL,
                              xd->pre.y_stride,
816
817
818
819
820
                              mbmi->ref_mvs[ref_frame],
                              &nearest, &nearby);

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

822
823
824
825
826
827
#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
828
    }
John Koleszar's avatar
John Koleszar committed
829

830
831
832
    if (mbmi->mode >= NEARESTMV && mbmi->mode <= SPLITMV)
    {
      if (cm->mcomp_filter_type == SWITCHABLE) {
833
        mbmi->interp_filter = vp9_switchable_interp[
834
835
            treed_read(bc, vp9_switchable_interp_tree,
                       vp9_get_pred_probs(cm, xd, PRED_SWITCHABLE_INTERP))];
836
837
838
839
      } else {
        mbmi->interp_filter = cm->mcomp_filter_type;
      }
    }
840

John Koleszar's avatar
John Koleszar committed
841
842
    if (cm->comp_pred_mode == COMP_PREDICTION_ONLY ||
        (cm->comp_pred_mode == HYBRID_PREDICTION &&
843
         vp9_read(bc, vp9_get_pred_prob(cm, xd, PRED_COMP)))) {
John Koleszar's avatar
John Koleszar committed
844
845
846
847
848
849
850
851
852
853
      /* 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;
854
      if (mbmi->second_ref_frame > 0) {
855
        int second_ref_fb_idx;
856
857
858
859
860
861
862
863
        int use_prev_in_find_best_ref;

        xd->scale_factor[1] = cm->active_ref_scale[mbmi->second_ref_frame - 1];
        use_prev_in_find_best_ref =
            xd->scale_factor[1].x_num == xd->scale_factor[1].x_den &&
            xd->scale_factor[1].y_num == xd->scale_factor[1].y_den &&
            !cm->error_resilient_mode &&
            !cm->frame_parallel_decoding_mode;
864

865
        /* Select the appropriate reference frame for this MB */
866
        second_ref_fb_idx = cm->active_ref_idx[mbmi->second_ref_frame - 1];
867

868
869
870
871
        setup_pred_block(&xd->second_pre, &cm->yv12_fb[second_ref_fb_idx],
            mb_row, mb_col, &xd->scale_factor[1], &xd->scale_factor_uv[1]);

        vp9_find_mv_refs(cm, xd, mi, use_prev_in_find_mv_refs ? prev_mi : NULL,
Paul Wilkins's avatar
Paul Wilkins committed
872
873
874
                         mbmi->second_ref_frame,
                         mbmi->ref_mvs[mbmi->second_ref_frame],
                         cm->ref_frame_sign_bias);
Paul Wilkins's avatar
Paul Wilkins committed
875

876
877
        if (mbmi->mode != ZEROMV) {
          vp9_find_best_ref_mvs(xd,
878
879
880
                                use_prev_in_find_best_ref ?
                                    xd->second_pre.y_buffer : NULL,
                                xd->second_pre.y_stride,
881
882
883
884
885
                                mbmi->ref_mvs[mbmi->second_ref_frame],
                                &nearest_second,
                                &nearby_second);
          best_mv_second = mbmi->ref_mvs[mbmi->second_ref_frame][0];
        }
886
      }
Yaowu Xu's avatar
Yaowu Xu committed
887

John Koleszar's avatar
John Koleszar committed
888
    } else {
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
#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
916
    }
917

918
919
920
921
922
923
924
925
#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 =
926
        vp9_read_mv_ref_id(bc, xd->mb_mv_ref_probs[ref_frame]);
927
928
929
930
931
932
933
934

      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 =
935
          vp9_read_mv_ref_id(bc, xd->mb_mv_ref_probs[ref_frame]);
936
937
938
939
940
        best_mv_second.as_int = mbmi->ref_mvs[ref_frame][best_index].as_int;
      }
    }
#endif

John Koleszar's avatar
John Koleszar committed
941
942
943
944
    mbmi->uv_mode = DC_PRED;
    switch (mbmi->mode) {
      case SPLITMV: {
        const int s = mbmi->partitioning =
945
                        treed_read(bc, vp9_mbsplit_tree, cm->fc.mbsplit_prob);
946
        const int num_p = vp9_mbsplit_count [s];
John Koleszar's avatar
John Koleszar committed
947
948
        int j = 0;
        cm->fc.mbsplit_counts[s]++;
John Koleszar's avatar
John Koleszar committed
949