vp9_decodemv.c 37.8 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
Dmitry Kovalev's avatar
Dmitry Kovalev committed
32

33
34
35
36
// #define DEC_DEBUG
#ifdef DEC_DEBUG
extern int dec_debug;
#endif
37

38
39
static B_PREDICTION_MODE read_bmode(vp9_reader *r, const vp9_prob *p) {
  B_PREDICTION_MODE m = treed_read(r, vp9_bmode_tree, p);
40
41
42
43
44
45
46
47
#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;
}

48
49
static B_PREDICTION_MODE read_kf_bmode(vp9_reader *r, const vp9_prob *p) {
  return (B_PREDICTION_MODE)treed_read(r, vp9_kf_bmode_tree, p);
Scott LaVarnway's avatar
Scott LaVarnway committed
50
51
}

52
53
static MB_PREDICTION_MODE read_ymode(vp9_reader *r, const vp9_prob *p) {
  return (MB_PREDICTION_MODE)treed_read(r, vp9_ymode_tree, p);
Ronald S. Bultje's avatar
Ronald S. Bultje committed
54
}
Scott LaVarnway's avatar
Scott LaVarnway committed
55

56
57
static MB_PREDICTION_MODE read_sb_ymode(vp9_reader *r, const vp9_prob *p) {
  return (MB_PREDICTION_MODE)treed_read(r, vp9_sb_ymode_tree, p);
58
59
}

60
61
static MB_PREDICTION_MODE read_kf_sb_ymode(vp9_reader *r, const vp9_prob *p) {
  return (MB_PREDICTION_MODE)treed_read(r, vp9_uv_mode_tree, p);
Scott LaVarnway's avatar
Scott LaVarnway committed
62
63
}

64
65
static MB_PREDICTION_MODE read_kf_mb_ymode(vp9_reader *r, const vp9_prob *p) {
  return (MB_PREDICTION_MODE)treed_read(r, vp9_kf_ymode_tree, p);
Scott LaVarnway's avatar
Scott LaVarnway committed
66
67
}

68
69
static int read_i8x8_mode(vp9_reader *r, const vp9_prob *p) {
  return treed_read(r, vp9_i8x8_mode_tree, p);
Yaowu Xu's avatar
Yaowu Xu committed
70
}
Scott LaVarnway's avatar
Scott LaVarnway committed
71

72
73
static MB_PREDICTION_MODE read_uv_mode(vp9_reader *r, const vp9_prob *p) {
  return (MB_PREDICTION_MODE)treed_read(r, vp9_uv_mode_tree, p);
Scott LaVarnway's avatar
Scott LaVarnway committed
74
75
}

76
77
78
79
static int read_mb_segid(vp9_reader *r, MACROBLOCKD *xd) {
  const vp9_prob *const p = xd->mb_segment_tree_probs;
  return vp9_read(r, p[0]) ? 2 + vp9_read(r, p[2])
                           :     vp9_read(r, p[1]);
Scott LaVarnway's avatar
Scott LaVarnway committed
80
}
81

82
83
// 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.
84
85
86
static int read_mb_segid_except(vp9_reader *r,
                                VP9_COMMON *cm, MACROBLOCKD *xd,
                                int mb_row, int mb_col) {
87
88
  const BLOCK_SIZE_TYPE sb_type = xd->mode_info_context->mbmi.sb_type;
  const int pred_seg_id = vp9_get_pred_mb_segid(cm, sb_type, mb_row, mb_col);
89
90
  const vp9_prob *const p = xd->mb_segment_tree_probs;
  const vp9_prob prob = xd->mb_segment_mispred_tree_probs[pred_seg_id];
91

92
93
94
  return vp9_read(r, prob)
             ? 2 + (pred_seg_id  < 2 ? vp9_read(r, p[2]) : (pred_seg_id == 2))
             :     (pred_seg_id >= 2 ? vp9_read(r, p[1]) : (pred_seg_id == 0));
95
96
}

97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
static void set_segment_id(VP9_COMMON *cm, MB_MODE_INFO *mbmi,
                           int mb_row, int mb_col, int segment_id) {
  const int mb_index = mb_row * cm->mb_cols + mb_col;
  const BLOCK_SIZE_TYPE sb_type = mbmi->sb_type;
  if (sb_type) {
    const int bw = 1 << mb_width_log2(sb_type);
    const int bh = 1 << mb_height_log2(sb_type);
    const int ymbs = MIN(cm->mb_rows - mb_row, bh);
    const int xmbs = MIN(cm->mb_cols - mb_col, bw);
    int x, y;

    for (y = 0; y < ymbs; y++) {
      for (x = 0; x < xmbs; x++) {
        const int index = mb_index + (y * cm->mb_cols + x);
        cm->last_frame_seg_map[index] = segment_id;
      }
    }
  } else {
    cm->last_frame_seg_map[mb_index] = segment_id;
  }
}

119
120
121
122
123
124
125
126
127
128
129
static TX_SIZE select_txfm_size(VP9_COMMON *cm, vp9_reader *r,
                                int allow_16x16, int allow_32x32) {
  TX_SIZE txfm_size = vp9_read(r, cm->prob_tx[0]);  // TX_4X4 or >TX_4X4
  if (txfm_size != TX_4X4 && allow_16x16) {
    txfm_size += vp9_read(r, cm->prob_tx[1]);       // TX_8X8 or >TX_8X8
    if (txfm_size != TX_8X8 && allow_32x32)
      txfm_size += vp9_read(r, cm->prob_tx[2]);     // TX_16X16 or >TX_16X16
  }
  return txfm_size;
}

130
extern const int vp9_i8x8_block[4];
131
132
133
static void kfread_modes(VP9D_COMP *pbi, MODE_INFO *m,
                         int mb_row, int mb_col,
                         vp9_reader *r) {
134
  VP9_COMMON *const cm = &pbi->common;
135
136
  MACROBLOCKD *const xd = &pbi->mb;
  const int mis = cm->mode_info_stride;
137
138
  m->mbmi.ref_frame = INTRA_FRAME;

139
  // Read segmentation map if it is being updated explicitly this frame
John Koleszar's avatar
John Koleszar committed
140
  m->mbmi.segment_id = 0;
141
142
143
  if (xd->segmentation_enabled && xd->update_mb_segmentation_map) {
    m->mbmi.segment_id = read_mb_segid(r, xd);
    set_segment_id(cm, &m->mbmi, mb_row, mb_col, m->mbmi.segment_id);
John Koleszar's avatar
John Koleszar committed
144
145
  }

146
  m->mbmi.mb_skip_coeff = vp9_segfeature_active(xd, m->mbmi.segment_id,
147
148
                                                SEG_LVL_SKIP);
  if (!m->mbmi.mb_skip_coeff)
149
    m->mbmi.mb_skip_coeff = vp9_read(r, vp9_get_pred_prob(cm, xd, PRED_MBSKIP));
John Koleszar's avatar
John Koleszar committed
150

151
  // luma mode
152
153
154
  m->mbmi.mode = m->mbmi.sb_type ?
      read_kf_sb_ymode(r, cm->sb_kf_ymode_prob[cm->kf_ymode_probs_index]):
      read_kf_mb_ymode(r, cm->kf_ymode_prob[cm->kf_ymode_probs_index]);
155

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

158
  if (m->mbmi.mode == I4X4_PRED) {
159
160
    int i;
    for (i = 0; i < 16; ++i) {
Dmitry Kovalev's avatar
Dmitry Kovalev committed
161
      const B_PREDICTION_MODE a = above_block_mode(m, i, mis);
162
      const B_PREDICTION_MODE l = xd->left_available || (i & 3) ?
163
                                  left_block_mode(m, i) : B_DC_PRED;
Paul Wilkins's avatar
Paul Wilkins committed
164

165
      m->bmi[i].as_mode.first = read_kf_bmode(r, cm->kf_bmode_prob[a][l]);
166
    }
John Koleszar's avatar
John Koleszar committed
167
  }
Dmitry Kovalev's avatar
Dmitry Kovalev committed
168

169
  if (m->mbmi.mode == I8X8_PRED) {
John Koleszar's avatar
John Koleszar committed
170
    int i;
171
    for (i = 0; i < 4; ++i) {
Dmitry Kovalev's avatar
Dmitry Kovalev committed
172
      const int ib = vp9_i8x8_block[i];
173
      const int mode8x8 = read_i8x8_mode(r, cm->fc.i8x8_mode_prob);
Dmitry Kovalev's avatar
Dmitry Kovalev committed
174

John Koleszar's avatar
John Koleszar committed
175
176
177
178
179
      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;
    }
180
181
182
183
  }

  // chroma mode
  if (m->mbmi.mode != I8X8_PRED) {
184
    m->mbmi.uv_mode = read_uv_mode(r, cm->kf_uv_mode_prob[m->mbmi.mode]);
Dmitry Kovalev's avatar
Dmitry Kovalev committed
185
  }
186

Dmitry Kovalev's avatar
Dmitry Kovalev committed
187
  if (cm->txfm_mode == TX_MODE_SELECT &&
188
      !m->mbmi.mb_skip_coeff &&
189
      m->mbmi.mode <= I8X8_PRED) {
190
191
192
    const int allow_16x16 = m->mbmi.mode != I8X8_PRED;
    const int allow_32x32 = m->mbmi.sb_type >= BLOCK_SIZE_SB32X32;
    m->mbmi.txfm_size = select_txfm_size(cm, r, allow_16x16, allow_32x32);
193
194
  } else if (cm->txfm_mode >= ALLOW_32X32 &&
             m->mbmi.sb_type >= BLOCK_SIZE_SB32X32) {
195
    m->mbmi.txfm_size = TX_32X32;
196
  } else if (cm->txfm_mode >= ALLOW_16X16 && m->mbmi.mode <= TM_PRED) {
197
    m->mbmi.txfm_size = TX_16X16;
Yaowu Xu's avatar
Yaowu Xu committed
198
  } else if (cm->txfm_mode >= ALLOW_8X8 && m->mbmi.mode != I4X4_PRED) {
199
200
201
202
    m->mbmi.txfm_size = TX_8X8;
  } else {
    m->mbmi.txfm_size = TX_4X4;
  }
Scott LaVarnway's avatar
Scott LaVarnway committed
203
}
John Koleszar's avatar
John Koleszar committed
204

205

206
static int read_nmv_component(vp9_reader *r,
207
208
                              int rv,
                              const nmv_component *mvcomp) {
Dmitry Kovalev's avatar
Dmitry Kovalev committed
209
210
211
212
213
  int mag, d;
  const int sign = vp9_read(r, mvcomp->sign);
  const int mv_class = treed_read(r, vp9_mv_class_tree, mvcomp->classes);

  if (mv_class == MV_CLASS_0) {
214
    d = treed_read(r, vp9_mv_class0_tree, mvcomp->class0);
215
  } else {
Dmitry Kovalev's avatar
Dmitry Kovalev committed
216
217
218
    int i;
    int n = mv_class + CLASS0_BITS - 1;  // number of bits

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

Dmitry Kovalev's avatar
Dmitry Kovalev committed
224
225
  mag = vp9_get_mv_mag(mv_class, d << 3);
  return sign ? -(mag + 8) : (mag + 8);
226
227
}

228
static int read_nmv_component_fp(vp9_reader *r,
229
230
231
232
                                 int v,
                                 int rv,
                                 const nmv_component *mvcomp,
                                 int usehp) {
Dmitry Kovalev's avatar
Dmitry Kovalev committed
233
234
235
236
237
238
239
  const int sign = v < 0;
  int mag = ((sign ? -v : v) - 1) & ~7;  // magnitude - 1
  int offset;
  const int mv_class = vp9_get_mv_class(mag, &offset);
  const int f = mv_class == MV_CLASS_0 ?
      treed_read(r, vp9_mv_fp_tree, mvcomp->class0_fp[offset >> 3]):
      treed_read(r, vp9_mv_fp_tree, mvcomp->fp);
240

Dmitry Kovalev's avatar
Dmitry Kovalev committed
241
  offset += f << 1;
242
243

  if (usehp) {
244
245
    const vp9_prob p = mv_class == MV_CLASS_0 ? mvcomp->class0_hp : mvcomp->hp;
    offset += vp9_read(r, p);
246
  } else {
Dmitry Kovalev's avatar
Dmitry Kovalev committed
247
    offset += 1;  // If hp is not used, the default value of the hp bit is 1
248
  }
Dmitry Kovalev's avatar
Dmitry Kovalev committed
249
250
  mag = vp9_get_mv_mag(mv_class, offset);
  return sign ? -(mag + 1) : (mag + 1);
251
252
}

253
static void read_nmv(vp9_reader *r, MV *mv, const MV *ref,
254
                     const nmv_context *mvctx) {
Dmitry Kovalev's avatar
Dmitry Kovalev committed
255
  const MV_JOINT_TYPE j = treed_read(r, vp9_mv_joint_tree, mvctx->joints);
256
257
  mv->row = mv->col = 0;

258
  if (mv_joint_vertical(j))
259
    mv->row = read_nmv_component(r, ref->row, &mvctx->comps[0]);
Dmitry Kovalev's avatar
Dmitry Kovalev committed
260

261
  if (mv_joint_horizontal(j))
262
263
264
    mv->col = read_nmv_component(r, ref->col, &mvctx->comps[1]);
}

265
static void read_nmv_fp(vp9_reader *r, MV *mv, const MV *ref,
266
                        const nmv_context *mvctx, int usehp) {
267
  const MV_JOINT_TYPE j = vp9_get_mv_joint(mv);
268
  usehp = usehp && vp9_use_nmv_hp(ref);
269
  if (mv_joint_vertical(j))
270
271
    mv->row = read_nmv_component_fp(r, mv->row, ref->row, &mvctx->comps[0],
                                    usehp);
272

273
  if (mv_joint_horizontal(j))
274
275
276
277
    mv->col = read_nmv_component_fp(r, mv->col, ref->col, &mvctx->comps[1],
                                    usehp);
}

278
static void update_nmv(vp9_reader *r, vp9_prob *const p,
279
                       const vp9_prob upd_p) {
280
  if (vp9_read(r, upd_p)) {
281
#ifdef LOW_PRECISION_MV_UPDATE
282
    *p = (vp9_read_literal(r, 7) << 1) | 1;
283
#else
284
    *p = (vp9_read_literal(r, 8));
285
286
287
288
#endif
  }
}

289
static void read_nmvprobs(vp9_reader *r, nmv_context *mvctx,
290
291
                          int usehp) {
  int i, j, k;
Dmitry Kovalev's avatar
Dmitry Kovalev committed
292

293
#ifdef MV_GROUP_UPDATE
294
  if (!vp9_read_bit(r))
Dmitry Kovalev's avatar
Dmitry Kovalev committed
295
    return;
296
#endif
Dmitry Kovalev's avatar
Dmitry Kovalev committed
297
  for (j = 0; j < MV_JOINTS - 1; ++j)
298
    update_nmv(r, &mvctx->joints[j], VP9_NMV_UPDATE_PROB);
Dmitry Kovalev's avatar
Dmitry Kovalev committed
299

300
  for (i = 0; i < 2; ++i) {
301
    update_nmv(r, &mvctx->comps[i].sign, VP9_NMV_UPDATE_PROB);
Dmitry Kovalev's avatar
Dmitry Kovalev committed
302
    for (j = 0; j < MV_CLASSES - 1; ++j)
303
      update_nmv(r, &mvctx->comps[i].classes[j], VP9_NMV_UPDATE_PROB);
Dmitry Kovalev's avatar
Dmitry Kovalev committed
304
305

    for (j = 0; j < CLASS0_SIZE - 1; ++j)
306
      update_nmv(r, &mvctx->comps[i].class0[j], VP9_NMV_UPDATE_PROB);
Dmitry Kovalev's avatar
Dmitry Kovalev committed
307
308

    for (j = 0; j < MV_OFFSET_BITS; ++j)
309
      update_nmv(r, &mvctx->comps[i].bits[j], VP9_NMV_UPDATE_PROB);
310
311
312
  }

  for (i = 0; i < 2; ++i) {
313
    for (j = 0; j < CLASS0_SIZE; ++j)
314
      for (k = 0; k < 3; ++k)
315
        update_nmv(r, &mvctx->comps[i].class0_fp[j][k], VP9_NMV_UPDATE_PROB);
Dmitry Kovalev's avatar
Dmitry Kovalev committed
316
317

    for (j = 0; j < 3; ++j)
318
      update_nmv(r, &mvctx->comps[i].fp[j], VP9_NMV_UPDATE_PROB);
319
320
321
322
  }

  if (usehp) {
    for (i = 0; i < 2; ++i) {
323
324
      update_nmv(r, &mvctx->comps[i].class0_hp, VP9_NMV_UPDATE_PROB);
      update_nmv(r, &mvctx->comps[i].hp, VP9_NMV_UPDATE_PROB);
325
326
327
328
    }
  }
}

329
// Read the referncence frame
330
static MV_REFERENCE_FRAME read_ref_frame(VP9D_COMP *pbi,
331
                                         vp9_reader *r,
332
                                         int segment_id) {
John Koleszar's avatar
John Koleszar committed
333
  MV_REFERENCE_FRAME ref_frame;
334
  VP9_COMMON *const cm = &pbi->common;
John Koleszar's avatar
John Koleszar committed
335
336
  MACROBLOCKD *const xd = &pbi->mb;

Dmitry Kovalev's avatar
Dmitry Kovalev committed
337
  int seg_ref_count = 0;
338
339
340
341
342
343
344
  const int seg_ref_active = vp9_segfeature_active(xd, segment_id,
                                                   SEG_LVL_REF_FRAME);

  const int intra = vp9_check_segref(xd, segment_id, INTRA_FRAME);
  const int last = vp9_check_segref(xd, segment_id, LAST_FRAME);
  const int golden = vp9_check_segref(xd, segment_id, GOLDEN_FRAME);
  const int altref = vp9_check_segref(xd, segment_id, ALTREF_FRAME);
John Koleszar's avatar
John Koleszar committed
345
346
347

  // If segment coding enabled does the segment allow for more than one
  // possible reference frame
348
349
  if (seg_ref_active)
    seg_ref_count = intra + last + golden + altref;
John Koleszar's avatar
John Koleszar committed
350
351
352

  // Segment reference frame features not available or allows for
  // multiple reference frame options
353
  if (!seg_ref_active || seg_ref_count > 1) {
John Koleszar's avatar
John Koleszar committed
354
355
356
357
    // Values used in prediction model coding
    MV_REFERENCE_FRAME pred_ref;

    // Get the context probability the prediction flag
Dmitry Kovalev's avatar
Dmitry Kovalev committed
358
    vp9_prob pred_prob = vp9_get_pred_prob(cm, xd, PRED_REF);
John Koleszar's avatar
John Koleszar committed
359
360

    // Read the prediction status flag
361
    unsigned char prediction_flag = vp9_read(r, pred_prob);
John Koleszar's avatar
John Koleszar committed
362
363

    // Store the prediction flag.
Paul Wilkins's avatar
Paul Wilkins committed
364
    vp9_set_pred_flag(xd, PRED_REF, prediction_flag);
John Koleszar's avatar
John Koleszar committed
365
366

    // Get the predicted reference frame.
Paul Wilkins's avatar
Paul Wilkins committed
367
    pred_ref = vp9_get_pred_ref(cm, xd);
John Koleszar's avatar
John Koleszar committed
368
369
370
371

    // If correctly predicted then use the predicted value
    if (prediction_flag) {
      ref_frame = pred_ref;
Dmitry Kovalev's avatar
Dmitry Kovalev committed
372
373
    } else {
      // decode the explicitly coded value
374
      vp9_prob mod_refprobs[PREDICTION_PROBS];
375
376
      vpx_memcpy(mod_refprobs, cm->mod_refprobs[pred_ref],
                 sizeof(mod_refprobs));
John Koleszar's avatar
John Koleszar committed
377
378
379
380

      // If segment coding enabled blank out options that cant occur by
      // setting the branch probability to 0.
      if (seg_ref_active) {
381
382
383
        mod_refprobs[INTRA_FRAME] *= intra;
        mod_refprobs[LAST_FRAME] *= last;
        mod_refprobs[GOLDEN_FRAME] *= golden * altref;
John Koleszar's avatar
John Koleszar committed
384
385
386
387
388
389
390
      }

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

      // Do we need to decode the Intra/Inter branch
      if (mod_refprobs[0])
391
        ref_frame = vp9_read(r, mod_refprobs[0]);
John Koleszar's avatar
John Koleszar committed
392
393
394
395
396
397
      else
        ref_frame++;

      if (ref_frame) {
        // Do we need to decode the Last/Gf_Arf branch
        if (mod_refprobs[1])
398
          ref_frame += vp9_read(r, mod_refprobs[1]);
399
        else
John Koleszar's avatar
John Koleszar committed
400
401
402
403
          ref_frame++;

        if (ref_frame > 1) {
          // Do we need to decode the GF/Arf branch
404
          if (mod_refprobs[2]) {
405
            ref_frame += vp9_read(r, mod_refprobs[2]);
406
          } else {
407
408
409
410
411
412
            if (seg_ref_active)
              ref_frame = pred_ref == GOLDEN_FRAME || !golden ? ALTREF_FRAME
                                                              : GOLDEN_FRAME;
            else
              ref_frame = pred_ref == GOLDEN_FRAME ? ALTREF_FRAME
                                                   : GOLDEN_FRAME;
John Koleszar's avatar
John Koleszar committed
413
          }
414
        }
John Koleszar's avatar
John Koleszar committed
415
      }
416
    }
Dmitry Kovalev's avatar
Dmitry Kovalev committed
417
418
  } else {
    // Segment reference frame features are enabled
John Koleszar's avatar
John Koleszar committed
419
420
421
    // 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
422
423
    vp9_set_pred_flag(xd, PRED_REF, 1);
    ref_frame = vp9_get_pred_ref(cm, xd);
John Koleszar's avatar
John Koleszar committed
424
425
  }

426
  return ref_frame;
427
}
John Koleszar's avatar
John Koleszar committed
428

429
430
static MB_PREDICTION_MODE read_sb_mv_ref(vp9_reader *r, const vp9_prob *p) {
  return (MB_PREDICTION_MODE) treed_read(r, vp9_sb_mv_ref_tree, p);
Ronald S. Bultje's avatar
Ronald S. Bultje committed
431
}
John Koleszar's avatar
John Koleszar committed
432

433
434
static MB_PREDICTION_MODE read_mv_ref(vp9_reader *r, const vp9_prob *p) {
  return (MB_PREDICTION_MODE) treed_read(r, vp9_mv_ref_tree, p);
John Koleszar's avatar
John Koleszar committed
435
436
}

437
static B_PREDICTION_MODE read_sub_mv_ref(vp9_reader *r, const vp9_prob *p) {
438
  return (B_PREDICTION_MODE) treed_read(r, vp9_sub_mv_ref_tree, p);
John Koleszar's avatar
John Koleszar committed
439
}
Scott LaVarnway's avatar
Scott LaVarnway committed
440
441

#ifdef VPX_MODE_COUNT
442
unsigned int vp9_mv_cont_count[5][4] = {
John Koleszar's avatar
John Koleszar committed
443
444
445
446
447
  { 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
448
};
Scott LaVarnway's avatar
Scott LaVarnway committed
449
#endif
John Koleszar's avatar
John Koleszar committed
450

Dmitry Kovalev's avatar
Dmitry Kovalev committed
451
static const unsigned char mbsplit_fill_count[4] = { 8, 8, 4, 1 };
452
static const unsigned char mbsplit_fill_offset[4][16] = {
Dmitry Kovalev's avatar
Dmitry Kovalev committed
453
454
455
456
  { 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
457
};
John Koleszar's avatar
John Koleszar committed
458

459
static void read_switchable_interp_probs(VP9D_COMP* const pbi, vp9_reader *r) {
460
  VP9_COMMON *const cm = &pbi->common;
461
  int i, j;
462
463
464
  for (j = 0; j < VP9_SWITCHABLE_FILTERS + 1; ++j)
    for (i = 0; i < VP9_SWITCHABLE_FILTERS - 1; ++i)
      cm->fc.switchable_interp_prob[j][i] = vp9_read_prob(r);
465
}
John Koleszar's avatar
John Koleszar committed
466

467
468
469
470
471
472
473
474
static INLINE COMPPREDMODE_TYPE read_comp_pred_mode(vp9_reader *r) {
  COMPPREDMODE_TYPE mode = vp9_read_bit(r);
  if (mode)
     mode += vp9_read_bit(r);
  return mode;
}

static void mb_mode_mv_init(VP9D_COMP *pbi, vp9_reader *r) {
475
  VP9_COMMON *const cm = &pbi->common;
John Koleszar's avatar
John Koleszar committed
476

477
478
  if (cm->frame_type == KEY_FRAME) {
    if (!cm->kf_ymode_probs_update)
479
      cm->kf_ymode_probs_index = vp9_read_literal(r, 3);
480
  } else {
481
482
483
    nmv_context *const nmvc = &pbi->common.fc.nmvc;
    MACROBLOCKD *const xd = &pbi->mb;
    int i, j;
484

485
    if (cm->mcomp_filter_type == SWITCHABLE)
486
      read_switchable_interp_probs(pbi, r);
487
488
#if CONFIG_COMP_INTERINTRA_PRED
    if (cm->use_interintra) {
489
490
      if (vp9_read(r, VP9_UPD_INTERINTRA_PROB))
        cm->fc.interintra_prob = vp9_read_prob(r);
491
492
    }
#endif
493
494
495
496
    // Baseline probabilities for decoding reference frame
    cm->prob_intra_coded = vp9_read_prob(r);
    cm->prob_last_coded  = vp9_read_prob(r);
    cm->prob_gf_coded    = vp9_read_prob(r);
John Koleszar's avatar
John Koleszar committed
497
498
499

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

502
503
    cm->comp_pred_mode = read_comp_pred_mode(r);
    if (cm->comp_pred_mode == HYBRID_PREDICTION)
John Koleszar's avatar
John Koleszar committed
504
      for (i = 0; i < COMP_PRED_CONTEXTS; i++)
505
        cm->prob_comppred[i] = vp9_read_prob(r);
John Koleszar's avatar
John Koleszar committed
506

507
508
    // VP9_YMODES
    if (vp9_read_bit(r))
509
      for (i = 0; i < VP9_YMODES - 1; ++i)
510
        cm->fc.ymode_prob[i] = vp9_read_prob(r);
511

512
513
    // VP9_I32X32_MODES
    if (vp9_read_bit(r))
514
      for (i = 0; i < VP9_I32X32_MODES - 1; ++i)
515
        cm->fc.sb_ymode_prob[i] = vp9_read_prob(r);
516

517
518
    for (j = 0; j < PARTITION_PLANES; j++)
      if (vp9_read_bit(r))
519
520
521
522
        for (i = 0; i < PARTITION_TYPES - 1; i++)
          cm->fc.partition_prob[j][i] = vp9_read_prob(r);

    read_nmvprobs(r, nmvc, xd->allow_high_precision_mv);
John Koleszar's avatar
John Koleszar committed
523
  }
Scott LaVarnway's avatar
Scott LaVarnway committed
524
}
John Koleszar's avatar
John Koleszar committed
525

526
527
528
// 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
529
530
static int read_mb_segment_id(VP9D_COMP *pbi, int mb_row, int mb_col,
                              vp9_reader *r) {
531
  VP9_COMMON *const cm = &pbi->common;
532
  MACROBLOCKD *const xd = &pbi->mb;
533
534
  MODE_INFO *const mi = xd->mode_info_context;
  MB_MODE_INFO *const mbmi = &mi->mbmi;
John Koleszar's avatar
John Koleszar committed
535

536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
  if (!xd->segmentation_enabled)
    return 0;  // Default for disabled segmentation

  if (xd->update_mb_segmentation_map) {
    int segment_id;

    if (cm->temporal_update) {
      // Temporal coding of the segment id for this mb is enabled.
      // Get the context based probability for reading the
      // prediction status flag
      const vp9_prob pred_prob = vp9_get_pred_prob(cm, xd, PRED_SEG_ID);
      const int pred_flag = vp9_read(r, pred_prob);
      vp9_set_pred_flag(xd, PRED_SEG_ID, pred_flag);

      // If the value is flagged as correctly predicted
      // then use the predicted value, otherwise decode it explicitly
      segment_id = pred_flag ? vp9_get_pred_mb_segid(cm, mbmi->sb_type,
                                                     mb_row, mb_col)
                             : read_mb_segid_except(r, cm, xd, mb_row, mb_col);
Ronald S. Bultje's avatar
Ronald S. Bultje committed
555
    } else {
556
      segment_id = read_mb_segid(r, xd);  // Normal unpredicted coding mode
557
    }
558
559
560

    set_segment_id(cm, mbmi, mb_row, mb_col, segment_id);  // Side effect
    return segment_id;
John Koleszar's avatar
John Koleszar committed
561
  } else {
562
    return vp9_get_pred_mb_segid(cm, mbmi->sb_type, mb_row, mb_col);
John Koleszar's avatar
John Koleszar committed
563
  }
564
}
565

Dmitry Kovalev's avatar
Dmitry Kovalev committed
566
567
568
569
570
571
572
573
574
575
576

static INLINE void assign_and_clamp_mv(int_mv *dst, const int_mv *src,
                                       int mb_to_left_edge,
                                       int mb_to_right_edge,
                                       int mb_to_top_edge,
                                       int mb_to_bottom_edge) {
  dst->as_int = src->as_int;
  clamp_mv(dst, mb_to_left_edge, mb_to_right_edge, mb_to_top_edge,
           mb_to_bottom_edge);
}

577
578
579
static INLINE void process_mv(vp9_reader *r, MV *mv, const MV *ref,
                              const nmv_context *nmvc,
                              nmv_context_counts *mvctx,
Dmitry Kovalev's avatar
Dmitry Kovalev committed
580
                              int usehp) {
581
582
  read_nmv(r, mv, ref, nmvc);
  read_nmv_fp(r, mv, ref, nmvc, usehp);
Dmitry Kovalev's avatar
Dmitry Kovalev committed
583
584
585
586
587
  vp9_increment_nmv(mv, ref, mvctx, usehp);
  mv->row += ref->row;
  mv->col += ref->col;
}

588
static INLINE INTERPOLATIONFILTERTYPE read_switchable_filter_type(
589
590
    VP9D_COMP *pbi, vp9_reader *r) {
  const int index = treed_read(r, vp9_switchable_interp_tree,
591
592
593
594
595
                               vp9_get_pred_probs(&pbi->common, &pbi->mb,
                                                  PRED_SWITCHABLE_INTERP));
  return vp9_switchable_interp[index];
}

596
static void read_mb_modes_mv(VP9D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi,
597
                             MODE_INFO *prev_mi,
John Koleszar's avatar
John Koleszar committed
598
                             int mb_row, int mb_col,
599
                             vp9_reader *r) {
600
  VP9_COMMON *const cm = &pbi->common;
601
602
  nmv_context *const nmvc = &cm->fc.nmvc;
  const int mis = cm->mode_info_stride;
603
  MACROBLOCKD *const xd = &pbi->mb;
John Koleszar's avatar
John Koleszar committed
604

605
606
  int_mv *const mv0 = &mbmi->mv[0];
  int_mv *const mv1 = &mbmi->mv[1];
607
608
  const int bw = 1 << mb_width_log2(mi->mbmi.sb_type);
  const int bh = 1 << mb_height_log2(mi->mbmi.sb_type);
Dmitry Kovalev's avatar
Dmitry Kovalev committed
609

610
611
  const int use_prev_in_find_mv_refs = cm->width == cm->last_width &&
                                       cm->height == cm->last_height &&
612
613
                                       !cm->error_resilient_mode &&
                                       cm->last_show_frame;
John Koleszar's avatar
John Koleszar committed
614

615
  int mb_to_left_edge, mb_to_right_edge, mb_to_top_edge, mb_to_bottom_edge;
Dmitry Kovalev's avatar
Dmitry Kovalev committed
616

John Koleszar's avatar
John Koleszar committed
617
618
  mbmi->need_to_clamp_mvs = 0;
  mbmi->need_to_clamp_secondmv = 0;
619
  mbmi->second_ref_frame = NONE;
Dmitry Kovalev's avatar
Dmitry Kovalev committed
620

621
622
623
624
625
  // Make sure the MACROBLOCKD mode info pointer is pointed at the
  // correct entry for the current macroblock.
  xd->mode_info_context = mi;
  xd->prev_mode_info_context = prev_mi;

Dmitry Kovalev's avatar
Dmitry Kovalev committed
626
627
628
  // 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
629
630
  set_mb_row(cm, xd, mb_row, bh);
  set_mb_col(cm, xd, mb_col, bw);
631

632
633
  mb_to_top_edge = xd->mb_to_top_edge - LEFT_TOP_MARGIN;
  mb_to_bottom_edge = xd->mb_to_bottom_edge + RIGHT_BOTTOM_MARGIN;
Dmitry Kovalev's avatar
Dmitry Kovalev committed
634
635
  mb_to_left_edge = xd->mb_to_left_edge - LEFT_TOP_MARGIN;
  mb_to_right_edge = xd->mb_to_right_edge + RIGHT_BOTTOM_MARGIN;
John Koleszar's avatar
John Koleszar committed
636
637

  // Read the macroblock segment id.
638
  mbmi->segment_id = read_mb_segment_id(pbi, mb_row, mb_col, r);
John Koleszar's avatar
John Koleszar committed
639

640
641
642
  mbmi->mb_skip_coeff = vp9_segfeature_active(xd, mbmi->segment_id,
                                              SEG_LVL_SKIP);
  if (!mbmi->mb_skip_coeff)
643
    mbmi->mb_skip_coeff = vp9_read(r, vp9_get_pred_prob(cm, xd, PRED_MBSKIP));
John Koleszar's avatar
John Koleszar committed
644
645

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

John Koleszar's avatar
John Koleszar committed
648
649
650
651
  // 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;
Dmitry Kovalev's avatar
Dmitry Kovalev committed
652
    vp9_prob mv_ref_p[VP9_MVREFS - 1];
John Koleszar's avatar
John Koleszar committed
653

654
655
656
    const MV_REFERENCE_FRAME ref_frame = mbmi->ref_frame;
    struct scale_factors *sf0 = &xd->scale_factor[0];
    *sf0 = cm->active_ref_scale[mbmi->ref_frame - 1];
657
658

    {
659
      // Select the appropriate reference frame for this MB
Dmitry Kovalev's avatar
Dmitry Kovalev committed
660
      const int ref_fb_idx = cm->active_ref_idx[ref_frame - 1];
661

662
663
      setup_pre_planes(xd, &cm->yv12_fb[ref_fb_idx], NULL,
                       mb_row, mb_col, xd->scale_factor, xd->scale_factor_uv);
664

665
666
667
668
669
#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
670
      vp9_find_mv_refs(cm, xd, mi, use_prev_in_find_mv_refs ? prev_mi : NULL,
Paul Wilkins's avatar
Paul Wilkins committed
671
672
                       ref_frame, mbmi->ref_mvs[ref_frame],
                       cm->ref_frame_sign_bias);
Paul Wilkins's avatar
Paul Wilkins committed
673

674
      vp9_mv_ref_probs(cm, mv_ref_p, mbmi->mb_mode_context[ref_frame]);
675

676
      // If the segment level skip mode enabled
Paul Wilkins's avatar
Paul Wilkins committed
677
678
      if (vp9_segfeature_active(xd, mbmi->segment_id, SEG_LVL_SKIP)) {
        mbmi->mode = ZEROMV;
679
      } else {
680
681
        mbmi->mode = mbmi->sb_type ? read_sb_mv_ref(r, mv_ref_p)
                                   : read_mv_ref(r, mv_ref_p);
682
        vp9_accum_mv_refs(cm, mbmi->mode, mbmi->mb_mode_context[ref_frame]);
683
684
685
686
687
688
689
      }

      if (mbmi->mode != ZEROMV) {
        vp9_find_best_ref_mvs(xd,
                              mbmi->ref_mvs[ref_frame],
                              &nearest, &nearby);

690
        best_mv.as_int = mbmi->ref_mvs[ref_frame][0].as_int;
691
      }
692

693
694
695
696
697
698
#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
699
    }
John Koleszar's avatar
John Koleszar committed
700

Dmitry Kovalev's avatar
Dmitry Kovalev committed
701
    if (mbmi->mode >= NEARESTMV && mbmi->mode <= SPLITMV) {
702
      mbmi->interp_filter = cm->mcomp_filter_type == SWITCHABLE
703
                                ? read_switchable_filter_type(pbi, r)
704
                                : cm->mcomp_filter_type;
705
    }
706

John Koleszar's avatar
John Koleszar committed
707
708
    if (cm->comp_pred_mode == COMP_PREDICTION_ONLY ||
        (cm->comp_pred_mode == HYBRID_PREDICTION &&
709
         vp9_read(r, vp9_get_pred_prob(cm, xd, PRED_COMP)))) {
John Koleszar's avatar
John Koleszar committed
710
711
712
713
714
715
716
717
718
719
      /* 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;
720
      if (mbmi->second_ref_frame > 0) {
721
722
723
724
        const MV_REFERENCE_FRAME second_ref_frame = mbmi->second_ref_frame;
        struct scale_factors *sf1 = &xd->scale_factor[1];
        const int second_ref_fb_idx = cm->active_ref_idx[second_ref_frame - 1];
        *sf1 = cm->active_ref_scale[second_ref_frame - 1];
725

726
727
        setup_pre_planes(xd, NULL, &cm->yv12_fb[second_ref_fb_idx],
                         mb_row, mb_col, xd->scale_factor, xd->scale_factor_uv);
728

729
730
731
        vp9_find_mv_refs(cm, xd, mi,
                         use_prev_in_find_mv_refs ? prev_mi : NULL,
                         second_ref_frame, mbmi->ref_mvs[second_ref_frame],
Paul Wilkins's avatar
Paul Wilkins committed
732
                         cm->ref_frame_sign_bias);
Paul Wilkins's avatar
Paul Wilkins committed
733

734
735
        if (mbmi->mode != ZEROMV) {
          vp9_find_best_ref_mvs(xd,
736
                                mbmi->ref_mvs[second_ref_frame],
737
738
                                &nearest_second,
                                &nearby_second);
739
          best_mv_second.as_int = mbmi->ref_mvs[second_ref_frame][0].as_int;
740
        }
741
      }
Yaowu Xu's avatar
Yaowu Xu committed
742

John Koleszar's avatar
John Koleszar committed
743
    } else {
744
745
746
747
#if CONFIG_COMP_INTERINTRA_PRED
      if (pbi->common.use_interintra &&
          mbmi->mode >= NEARESTMV && mbmi->mode < SPLITMV &&
          mbmi->second_ref_frame == NONE) {
748
        mbmi->second_ref_frame = (vp9_read(r, pbi->common.fc.interintra_prob) ?
749
750
751
752
753
754
                                  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) {
755
          mbmi->interintra_mode = read_ymode(r, pbi->common.fc.ymode_prob);
756
757
          pbi->common.fc.ymode_counts[mbmi->interintra_mode]++;
#if SEPARATE_INTERINTRA_UV
758
          mbmi->interintra_uv_mode = read_uv_mode(r,
Dmitry Kovalev's avatar
Dmitry Kovalev committed
759
              pbi->common.fc.uv_mode_prob[mbmi->interintra_mode]);
760
761
762
763
764
765
766
767
768
769
          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
770
    }
771

John Koleszar's avatar
John Koleszar committed
772
773
774
    mbmi->uv_mode = DC_PRED;
    switch (mbmi->mode) {
      case SPLITMV: {
775
        const int s = treed_read(r, vp9_mbsplit_tree, cm->fc.mbsplit_prob);
776
        const int num_p = vp9_mbsplit_count[s];
John Koleszar's avatar
John Koleszar committed
777
        int j = 0;
John Koleszar's avatar
John Koleszar committed
778

779
        cm->fc.mbsplit_counts[s]++;
John Koleszar's avatar
John Koleszar committed
780
        mbmi->need_to_clamp_mvs = 0;
781
        mbmi->partitioning = s;
Dmitry Kovalev's avatar
Dmitry Kovalev committed
782
        do {  // for each subset j
John Koleszar's avatar
John Koleszar committed
783
784
785
786
          int_mv leftmv, abovemv, second_leftmv, second_abovemv;
          int_mv blockmv, secondmv;
          int mv_contz;
          int blockmode;
Dmitry Kovalev's avatar
Dmitry Kovalev committed
787
          int k = vp9_mbsplit_offset[s][j];  // first block in subset j
John Koleszar's avatar
John Koleszar committed
788

789
          leftmv.as_int = left_block_mv(xd, mi, k);
John Koleszar's avatar
John Koleszar committed
790
          abovemv.as_int = above_block_mv(mi, k, mis);
791
792
          second_leftmv.as_int = 0;
          second_abovemv.as_int = 0;
793
          if (mbmi->second_ref_frame > 0) {
794
            second_leftmv.as_int = left_block_second_mv(xd, mi, k);
John Koleszar's avatar
John Koleszar committed
795
796
            second_abovemv.as_int = above_block_second_mv(mi, k, mis);
          }
797
          mv_contz = vp9_mv_cont(&leftmv, &abovemv);
798
          blockmode = read_sub_mv_ref(r, cm->fc.sub_mv_ref_prob[mv_contz]);
John Koleszar's avatar
John Koleszar committed
799
          cm->fc.sub_mv_ref_counts[mv_contz][blockmode - LEFT4X4]++;
John Koleszar's avatar
John Koleszar committed
800

John Koleszar's avatar
John Koleszar committed
801
802
          switch (blockmode) {
            case NEW4X4:
803
              process_mv(r, &blockmv.as_mv, &best_mv.as_mv, nmvc,
Dmitry Kovalev's avatar
Dmitry Kovalev committed
804
805
806
                         &cm->fc.NMVcount, xd->allow_high_precision_mv);

              if (mbmi->second_ref_frame > 0)
807
                process_mv(r, &secondmv.as_mv, &best_mv_second.as_mv, nmvc,
Dmitry Kovalev's avatar
Dmitry Kovalev committed
808
809
                           &cm->fc.NMVcount, xd->allow_high_precision_mv);

810
#ifdef VPX_MODE_COUNT
811
              vp9_mv_cont_count[mv_contz][3]++;
812
#endif
John Koleszar's avatar
John Koleszar committed
813
814
815
              break;
            case LEFT4X4:
              blockmv.as_int = leftmv.as_int;
816
              if (mbmi->second_ref_frame > 0)
John Koleszar's avatar
John Koleszar committed
817
                secondmv.as_int = second_leftmv.as_int;
818
#ifdef VPX_MODE_COUNT
819
              vp9_mv_cont_count[mv_contz][0]++;
820
#endif
John Koleszar's avatar
John Koleszar committed
821
822
823
              break;
            case ABOVE4X4:
              blockmv.as_int = abovemv.as_int;
824
              if (mbmi->second_ref_frame > 0)
John Koleszar's avatar
John Koleszar committed
825
                secondmv.as_int = second_abovemv.as_int;
826
#ifdef VPX_MODE_COUNT
827
              vp9_mv_cont_count[mv_contz][1]++;
828
#endif
John Koleszar's avatar
John Koleszar committed
829
830
831
              break;
            case ZERO4X4:
              blockmv.as_int = 0;
832
              if (mbmi->second_ref_frame > 0)
John Koleszar's avatar
John Koleszar committed
833
                secondmv.as_int = 0;
834
#ifdef VPX_MODE_COUNT
835
              vp9_mv_cont_count[mv_contz][2]++;
836
#endif
John Koleszar's avatar
John Koleszar committed
837
838
839
840
841
              break;
            default:
              break;
          }

842
843
844
          /*  Commenting this section out, not sure why this was needed, and
           *  there are mismatches with this section in rare cases since it is
           *  not done in the encoder at all.
845
846
847
848
849
          mbmi->need_to_clamp_mvs |= check_mv_bounds(&blockmv,
                                                     mb_to_left_edge,
                                                     mb_to_right_edge,
                                                     mb_to_top_edge,
                                                     mb_to_bottom_edge);
850
          if (mbmi->second_ref_frame > 0) {
851
852
853
854
855
            mbmi->need_to_clamp_mvs |= check_mv_bounds(&secondmv,
                                                       mb_to_left_edge,
                                                       mb_to_right_edge,
                                                       mb_to_top_edge,
                                                       mb_to_bottom_edge);
John Koleszar's avatar
John Koleszar committed
856
          }
857
          */
John Koleszar's avatar
John Koleszar committed
858
859
860
861
862
863

          {
            /* Fill (uniform) modes, mvs of jth subset.
             Must do it here because ensuing subsets can
             refer back to us via "left" or "above". */