vp9_decodemv.c 23 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 <assert.h>

13 14
#include "vp9/common/vp9_common.h"
#include "vp9/common/vp9_entropy.h"
15
#include "vp9/common/vp9_entropymode.h"
16
#include "vp9/common/vp9_entropymv.h"
17
#include "vp9/common/vp9_findnearmv.h"
18
#include "vp9/common/vp9_mvref_common.h"
19
#include "vp9/common/vp9_pred_common.h"
20 21 22
#include "vp9/common/vp9_reconinter.h"
#include "vp9/common/vp9_seg_common.h"

23
#include "vp9/decoder/vp9_decodemv.h"
24
#include "vp9/decoder/vp9_decodframe.h"
25
#include "vp9/decoder/vp9_onyxd_int.h"
26
#include "vp9/decoder/vp9_dsubexp.h"
27 28
#include "vp9/decoder/vp9_treereader.h"

29
static MB_PREDICTION_MODE read_intra_mode(vp9_reader *r, const vp9_prob *p) {
30 31 32
  return (MB_PREDICTION_MODE)treed_read(r, vp9_intra_mode_tree, p);
}

33 34 35 36 37 38
static MB_PREDICTION_MODE read_inter_mode(VP9_COMMON *cm, vp9_reader *r,
                                          uint8_t context) {
  MB_PREDICTION_MODE mode = treed_read(r, vp9_inter_mode_tree,
                            cm->fc.inter_mode_probs[context]);
  ++cm->counts.inter_mode[context][inter_mode_offset(mode)];
  return mode;
39 40
}

41 42
static int read_segment_id(vp9_reader *r, const struct segmentation *seg) {
  return treed_read(r, vp9_segment_tree, seg->tree_probs);
Scott LaVarnway's avatar
Scott LaVarnway committed
43
}
44

45
static TX_SIZE read_selected_tx_size(VP9_COMMON *cm, MACROBLOCKD *xd,
46
                                     BLOCK_SIZE bsize, vp9_reader *r) {
47 48 49
  const uint8_t context = vp9_get_pred_context_tx_size(xd);
  const vp9_prob *tx_probs = get_tx_probs(bsize, context, &cm->fc.tx_probs);
  TX_SIZE tx_size = vp9_read(r, tx_probs[0]);
50
  if (tx_size != TX_4X4 && bsize >= BLOCK_16X16) {
51
    tx_size += vp9_read(r, tx_probs[1]);
52
    if (tx_size != TX_8X8 && bsize >= BLOCK_32X32)
53
      tx_size += vp9_read(r, tx_probs[2]);
54 55
  }

56
  update_tx_counts(bsize, context, tx_size, &cm->counts.tx);
57
  return tx_size;
58 59
}

60
static TX_SIZE read_tx_size(VP9D_COMP *pbi, TX_MODE tx_mode,
61
                            BLOCK_SIZE bsize, int allow_select,
62
                            vp9_reader *r) {
63 64 65
  VP9_COMMON *const cm = &pbi->common;
  MACROBLOCKD *const xd = &pbi->mb;

66
  if (allow_select && tx_mode == TX_MODE_SELECT && bsize >= BLOCK_8X8)
67
    return read_selected_tx_size(cm, xd, bsize, r);
68
  else if (tx_mode >= ALLOW_32X32 && bsize >= BLOCK_32X32)
69
    return TX_32X32;
70
  else if (tx_mode >= ALLOW_16X16 && bsize >= BLOCK_16X16)
71
    return TX_16X16;
72
  else if (tx_mode >= ALLOW_8X8 && bsize >= BLOCK_8X8)
73 74 75 76 77
    return TX_8X8;
  else
    return TX_4X4;
}

78
static void set_segment_id(VP9_COMMON *cm, BLOCK_SIZE bsize,
79
                           int mi_row, int mi_col, int segment_id) {
80 81 82
  const int mi_offset = mi_row * cm->mi_cols + mi_col;
  const int bw = 1 << mi_width_log2(bsize);
  const int bh = 1 << mi_height_log2(bsize);
83
  const int xmis = MIN(cm->mi_cols - mi_col, bw);
84
  const int ymis = MIN(cm->mi_rows - mi_row, bh);
85 86
  int x, y;

Paul Wilkins's avatar
Paul Wilkins committed
87
  assert(segment_id >= 0 && segment_id < MAX_SEGMENTS);
88 89 90 91 92 93 94 95 96

  for (y = 0; y < ymis; y++)
    for (x = 0; x < xmis; x++)
      cm->last_frame_seg_map[mi_offset + y * cm->mi_cols + x] = segment_id;
}

static int read_intra_segment_id(VP9D_COMP *pbi, int mi_row, int mi_col,
                                 vp9_reader *r) {
  MACROBLOCKD *const xd = &pbi->mb;
97
  struct segmentation *const seg = &pbi->common.seg;
98
  const BLOCK_SIZE bsize = xd->this_mi->mbmi.sb_type;
99
  int segment_id;
100

101 102 103 104
  if (!seg->enabled)
    return 0;  // Default for disabled segmentation

  if (!seg->update_map)
105
    return 0;
106 107 108 109 110 111 112 113 114 115

  segment_id = read_segment_id(r, seg);
  set_segment_id(&pbi->common, bsize, mi_row, mi_col, segment_id);
  return segment_id;
}

static int read_inter_segment_id(VP9D_COMP *pbi, int mi_row, int mi_col,
                                 vp9_reader *r) {
  VP9_COMMON *const cm = &pbi->common;
  MACROBLOCKD *const xd = &pbi->mb;
116
  struct segmentation *const seg = &cm->seg;
117
  const BLOCK_SIZE bsize = xd->this_mi->mbmi.sb_type;
118 119 120 121 122 123 124 125 126 127 128
  int pred_segment_id, segment_id;

  if (!seg->enabled)
    return 0;  // Default for disabled segmentation

  pred_segment_id = vp9_get_segment_id(cm, cm->last_frame_seg_map,
                                       bsize, mi_row, mi_col);
  if (!seg->update_map)
    return pred_segment_id;

  if (seg->temporal_update) {
129
    const vp9_prob pred_prob = vp9_get_pred_prob_seg_id(seg, xd);
130
    const int pred_flag = vp9_read(r, pred_prob);
131
    vp9_set_pred_flag_seg_id(xd, pred_flag);
132 133 134 135
    segment_id = pred_flag ? pred_segment_id
                           : read_segment_id(r, seg);
  } else {
    segment_id = read_segment_id(r, seg);
136
  }
137 138
  set_segment_id(cm, bsize, mi_row, mi_col, segment_id);
  return segment_id;
139 140
}

141
static uint8_t read_skip_coeff(VP9D_COMP *pbi, int segment_id, vp9_reader *r) {
142
  VP9_COMMON *const cm = &pbi->common;
143
  MACROBLOCKD *const xd = &pbi->mb;
144
  int skip_coeff = vp9_segfeature_active(&cm->seg, segment_id, SEG_LVL_SKIP);
145
  if (!skip_coeff) {
146
    const int ctx = vp9_get_pred_context_mbskip(xd);
147
    skip_coeff = vp9_read(r, vp9_get_pred_prob_mbskip(cm, xd));
148
    cm->counts.mbskip[ctx][skip_coeff]++;
Deb Mukherjee's avatar
Deb Mukherjee committed
149
  }
150 151
  return skip_coeff;
}
John Koleszar's avatar
John Koleszar committed
152

Dmitry Kovalev's avatar
Dmitry Kovalev committed
153 154
static void read_intra_frame_mode_info(VP9D_COMP *pbi, MODE_INFO *m,
                                       int mi_row, int mi_col, vp9_reader *r) {
155 156 157
  VP9_COMMON *const cm = &pbi->common;
  MACROBLOCKD *const xd = &pbi->mb;
  MB_MODE_INFO *const mbmi = &m->mbmi;
158
  const BLOCK_SIZE bsize = mbmi->sb_type;
159 160
  const MODE_INFO *above_mi = xd->mi_8x8[-cm->mode_info_stride];
  const MODE_INFO *left_mi = xd->mi_8x8[-1];
161

162
  mbmi->segment_id = read_intra_segment_id(pbi, mi_row, mi_col, r);
Paul Wilkins's avatar
Paul Wilkins committed
163
  mbmi->skip_coeff = read_skip_coeff(pbi, mbmi->segment_id, r);
164
  mbmi->tx_size = read_tx_size(pbi, cm->tx_mode, bsize, 1, r);
165
  mbmi->ref_frame[0] = INTRA_FRAME;
Dmitry Kovalev's avatar
Dmitry Kovalev committed
166
  mbmi->ref_frame[1] = NONE;
167

168
  if (bsize >= BLOCK_8X8) {
169
    const MB_PREDICTION_MODE A = above_block_mode(m, above_mi, 0);
170
    const MB_PREDICTION_MODE L = xd->left_available ?
171
                                  left_block_mode(m, left_mi, 0) : DC_PRED;
172
    mbmi->mode = read_intra_mode(r, vp9_kf_y_mode_prob[A][L]);
173
  } else {
174
    // Only 4x4, 4x8, 8x4 blocks
Dmitry Kovalev's avatar
Dmitry Kovalev committed
175 176
    const int num_4x4_w = num_4x4_blocks_wide_lookup[bsize];  // 1 or 2
    const int num_4x4_h = num_4x4_blocks_high_lookup[bsize];  // 1 or 2
177
    int idx, idy;
178

Dmitry Kovalev's avatar
Dmitry Kovalev committed
179 180
    for (idy = 0; idy < 2; idy += num_4x4_h) {
      for (idx = 0; idx < 2; idx += num_4x4_w) {
181
        const int ib = idy * 2 + idx;
182
        const MB_PREDICTION_MODE A = above_block_mode(m, above_mi, ib);
183
        const MB_PREDICTION_MODE L = (xd->left_available || idx) ?
184
                                     left_block_mode(m, left_mi, ib) : DC_PRED;
185
        const MB_PREDICTION_MODE b_mode = read_intra_mode(r,
186
                                              vp9_kf_y_mode_prob[A][L]);
187
        m->bmi[ib].as_mode = b_mode;
Dmitry Kovalev's avatar
Dmitry Kovalev committed
188
        if (num_4x4_h == 2)
189
          m->bmi[ib + 2].as_mode = b_mode;
Dmitry Kovalev's avatar
Dmitry Kovalev committed
190
        if (num_4x4_w == 2)
191
          m->bmi[ib + 1].as_mode = b_mode;
192 193
      }
    }
194

195
    mbmi->mode = m->bmi[3].as_mode;
John Koleszar's avatar
John Koleszar committed
196
  }
Dmitry Kovalev's avatar
Dmitry Kovalev committed
197

198
  mbmi->uv_mode = read_intra_mode(r, vp9_kf_uv_mode_prob[mbmi->mode]);
Scott LaVarnway's avatar
Scott LaVarnway committed
199
}
John Koleszar's avatar
John Koleszar committed
200

201 202
static int read_mv_component(vp9_reader *r,
                             const nmv_component *mvcomp, int usehp) {
203

204
  int mag, d, fr, hp;
Dmitry Kovalev's avatar
Dmitry Kovalev committed
205 206
  const int sign = vp9_read(r, mvcomp->sign);
  const int mv_class = treed_read(r, vp9_mv_class_tree, mvcomp->classes);
207
  const int class0 = mv_class == MV_CLASS_0;
Dmitry Kovalev's avatar
Dmitry Kovalev committed
208

209
  // Integer part
210
  if (class0) {
211
    d = treed_read(r, vp9_mv_class0_tree, mvcomp->class0);
212
  } else {
Dmitry Kovalev's avatar
Dmitry Kovalev committed
213
    int i;
214
    const int n = mv_class + CLASS0_BITS - 1;  // number of bits
Dmitry Kovalev's avatar
Dmitry Kovalev committed
215

216
    d = 0;
Dmitry Kovalev's avatar
Dmitry Kovalev committed
217 218
    for (i = 0; i < n; ++i)
      d |= vp9_read(r, mvcomp->bits[i]) << i;
219 220
  }

221 222
  // Fractional part
  fr = treed_read(r, vp9_mv_fp_tree,
223
                  class0 ? mvcomp->class0_fp[d] : mvcomp->fp);
224 225


226
  // High precision part (if hp is not used, the default value of the hp is 1)
227
  hp = usehp ? vp9_read(r, class0 ? mvcomp->class0_hp : mvcomp->hp)
228
             : 1;
229

230
  // Result
231 232
  mag = vp9_get_mv_mag(mv_class, (d << 3) | (fr << 1) | hp) + 1;
  return sign ? -mag : mag;
233 234
}

235 236
static INLINE void read_mv(vp9_reader *r, MV *mv, const MV *ref,
                           const nmv_context *ctx,
237
                           nmv_context_counts *counts, int allow_hp) {
238
  const MV_JOINT_TYPE j = treed_read(r, vp9_mv_joint_tree, ctx->joints);
239
  const int use_hp = allow_hp && vp9_use_mv_hp(ref);
240 241 242
  MV diff = {0, 0};

  if (mv_joint_vertical(j))
243
    diff.row = read_mv_component(r, &ctx->comps[0], use_hp);
244 245

  if (mv_joint_horizontal(j))
246
    diff.col = read_mv_component(r, &ctx->comps[1], use_hp);
247

248
  vp9_inc_mv(&diff, counts);
249 250 251 252 253

  mv->row = ref->row + diff.row;
  mv->col = ref->col + diff.col;
}

Dmitry Kovalev's avatar
Dmitry Kovalev committed
254
static void update_mv(vp9_reader *r, vp9_prob *p) {
255
  if (vp9_read(r, NMV_UPDATE_PROB))
256
    *p = (vp9_read_literal(r, 7) << 1) | 1;
257 258
}

259
static void read_mv_probs(vp9_reader *r, nmv_context *mvc, int allow_hp) {
260
  int i, j, k;
Dmitry Kovalev's avatar
Dmitry Kovalev committed
261 262

  for (j = 0; j < MV_JOINTS - 1; ++j)
Dmitry Kovalev's avatar
Dmitry Kovalev committed
263
    update_mv(r, &mvc->joints[j]);
Dmitry Kovalev's avatar
Dmitry Kovalev committed
264

265
  for (i = 0; i < 2; ++i) {
266 267
    nmv_component *const comp = &mvc->comps[i];

Dmitry Kovalev's avatar
Dmitry Kovalev committed
268 269
    update_mv(r, &comp->sign);

Dmitry Kovalev's avatar
Dmitry Kovalev committed
270
    for (j = 0; j < MV_CLASSES - 1; ++j)
Dmitry Kovalev's avatar
Dmitry Kovalev committed
271
      update_mv(r, &comp->classes[j]);
Dmitry Kovalev's avatar
Dmitry Kovalev committed
272 273

    for (j = 0; j < CLASS0_SIZE - 1; ++j)
Dmitry Kovalev's avatar
Dmitry Kovalev committed
274
      update_mv(r, &comp->class0[j]);
Dmitry Kovalev's avatar
Dmitry Kovalev committed
275 276

    for (j = 0; j < MV_OFFSET_BITS; ++j)
Dmitry Kovalev's avatar
Dmitry Kovalev committed
277
      update_mv(r, &comp->bits[j]);
278 279 280
  }

  for (i = 0; i < 2; ++i) {
281 282
    nmv_component *const comp = &mvc->comps[i];

283
    for (j = 0; j < CLASS0_SIZE; ++j)
284
      for (k = 0; k < 3; ++k)
Dmitry Kovalev's avatar
Dmitry Kovalev committed
285
        update_mv(r, &comp->class0_fp[j][k]);
Dmitry Kovalev's avatar
Dmitry Kovalev committed
286 287

    for (j = 0; j < 3; ++j)
Dmitry Kovalev's avatar
Dmitry Kovalev committed
288
      update_mv(r, &comp->fp[j]);
289 290
  }

291
  if (allow_hp) {
292
    for (i = 0; i < 2; ++i) {
Dmitry Kovalev's avatar
Dmitry Kovalev committed
293 294
      update_mv(r, &mvc->comps[i].class0_hp);
      update_mv(r, &mvc->comps[i].hp);
295 296 297 298
    }
  }
}

299
// Read the referncence frame
Dmitry Kovalev's avatar
Dmitry Kovalev committed
300 301
static void read_ref_frames(VP9D_COMP *pbi, vp9_reader *r,
                            int segment_id, MV_REFERENCE_FRAME ref_frame[2]) {
302
  VP9_COMMON *const cm = &pbi->common;
John Koleszar's avatar
John Koleszar committed
303
  MACROBLOCKD *const xd = &pbi->mb;
304
  FRAME_CONTEXT *const fc = &cm->fc;
305
  FRAME_COUNTS *const counts = &cm->counts;
306

307 308
  if (vp9_segfeature_active(&cm->seg, segment_id, SEG_LVL_REF_FRAME)) {
    ref_frame[0] = vp9_get_segdata(&cm->seg, segment_id, SEG_LVL_REF_FRAME);
309 310
    ref_frame[1] = NONE;
  } else {
311
    const int comp_ctx = vp9_get_pred_context_comp_inter_inter(cm, xd);
Ronald S. Bultje's avatar
Ronald S. Bultje committed
312
    int is_comp;
John Koleszar's avatar
John Koleszar committed
313

Ronald S. Bultje's avatar
Ronald S. Bultje committed
314
    if (cm->comp_pred_mode == HYBRID_PREDICTION) {
315
      is_comp = vp9_read(r, fc->comp_inter_prob[comp_ctx]);
316
      counts->comp_inter[comp_ctx][is_comp]++;
Ronald S. Bultje's avatar
Ronald S. Bultje committed
317 318 319
    } else {
      is_comp = cm->comp_pred_mode == COMP_PREDICTION_ONLY;
    }
John Koleszar's avatar
John Koleszar committed
320

Ronald S. Bultje's avatar
Ronald S. Bultje committed
321 322
    // FIXME(rbultje) I'm pretty sure this breaks segmentation ref frame coding
    if (is_comp) {
323
      const int fix_ref_idx = cm->ref_frame_sign_bias[cm->comp_fixed_ref];
324
      const int ref_ctx = vp9_get_pred_context_comp_ref_p(cm, xd);
325
      const int b = vp9_read(r, fc->comp_ref_prob[ref_ctx]);
326
      counts->comp_ref[ref_ctx][b]++;
327
      ref_frame[fix_ref_idx] = cm->comp_fixed_ref;
Ronald S. Bultje's avatar
Ronald S. Bultje committed
328
      ref_frame[!fix_ref_idx] = cm->comp_var_ref[b];
Dmitry Kovalev's avatar
Dmitry Kovalev committed
329
    } else {
Dmitry Kovalev's avatar
Dmitry Kovalev committed
330 331 332 333 334 335 336 337
      const int ctx0 = vp9_get_pred_context_single_ref_p1(xd);
      const int bit0 = vp9_read(r, fc->single_ref_prob[ctx0][0]);
      ++counts->single_ref[ctx0][0][bit0];
      if (bit0) {
        const int ctx1 = vp9_get_pred_context_single_ref_p2(xd);
        const int bit1 = vp9_read(r, fc->single_ref_prob[ctx1][1]);
        ref_frame[0] = bit1 ? ALTREF_FRAME : GOLDEN_FRAME;
        ++counts->single_ref[ctx1][1][bit1];
Ronald S. Bultje's avatar
Ronald S. Bultje committed
338 339
      } else {
        ref_frame[0] = LAST_FRAME;
John Koleszar's avatar
John Koleszar committed
340
      }
Dmitry Kovalev's avatar
Dmitry Kovalev committed
341 342

      ref_frame[1] = NONE;
343
    }
John Koleszar's avatar
John Koleszar committed
344
  }
345
}
John Koleszar's avatar
John Koleszar committed
346

347
static void read_switchable_interp_probs(FRAME_CONTEXT *fc, vp9_reader *r) {
348
  int i, j;
349 350 351
  for (j = 0; j < SWITCHABLE_FILTERS + 1; ++j)
    for (i = 0; i < SWITCHABLE_FILTERS - 1; ++i)
      if (vp9_read(r, MODE_UPDATE_PROB))
352
        vp9_diff_update_prob(r, &fc->switchable_interp_prob[j][i]);
353 354
}

355
static void read_inter_mode_probs(FRAME_CONTEXT *fc, vp9_reader *r) {
356 357
  int i, j;
  for (i = 0; i < INTER_MODE_CONTEXTS; ++i)
358 359
    for (j = 0; j < INTER_MODES - 1; ++j)
      if (vp9_read(r, MODE_UPDATE_PROB))
360
        vp9_diff_update_prob(r, &fc->inter_mode_probs[i][j]);
361
}
John Koleszar's avatar
John Koleszar committed
362

363 364 365
static INLINE COMPPREDMODE_TYPE read_comp_pred_mode(vp9_reader *r) {
  COMPPREDMODE_TYPE mode = vp9_read_bit(r);
  if (mode)
366
    mode += vp9_read_bit(r);
367 368 369
  return mode;
}

370
static INLINE INTERPOLATIONFILTERTYPE read_switchable_filter_type(
371
    VP9D_COMP *pbi, vp9_reader *r) {
372 373
  VP9_COMMON *const cm = &pbi->common;
  MACROBLOCKD *const xd = &pbi->mb;
374
  const int ctx = vp9_get_pred_context_switchable_interp(xd);
375 376
  const int type = treed_read(r, vp9_switchable_interp_tree,
                              cm->fc.switchable_interp_prob[ctx]);
377 378
  ++cm->counts.switchable_interp[ctx][type];
  return type;
379 380
}

Dmitry Kovalev's avatar
Dmitry Kovalev committed
381
static void read_intra_block_mode_info(VP9D_COMP *pbi, MODE_INFO *mi,
382
                                  vp9_reader *r) {
383
  VP9_COMMON *const cm = &pbi->common;
384
  MB_MODE_INFO *const mbmi = &mi->mbmi;
385
  const BLOCK_SIZE bsize = mi->mbmi.sb_type;
386

Dmitry Kovalev's avatar
Dmitry Kovalev committed
387 388 389
  mbmi->ref_frame[0] = INTRA_FRAME;
  mbmi->ref_frame[1] = NONE;

390
  if (bsize >= BLOCK_8X8) {
391
    const int size_group = size_group_lookup[bsize];
392
    mbmi->mode = read_intra_mode(r, cm->fc.y_mode_prob[size_group]);
393
    cm->counts.y_mode[size_group][mbmi->mode]++;
394
  } else {
395
     // Only 4x4, 4x8, 8x4 blocks
Dmitry Kovalev's avatar
Dmitry Kovalev committed
396 397
     const int num_4x4_w = num_4x4_blocks_wide_lookup[bsize];  // 1 or 2
     const int num_4x4_h = num_4x4_blocks_high_lookup[bsize];  // 1 or 2
398
     int idx, idy;
399

Dmitry Kovalev's avatar
Dmitry Kovalev committed
400 401
     for (idy = 0; idy < 2; idy += num_4x4_h) {
       for (idx = 0; idx < 2; idx += num_4x4_w) {
402 403
         const int ib = idy * 2 + idx;
         const int b_mode = read_intra_mode(r, cm->fc.y_mode_prob[0]);
404
         mi->bmi[ib].as_mode = b_mode;
405
         cm->counts.y_mode[0][b_mode]++;
406

Dmitry Kovalev's avatar
Dmitry Kovalev committed
407
         if (num_4x4_h == 2)
408
           mi->bmi[ib + 2].as_mode = b_mode;
Dmitry Kovalev's avatar
Dmitry Kovalev committed
409
         if (num_4x4_w == 2)
410
           mi->bmi[ib + 1].as_mode = b_mode;
411 412
      }
    }
413
    mbmi->mode = mi->bmi[3].as_mode;
414 415 416
  }

  mbmi->uv_mode = read_intra_mode(r, cm->fc.uv_mode_prob[mbmi->mode]);
417
  cm->counts.uv_mode[mbmi->mode][mbmi->uv_mode]++;
418 419
}

Dmitry Kovalev's avatar
Dmitry Kovalev committed
420
static int read_is_inter_block(VP9D_COMP *pbi, int segment_id, vp9_reader *r) {
421 422 423
  VP9_COMMON *const cm = &pbi->common;
  MACROBLOCKD *const xd = &pbi->mb;

424 425
  if (vp9_segfeature_active(&cm->seg, segment_id, SEG_LVL_REF_FRAME)) {
    return vp9_get_segdata(&cm->seg, segment_id, SEG_LVL_REF_FRAME) !=
Dmitry Kovalev's avatar
Dmitry Kovalev committed
426
           INTRA_FRAME;
427
  } else {
Dmitry Kovalev's avatar
Dmitry Kovalev committed
428 429 430 431
    const int ctx = vp9_get_pred_context_intra_inter(xd);
    const int is_inter = vp9_read(r, vp9_get_pred_prob_intra_inter(cm, xd));
    ++cm->counts.intra_inter[ctx][is_inter];
    return is_inter;
432 433 434
  }
}

Dmitry Kovalev's avatar
Dmitry Kovalev committed
435
static void read_inter_block_mode_info(VP9D_COMP *pbi, MODE_INFO *mi,
436
                                       int mi_row, int mi_col, vp9_reader *r) {
437
  VP9_COMMON *const cm = &pbi->common;
438
  MACROBLOCKD *const xd = &pbi->mb;
439
  nmv_context *const nmvc = &cm->fc.nmvc;
440
  MB_MODE_INFO *const mbmi = &mi->mbmi;
441 442
  int_mv *const mv0 = &mbmi->mv[0];
  int_mv *const mv1 = &mbmi->mv[1];
443
  const BLOCK_SIZE bsize = mbmi->sb_type;
444
  const int allow_hp = xd->allow_high_precision_mv;
Dmitry Kovalev's avatar
Dmitry Kovalev committed
445

446 447
  int_mv nearest, nearby, best_mv;
  int_mv nearest_second, nearby_second, best_mv_second;
448
  uint8_t inter_mode_ctx;
449
  MV_REFERENCE_FRAME ref0;
Dmitry Kovalev's avatar
Dmitry Kovalev committed
450
  int is_compound;
Dmitry Kovalev's avatar
Dmitry Kovalev committed
451

452
  mbmi->uv_mode = DC_PRED;
Dmitry Kovalev's avatar
Dmitry Kovalev committed
453
  read_ref_frames(pbi, r, mbmi->segment_id, mbmi->ref_frame);
454
  ref0 = mbmi->ref_frame[0];
455
  is_compound = has_second_ref(mbmi);
456

457 458
  vp9_find_mv_refs(cm, xd, mi, xd->last_mi, ref0, mbmi->ref_mvs[ref0],
                   mi_row, mi_col);
Ronald S. Bultje's avatar
Ronald S. Bultje committed
459

Paul Wilkins's avatar
Paul Wilkins committed
460
  inter_mode_ctx = mbmi->mode_context[ref0];
461

462
  if (vp9_segfeature_active(&cm->seg, mbmi->segment_id, SEG_LVL_SKIP)) {
463
    mbmi->mode = ZEROMV;
464
    assert(bsize >= BLOCK_8X8);
465 466 467 468
  } else {
    if (bsize >= BLOCK_8X8)
      mbmi->mode = read_inter_mode(cm, r, inter_mode_ctx);
  }
469

470
  // nearest, nearby
471
  if (bsize < BLOCK_8X8 || mbmi->mode != ZEROMV) {
472 473 474
    vp9_find_best_ref_mvs(xd, mbmi->ref_mvs[ref0], &nearest, &nearby);
    best_mv.as_int = mbmi->ref_mvs[ref0][0].as_int;
  }
475

Dmitry Kovalev's avatar
Dmitry Kovalev committed
476
  if (is_compound) {
477
    const MV_REFERENCE_FRAME ref1 = mbmi->ref_frame[1];
478
    vp9_find_mv_refs(cm, xd, mi, xd->last_mi,
479
                     ref1, mbmi->ref_mvs[ref1], mi_row, mi_col);
480

481
    if (bsize < BLOCK_8X8 || mbmi->mode != ZEROMV) {
482 483 484
      vp9_find_best_ref_mvs(xd, mbmi->ref_mvs[ref1],
                            &nearest_second, &nearby_second);
      best_mv_second.as_int = mbmi->ref_mvs[ref1][0].as_int;
485
    }
486
  }
487

488 489 490 491
  mbmi->interp_filter = cm->mcomp_filter_type == SWITCHABLE
                              ? read_switchable_filter_type(pbi, r)
                              : cm->mcomp_filter_type;

492
  if (bsize < BLOCK_8X8) {
Dmitry Kovalev's avatar
Dmitry Kovalev committed
493 494
    const int num_4x4_w = num_4x4_blocks_wide_lookup[bsize];  // 1 or 2
    const int num_4x4_h = num_4x4_blocks_high_lookup[bsize];  // 1 or 2
495
    int idx, idy;
Dmitry Kovalev's avatar
Dmitry Kovalev committed
496 497
    for (idy = 0; idy < 2; idy += num_4x4_h) {
      for (idx = 0; idx < 2; idx += num_4x4_w) {
498 499
        int_mv blockmv, secondmv;
        const int j = idy * 2 + idx;
500
        const int b_mode = read_inter_mode(cm, r, inter_mode_ctx);
501

502
        if (b_mode == NEARESTMV || b_mode == NEARMV) {
503 504 505
          vp9_append_sub8x8_mvs_for_idx(cm, xd, &nearest, &nearby, j, 0,
                                        mi_row, mi_col);

Dmitry Kovalev's avatar
Dmitry Kovalev committed
506
          if (is_compound)
507
            vp9_append_sub8x8_mvs_for_idx(cm, xd,  &nearest_second,
508 509
                                         &nearby_second, j, 1,
                                         mi_row, mi_col);
510
        }
511

512
        switch (b_mode) {
513 514
          case NEWMV:
            read_mv(r, &blockmv.as_mv, &best_mv.as_mv, nmvc,
515
                    &cm->counts.mv, allow_hp);
Ronald S. Bultje's avatar
Ronald S. Bultje committed
516

Dmitry Kovalev's avatar
Dmitry Kovalev committed
517
            if (is_compound)
518
              read_mv(r, &secondmv.as_mv, &best_mv_second.as_mv, nmvc,
519
                      &cm->counts.mv, allow_hp);
520 521 522
            break;
          case NEARESTMV:
            blockmv.as_int = nearest.as_int;
Dmitry Kovalev's avatar
Dmitry Kovalev committed
523
            if (is_compound)
524 525 526 527
              secondmv.as_int = nearest_second.as_int;
            break;
          case NEARMV:
            blockmv.as_int = nearby.as_int;
Dmitry Kovalev's avatar
Dmitry Kovalev committed
528
            if (is_compound)
529 530 531 532
              secondmv.as_int = nearby_second.as_int;
            break;
          case ZEROMV:
            blockmv.as_int = 0;
Dmitry Kovalev's avatar
Dmitry Kovalev committed
533
            if (is_compound)
534 535 536 537
              secondmv.as_int = 0;
            break;
          default:
            assert(!"Invalid inter mode value");
538
        }
539
        mi->bmi[j].as_mv[0].as_int = blockmv.as_int;
Dmitry Kovalev's avatar
Dmitry Kovalev committed
540
        if (is_compound)
541
          mi->bmi[j].as_mv[1].as_int = secondmv.as_int;
Ronald S. Bultje's avatar
Ronald S. Bultje committed
542

Dmitry Kovalev's avatar
Dmitry Kovalev committed
543
        if (num_4x4_h == 2)
544
          mi->bmi[j + 2] = mi->bmi[j];
Dmitry Kovalev's avatar
Dmitry Kovalev committed
545
        if (num_4x4_w == 2)
546
          mi->bmi[j + 1] = mi->bmi[j];
547
        mi->mbmi.mode = b_mode;
Ronald S. Bultje's avatar
Ronald S. Bultje committed
548
      }
Scott LaVarnway's avatar
Scott LaVarnway committed
549
    }
550 551 552

    mv0->as_int = mi->bmi[3].as_mv[0].as_int;
    mv1->as_int = mi->bmi[3].as_mv[1].as_int;
John Koleszar's avatar
John Koleszar committed
553
  } else {
554 555
    switch (mbmi->mode) {
      case NEARMV:
556
        mv0->as_int = nearby.as_int;
557
        if (is_compound)
558
          mv1->as_int = nearby_second.as_int;
559 560 561
        break;

      case NEARESTMV:
562
        mv0->as_int = nearest.as_int;
563
        if (is_compound)
564
          mv1->as_int = nearest_second.as_int;
565 566 567 568
        break;

      case ZEROMV:
        mv0->as_int = 0;
Dmitry Kovalev's avatar
Dmitry Kovalev committed
569
        if (is_compound)
570 571 572 573
          mv1->as_int = 0;
        break;

      case NEWMV:
574
        read_mv(r, &mv0->as_mv, &best_mv.as_mv, nmvc, &cm->counts.mv, allow_hp);
Dmitry Kovalev's avatar
Dmitry Kovalev committed
575
        if (is_compound)
576 577
          read_mv(r, &mv1->as_mv, &best_mv_second.as_mv, nmvc, &cm->counts.mv,
                  allow_hp);
578 579 580 581
        break;
      default:
        assert(!"Invalid inter mode value");
    }
John Koleszar's avatar
John Koleszar committed
582
  }
Scott LaVarnway's avatar
Scott LaVarnway committed
583
}
John Koleszar's avatar
John Koleszar committed
584

Dmitry Kovalev's avatar
Dmitry Kovalev committed
585 586
static void read_inter_frame_mode_info(VP9D_COMP *pbi, MODE_INFO *mi,
                                       int mi_row, int mi_col, vp9_reader *r) {
587 588
  VP9_COMMON *const cm = &pbi->common;
  MB_MODE_INFO *const mbmi = &mi->mbmi;
Dmitry Kovalev's avatar
Dmitry Kovalev committed
589
  int inter_block;
590

Dmitry Kovalev's avatar
Dmitry Kovalev committed
591 592
  mbmi->mv[0].as_int = 0;
  mbmi->mv[1].as_int = 0;
593
  mbmi->segment_id = read_inter_segment_id(pbi, mi_row, mi_col, r);
Paul Wilkins's avatar
Paul Wilkins committed
594
  mbmi->skip_coeff = read_skip_coeff(pbi, mbmi->segment_id, r);
Dmitry Kovalev's avatar
Dmitry Kovalev committed
595
  inter_block = read_is_inter_block(pbi, mbmi->segment_id, r);
596 597
  mbmi->tx_size = read_tx_size(pbi, cm->tx_mode, mbmi->sb_type,
                               !mbmi->skip_coeff || !inter_block, r);
598

Dmitry Kovalev's avatar
Dmitry Kovalev committed
599
  if (inter_block)
600
    read_inter_block_mode_info(pbi, mi, mi_row, mi_col, r);
601
  else
Dmitry Kovalev's avatar
Dmitry Kovalev committed
602
    read_intra_block_mode_info(pbi, mi, r);
603 604
}

605 606 607 608 609 610 611 612
static void read_comp_pred(VP9_COMMON *cm, vp9_reader *r) {
  int i;

  cm->comp_pred_mode = cm->allow_comp_inter_inter ? read_comp_pred_mode(r)
                                                  : SINGLE_PREDICTION_ONLY;

  if (cm->comp_pred_mode == HYBRID_PREDICTION)
    for (i = 0; i < COMP_INTER_CONTEXTS; i++)
613
      if (vp9_read(r, MODE_UPDATE_PROB))
614 615 616 617
        vp9_diff_update_prob(r, &cm->fc.comp_inter_prob[i]);

  if (cm->comp_pred_mode != COMP_PREDICTION_ONLY)
    for (i = 0; i < REF_CONTEXTS; i++) {
618
      if (vp9_read(r, MODE_UPDATE_PROB))
619
        vp9_diff_update_prob(r, &cm->fc.single_ref_prob[i][0]);
620
      if (vp9_read(r, MODE_UPDATE_PROB))
621 622 623 624 625
        vp9_diff_update_prob(r, &cm->fc.single_ref_prob[i][1]);
    }

  if (cm->comp_pred_mode != SINGLE_PREDICTION_ONLY)
    for (i = 0; i < REF_CONTEXTS; i++)
626
      if (vp9_read(r, MODE_UPDATE_PROB))
627 628 629
        vp9_diff_update_prob(r, &cm->fc.comp_ref_prob[i]);
}

630 631
void vp9_prepare_read_mode_info(VP9D_COMP* pbi, vp9_reader *r) {
  VP9_COMMON *const cm = &pbi->common;
632
  int k;
633

634
  // TODO(jkoleszar): does this clear more than MBSKIP_CONTEXTS? Maybe remove.
Deb Mukherjee's avatar
Deb Mukherjee committed
635
  // vpx_memset(cm->fc.mbskip_probs, 0, sizeof(cm->fc.mbskip_probs));
636
  for (k = 0; k < MBSKIP_CONTEXTS; ++k)
637
    if (vp9_read(r, MODE_UPDATE_PROB))
638
      vp9_diff_update_prob(r, &cm->fc.mbskip_probs[k]);
639

640 641 642 643 644 645 646 647 648 649 650
  if (cm->frame_type != KEY_FRAME && !cm->intra_only) {
    nmv_context *const nmvc = &pbi->common.fc.nmvc;
    MACROBLOCKD *const xd = &pbi->mb;
    int i, j;

    read_inter_mode_probs(&cm->fc, r);

    if (cm->mcomp_filter_type == SWITCHABLE)
      read_switchable_interp_probs(&cm->fc, r);

    for (i = 0; i < INTRA_INTER_CONTEXTS; i++)
651
      if (vp9_read(r, MODE_UPDATE_PROB))
652 653
        vp9_diff_update_prob(r, &cm->fc.intra_inter_prob[i]);

654
    read_comp_pred(cm, r);
655 656

    for (j = 0; j < BLOCK_SIZE_GROUPS; j++)