vp9_bitstream.c 71.1 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/common/vp9_header.h"
13
#include "vp9/encoder/vp9_encodemv.h"
14
15
#include "vp9/common/vp9_entropymode.h"
#include "vp9/common/vp9_findnearmv.h"
16
#include "vp9/encoder/vp9_mcomp.h"
17
#include "vp9/common/vp9_systemdependent.h"
John Koleszar's avatar
John Koleszar committed
18
19
#include <assert.h>
#include <stdio.h>
20
#include <limits.h>
21
#include "vp9/common/vp9_pragmas.h"
22
#include "vpx/vpx_encoder.h"
John Koleszar's avatar
John Koleszar committed
23
#include "vpx_mem/vpx_mem.h"
24
25
#include "vp9/encoder/vp9_bitstream.h"
#include "vp9/encoder/vp9_segmentation.h"
26

27
28
29
30
31
32
#include "vp9/common/vp9_seg_common.h"
#include "vp9/common/vp9_pred_common.h"
#include "vp9/common/vp9_entropy.h"
#include "vp9/encoder/vp9_encodemv.h"
#include "vp9/common/vp9_entropymv.h"
#include "vp9/common/vp9_mvref_common.h"
33
#include "vp9/common/vp9_treecoder.h"
Paul Wilkins's avatar
Paul Wilkins committed
34

John Koleszar's avatar
John Koleszar committed
35
36
37
38
39
#if defined(SECTIONBITS_OUTPUT)
unsigned __int64 Sectionbits[500];
#endif

#ifdef ENTROPY_STATS
40
41
42
int intra_mode_stats[VP9_KF_BINTRAMODES]
                    [VP9_KF_BINTRAMODES]
                    [VP9_KF_BINTRAMODES];
43
44
45
46
47
48
49
vp9_coeff_stats tree_update_hist_4x4[BLOCK_TYPES_4X4];
vp9_coeff_stats hybrid_tree_update_hist_4x4[BLOCK_TYPES_4X4];
vp9_coeff_stats tree_update_hist_8x8[BLOCK_TYPES_8X8];
vp9_coeff_stats hybrid_tree_update_hist_8x8[BLOCK_TYPES_8X8];
vp9_coeff_stats tree_update_hist_16x16[BLOCK_TYPES_16X16];
vp9_coeff_stats hybrid_tree_update_hist_16x16[BLOCK_TYPES_16X16];
vp9_coeff_stats tree_update_hist_32x32[BLOCK_TYPES_32X32];
50

John Koleszar's avatar
John Koleszar committed
51
52
53
54
55
56
57
extern unsigned int active_section;
#endif

#ifdef MODE_STATS
int count_mb_seg[4] = { 0, 0, 0, 0 };
#endif

58
59
#define vp9_cost_upd  ((int)(vp9_cost_one(upd) - vp9_cost_zero(upd)) >> 8)
#define vp9_cost_upd256  ((int)(vp9_cost_one(upd) - vp9_cost_zero(upd)))
60
61
62
63

#define SEARCH_NEWP
static int update_bits[255];

John Koleszar's avatar
John Koleszar committed
64
65
66
static void compute_update_table() {
  int i;
  for (i = 0; i < 255; i++)
67
    update_bits[i] = vp9_count_term_subexp(i, SUBEXP_PARAM, 255);
68
69
}

John Koleszar's avatar
John Koleszar committed
70
71
72
73
74
static int split_index(int i, int n, int modulus) {
  int max1 = (n - 1 - modulus / 2) / modulus + 1;
  if (i % modulus == modulus / 2) i = i / modulus;
  else i = max1 + i - (i + modulus - modulus / 2) / modulus;
  return i;
75
76
}

John Koleszar's avatar
John Koleszar committed
77
78
79
80
81
static int remap_prob(int v, int m) {
  const int n = 256;
  const int modulus = MODULUS_PARAM;
  int i;
  if ((m << 1) <= n)
82
    i = vp9_recenter_nonneg(v, m) - 1;
John Koleszar's avatar
John Koleszar committed
83
  else
84
    i = vp9_recenter_nonneg(n - 1 - v, n - 1 - m) - 1;
John Koleszar's avatar
John Koleszar committed
85
86
87

  i = split_index(i, n - 1, modulus);
  return i;
88
}
89

90
91
static void write_prob_diff_update(vp9_writer *const bc,
                                   vp9_prob newp, vp9_prob oldp) {
John Koleszar's avatar
John Koleszar committed
92
  int delp = remap_prob(newp, oldp);
93
  vp9_encode_term_subexp(bc, delp, SUBEXP_PARAM, 255);
94
95
}

96
static int prob_diff_update_cost(vp9_prob newp, vp9_prob oldp) {
John Koleszar's avatar
John Koleszar committed
97
98
  int delp = remap_prob(newp, oldp);
  return update_bits[delp] * 256;
99
}
100

John Koleszar's avatar
John Koleszar committed
101
static void update_mode(
102
  vp9_writer *const bc,
John Koleszar's avatar
John Koleszar committed
103
  int n,
104
105
106
107
  vp9_token tok               [/* n */],
  vp9_tree tree,
  vp9_prob Pnew               [/* n-1 */],
  vp9_prob Pcur               [/* n-1 */],
John Koleszar's avatar
John Koleszar committed
108
109
110
111
112
113
  unsigned int bct            [/* n-1 */] [2],
  const unsigned int num_events[/* n */]
) {
  unsigned int new_b = 0, old_b = 0;
  int i = 0;

114
115
  vp9_tree_probs_from_distribution(n--, tok, tree,
                                   Pnew, bct, num_events);
John Koleszar's avatar
John Koleszar committed
116
117

  do {
118
119
    new_b += cost_branch(bct[i], Pnew[i]);
    old_b += cost_branch(bct[i], Pcur[i]);
John Koleszar's avatar
John Koleszar committed
120
121
122
  } while (++i < n);

  if (new_b + (n << 8) < old_b) {
John Koleszar's avatar
John Koleszar committed
123
124
    int i = 0;

125
    vp9_write_bit(bc, 1);
John Koleszar's avatar
John Koleszar committed
126

John Koleszar's avatar
John Koleszar committed
127
    do {
128
      const vp9_prob p = Pnew[i];
John Koleszar's avatar
John Koleszar committed
129

130
      vp9_write_literal(bc, Pcur[i] = p ? p : 1, 8);
John Koleszar's avatar
John Koleszar committed
131
132
    } while (++i < n);
  } else
133
    vp9_write_bit(bc, 0);
John Koleszar's avatar
John Koleszar committed
134
135
}

136
static void update_mbintra_mode_probs(VP9_COMP* const cpi,
137
                                      vp9_writer* const bc) {
138
  VP9_COMMON *const cm = &cpi->common;
John Koleszar's avatar
John Koleszar committed
139

John Koleszar's avatar
John Koleszar committed
140
  {
141
142
    vp9_prob Pnew   [VP9_YMODES - 1];
    unsigned int bct [VP9_YMODES - 1] [2];
John Koleszar's avatar
John Koleszar committed
143

John Koleszar's avatar
John Koleszar committed
144
    update_mode(
145
      bc, VP9_YMODES, vp9_ymode_encodings, vp9_ymode_tree,
Paul Wilkins's avatar
Paul Wilkins committed
146
      Pnew, cm->fc.ymode_prob, bct, (unsigned int *)cpi->ymode_count
John Koleszar's avatar
John Koleszar committed
147
    );
148
149
150
151
152
#if CONFIG_SUPERBLOCKS
    update_mode(bc, VP9_I32X32_MODES, vp9_sb_ymode_encodings,
                vp9_sb_ymode_tree, Pnew, cm->fc.sb_ymode_prob, bct,
                (unsigned int *)cpi->sb_ymode_count);
#endif
John Koleszar's avatar
John Koleszar committed
153
  }
John Koleszar's avatar
John Koleszar committed
154
155
}

156
157
void vp9_update_skip_probs(VP9_COMP *cpi) {
  VP9_COMMON *const pc = &cpi->common;
John Koleszar's avatar
John Koleszar committed
158
  int k;
Paul Wilkins's avatar
Paul Wilkins committed
159

John Koleszar's avatar
John Koleszar committed
160
  for (k = 0; k < MBSKIP_CONTEXTS; ++k) {
John Koleszar's avatar
John Koleszar committed
161
162
    pc->mbskip_pred_probs[k] = get_binary_prob(cpi->skip_false_count[k],
                                               cpi->skip_true_count[k]);
John Koleszar's avatar
John Koleszar committed
163
  }
Paul Wilkins's avatar
Paul Wilkins committed
164
165
}

166
static void update_switchable_interp_probs(VP9_COMP *cpi,
167
                                           vp9_writer* const bc) {
168
  VP9_COMMON *const pc = &cpi->common;
169
170
  unsigned int branch_ct[32][2];
  int i, j;
171
  for (j = 0; j <= VP9_SWITCHABLE_FILTERS; ++j) {
172
    vp9_tree_probs_from_distribution(
173
        VP9_SWITCHABLE_FILTERS,
174
        vp9_switchable_interp_encodings, vp9_switchable_interp_tree,
175
        pc->fc.switchable_interp_prob[j], branch_ct,
176
        cpi->switchable_interp_count[j]);
177
    for (i = 0; i < VP9_SWITCHABLE_FILTERS - 1; ++i) {
178
179
      if (pc->fc.switchable_interp_prob[j][i] < 1)
        pc->fc.switchable_interp_prob[j][i] = 1;
180
      vp9_write_literal(bc, pc->fc.switchable_interp_prob[j][i], 8);
181
182
183
184
    }
  }
}

185
// This function updates the reference frame prediction stats
186
187
static void update_refpred_stats(VP9_COMP *cpi) {
  VP9_COMMON *const cm = &cpi->common;
John Koleszar's avatar
John Koleszar committed
188
  int i;
189
  vp9_prob new_pred_probs[PREDICTION_PROBS];
John Koleszar's avatar
John Koleszar committed
190
191
192
193
194
195
196
197
198
199
200
201
202
203
  int old_cost, new_cost;

  // Set the prediction probability structures to defaults
  if (cm->frame_type == KEY_FRAME) {
    // Set the prediction probabilities to defaults
    cm->ref_pred_probs[0] = 120;
    cm->ref_pred_probs[1] = 80;
    cm->ref_pred_probs[2] = 40;

    vpx_memset(cpi->ref_pred_probs_update, 0,
               sizeof(cpi->ref_pred_probs_update));
  } else {
    // From the prediction counts set the probabilities for each context
    for (i = 0; i < PREDICTION_PROBS; i++) {
John Koleszar's avatar
John Koleszar committed
204
205
      new_pred_probs[i] = get_binary_prob(cpi->ref_pred_count[i][0],
                                          cpi->ref_pred_count[i][1]);
John Koleszar's avatar
John Koleszar committed
206
207
208
209

      // Decide whether or not to update the reference frame probs.
      // Returned costs are in 1/256 bit units.
      old_cost =
210
211
        (cpi->ref_pred_count[i][0] * vp9_cost_zero(cm->ref_pred_probs[i])) +
        (cpi->ref_pred_count[i][1] * vp9_cost_one(cm->ref_pred_probs[i]));
John Koleszar's avatar
John Koleszar committed
212
213

      new_cost =
214
215
        (cpi->ref_pred_count[i][0] * vp9_cost_zero(new_pred_probs[i])) +
        (cpi->ref_pred_count[i][1] * vp9_cost_one(new_pred_probs[i]));
John Koleszar's avatar
John Koleszar committed
216
217
218
219
220
221
222

      // Cost saving must be >= 8 bits (2048 in these units)
      if ((old_cost - new_cost) >= 2048) {
        cpi->ref_pred_probs_update[i] = 1;
        cm->ref_pred_probs[i] = new_pred_probs[i];
      } else
        cpi->ref_pred_probs_update[i] = 0;
223
224

    }
John Koleszar's avatar
John Koleszar committed
225
  }
226
227
}

228
229
230
231
232
233
// This function is called to update the mode probability context used to encode
// inter modes. It assumes the branch counts table has already been populated
// prior to the actual packing of the bitstream (in rd stage or dummy pack)
//
// The branch counts table is re-populated during the actual pack stage and in
// the decoder to facilitate backwards update of the context.
Jim Bankoski's avatar
Jim Bankoski committed
234
235
static void update_mode_probs(VP9_COMMON *cm,
                              int mode_context[INTER_MODE_CONTEXTS][4]) {
236
  int i, j;
Jim Bankoski's avatar
Jim Bankoski committed
237
  unsigned int (*mv_ref_ct)[4][2];
238
239
240
241
242
243
244
245

  vpx_memcpy(mode_context, cm->fc.vp9_mode_contexts,
             sizeof(cm->fc.vp9_mode_contexts));

  mv_ref_ct = cm->fc.mv_ref_ct;

  for (i = 0; i < INTER_MODE_CONTEXTS; i++) {
    for (j = 0; j < 4; j++) {
246
      int new_prob, old_cost, new_cost;
247
248
249

      // Work out cost of coding branches with the old and optimal probability
      old_cost = cost_branch256(mv_ref_ct[i][j], mode_context[i][j]);
250
      new_prob = get_binary_prob(mv_ref_ct[i][j][0], mv_ref_ct[i][j][1]);
251
252
253
254
255
256
257
258
259
260
261
      new_cost = cost_branch256(mv_ref_ct[i][j], new_prob);

      // If cost saving is >= 14 bits then update the mode probability.
      // This is the approximate net cost of updating one probability given
      // that the no update case ismuch more common than the update case.
      if (new_cost <= (old_cost - (14 << 8))) {
        mode_context[i][j] = new_prob;
      }
    }
  }
}
262
263
static void write_ymode(vp9_writer *bc, int m, const vp9_prob *p) {
  write_token(bc, vp9_ymode_tree, p, vp9_ymode_encodings + m);
John Koleszar's avatar
John Koleszar committed
264
265
}

266
267
static void kfwrite_ymode(vp9_writer *bc, int m, const vp9_prob *p) {
  write_token(bc, vp9_kf_ymode_tree, p, vp9_kf_ymode_encodings + m);
John Koleszar's avatar
John Koleszar committed
268
269
}

Ronald S. Bultje's avatar
Ronald S. Bultje committed
270
#if CONFIG_SUPERBLOCKS
271
272
273
274
static void write_sb_ymode(vp9_writer *bc, int m, const vp9_prob *p) {
  write_token(bc, vp9_sb_ymode_tree, p, vp9_sb_ymode_encodings + m);
}

275
276
static void sb_kfwrite_ymode(vp9_writer *bc, int m, const vp9_prob *p) {
  write_token(bc, vp9_uv_mode_tree, p, vp9_sb_kf_ymode_encodings + m);
Ronald S. Bultje's avatar
Ronald S. Bultje committed
277
278
279
}
#endif

280
281
static void write_i8x8_mode(vp9_writer *bc, int m, const vp9_prob *p) {
  write_token(bc, vp9_i8x8_mode_tree, p, vp9_i8x8_mode_encodings + m);
Yaowu Xu's avatar
Yaowu Xu committed
282
}
Yaowu Xu's avatar
Yaowu Xu committed
283

284
285
static void write_uv_mode(vp9_writer *bc, int m, const vp9_prob *p) {
  write_token(bc, vp9_uv_mode_tree, p, vp9_uv_mode_encodings + m);
John Koleszar's avatar
John Koleszar committed
286
287
288
}


289
static void write_bmode(vp9_writer *bc, int m, const vp9_prob *p) {
290
291
292
293
#if CONFIG_NEWBINTRAMODES
  assert(m < B_CONTEXT_PRED - CONTEXT_PRED_REPLACEMENTS || m == B_CONTEXT_PRED);
  if (m == B_CONTEXT_PRED) m -= CONTEXT_PRED_REPLACEMENTS;
#endif
294
  write_token(bc, vp9_bmode_tree, p, vp9_bmode_encodings + m);
John Koleszar's avatar
John Koleszar committed
295
296
}

297
298
299
300
static void write_kf_bmode(vp9_writer *bc, int m, const vp9_prob *p) {
  write_token(bc, vp9_kf_bmode_tree, p, vp9_kf_bmode_encodings + m);
}

301
static void write_split(vp9_writer *bc, int x, const vp9_prob *p) {
302
303
  write_token(
    bc, vp9_mbsplit_tree, p, vp9_mbsplit_encodings + x);
John Koleszar's avatar
John Koleszar committed
304
305
}

306
static int prob_update_savings(const unsigned int *ct,
307
308
309
310
311
                               const vp9_prob oldp, const vp9_prob newp,
                               const vp9_prob upd) {
  const int old_b = cost_branch256(ct, oldp);
  const int new_b = cost_branch256(ct, newp);
  const int update_b = 2048 + vp9_cost_upd256;
John Koleszar's avatar
John Koleszar committed
312
  return (old_b - new_b - update_b);
313
314
}

315
static int prob_diff_update_savings(const unsigned int *ct,
316
317
318
319
                                    const vp9_prob oldp, const vp9_prob newp,
                                    const vp9_prob upd) {
  const int old_b = cost_branch256(ct, oldp);
  const int new_b = cost_branch256(ct, newp);
John Koleszar's avatar
John Koleszar committed
320
  const int update_b = (newp == oldp ? 0 :
321
                        prob_diff_update_cost(newp, oldp) + vp9_cost_upd256);
John Koleszar's avatar
John Koleszar committed
322
  return (old_b - new_b - update_b);
323
324
325
}

static int prob_diff_update_savings_search(const unsigned int *ct,
326
327
328
                                           const vp9_prob oldp, vp9_prob *bestp,
                                           const vp9_prob upd) {
  const int old_b = cost_branch256(ct, oldp);
John Koleszar's avatar
John Koleszar committed
329
  int new_b, update_b, savings, bestsavings, step;
330
  vp9_prob newp, bestnewp;
John Koleszar's avatar
John Koleszar committed
331
332
333
334
335
336

  bestsavings = 0;
  bestnewp = oldp;

  step = (*bestp > oldp ? -1 : 1);
  for (newp = *bestp; newp != oldp; newp += step) {
337
338
    new_b = cost_branch256(ct, newp);
    update_b = prob_diff_update_cost(newp, oldp) + vp9_cost_upd256;
John Koleszar's avatar
John Koleszar committed
339
340
341
342
    savings = old_b - new_b - update_b;
    if (savings > bestsavings) {
      bestsavings = savings;
      bestnewp = newp;
343
    }
John Koleszar's avatar
John Koleszar committed
344
345
346
  }
  *bestp = bestnewp;
  return bestsavings;
347
348
}

349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
static void vp9_cond_prob_update(vp9_writer *bc, vp9_prob *oldp, vp9_prob upd,
                                 unsigned int *ct) {
  vp9_prob newp;
  int savings;
  newp = get_binary_prob(ct[0], ct[1]);
  savings = prob_update_savings(ct, *oldp, newp, upd);
  if (savings > 0) {
    vp9_write(bc, 1, upd);
    vp9_write_literal(bc, newp, 8);
    *oldp = newp;
  } else {
    vp9_write(bc, 0, upd);
  }
}

364
static void pack_mb_tokens(vp9_writer* const bc,
365
366
367
                           TOKENEXTRA **tp,
                           const TOKENEXTRA *const stop) {
  TOKENEXTRA *p = *tp;
John Koleszar's avatar
John Koleszar committed
368

John Koleszar's avatar
John Koleszar committed
369
370
  while (p < stop) {
    const int t = p->Token;
371
372
    vp9_token *const a = vp9_coef_encodings + t;
    const vp9_extra_bit_struct *const b = vp9_extra_bits + t;
John Koleszar's avatar
John Koleszar committed
373
374
375
376
377
    int i = 0;
    const unsigned char *pp = p->context_tree;
    int v = a->value;
    int n = a->Len;

378
379
380
381
382
383
    if (t == EOSB_TOKEN)
    {
      ++p;
      break;
    }

John Koleszar's avatar
John Koleszar committed
384
385
386
387
388
    /* skip one or two nodes */
    if (p->skip_eob_node) {
      n -= p->skip_eob_node;
      i = 2 * p->skip_eob_node;
    }
John Koleszar's avatar
John Koleszar committed
389

John Koleszar's avatar
John Koleszar committed
390
391
    do {
      const int bb = (v >> --n) & 1;
392
      encode_bool(bc, bb, pp[i >> 1]);
393
      i = vp9_coef_tree[i + bb];
John Koleszar's avatar
John Koleszar committed
394
    } while (n);
John Koleszar's avatar
John Koleszar committed
395
396


John Koleszar's avatar
John Koleszar committed
397
398
    if (b->base_val) {
      const int e = p->Extra, L = b->Len;
John Koleszar's avatar
John Koleszar committed
399

John Koleszar's avatar
John Koleszar committed
400
401
402
403
404
      if (L) {
        const unsigned char *pp = b->prob;
        int v = e >> 1;
        int n = L;              /* number of bits in v, assumed nonzero */
        int i = 0;
John Koleszar's avatar
John Koleszar committed
405

John Koleszar's avatar
John Koleszar committed
406
407
        do {
          const int bb = (v >> --n) & 1;
408
          encode_bool(bc, bb, pp[i >> 1]);
John Koleszar's avatar
John Koleszar committed
409
410
411
          i = b->tree[i + bb];
        } while (n);
      }
John Koleszar's avatar
John Koleszar committed
412

413
      encode_bool(bc, e & 1, 128);
John Koleszar's avatar
John Koleszar committed
414
    }
John Koleszar's avatar
John Koleszar committed
415
416
417
    ++p;
  }

418
  *tp = p;
John Koleszar's avatar
John Koleszar committed
419
420
}

John Koleszar's avatar
John Koleszar committed
421
422
static void write_partition_size(unsigned char *cx_data, int size) {
  signed char csize;
John Koleszar's avatar
John Koleszar committed
423

John Koleszar's avatar
John Koleszar committed
424
425
426
427
428
429
  csize = size & 0xff;
  *cx_data = csize;
  csize = (size >> 8) & 0xff;
  *(cx_data + 1) = csize;
  csize = (size >> 16) & 0xff;
  *(cx_data + 2) = csize;
John Koleszar's avatar
John Koleszar committed
430
431
432
433
434

}

static void write_mv_ref
(
435
  vp9_writer *bc, MB_PREDICTION_MODE m, const vp9_prob *p
John Koleszar's avatar
John Koleszar committed
436
) {
437
#if CONFIG_DEBUG
John Koleszar's avatar
John Koleszar committed
438
  assert(NEARESTMV <= m  &&  m <= SPLITMV);
439
#endif
440
441
  write_token(bc, vp9_mv_ref_tree, p,
              vp9_mv_ref_encoding_array - NEARESTMV + m);
John Koleszar's avatar
John Koleszar committed
442
443
}

Ronald S. Bultje's avatar
Ronald S. Bultje committed
444
#if CONFIG_SUPERBLOCKS
445
446
static void write_sb_mv_ref(vp9_writer *bc, MB_PREDICTION_MODE m,
                            const vp9_prob *p) {
Ronald S. Bultje's avatar
Ronald S. Bultje committed
447
448
449
#if CONFIG_DEBUG
  assert(NEARESTMV <= m  &&  m < SPLITMV);
#endif
450
451
  write_token(bc, vp9_sb_mv_ref_tree, p,
              vp9_sb_mv_ref_encoding_array - NEARESTMV + m);
Ronald S. Bultje's avatar
Ronald S. Bultje committed
452
453
454
}
#endif

John Koleszar's avatar
John Koleszar committed
455
456
static void write_sub_mv_ref
(
457
  vp9_writer *bc, B_PREDICTION_MODE m, const vp9_prob *p
John Koleszar's avatar
John Koleszar committed
458
) {
459
#if CONFIG_DEBUG
John Koleszar's avatar
John Koleszar committed
460
  assert(LEFT4X4 <= m  &&  m <= NEW4X4);
461
#endif
462
463
  write_token(bc, vp9_sub_mv_ref_tree, p,
              vp9_sub_mv_ref_encoding_array - LEFT4X4 + m);
John Koleszar's avatar
John Koleszar committed
464
465
}

466
static void write_nmv(vp9_writer *bc, const MV *mv, const int_mv *ref,
John Koleszar's avatar
John Koleszar committed
467
                      const nmv_context *nmvc, int usehp) {
468
469
470
471
  MV e;
  e.row = mv->row - ref->as_mv.row;
  e.col = mv->col - ref->as_mv.col;

472
473
  vp9_encode_nmv(bc, &e, &ref->as_mv, nmvc);
  vp9_encode_nmv_fp(bc, &e, &ref->as_mv, nmvc, usehp);
474
475
}

476
#if CONFIG_NEW_MVREF
477
478
static void vp9_write_mv_ref_id(vp9_writer *w,
                                vp9_prob * ref_id_probs,
479
480
481
482
                                int mv_ref_id) {
  // Encode the index for the MV reference.
  switch (mv_ref_id) {
    case 0:
483
      vp9_write(w, 0, ref_id_probs[0]);
484
485
      break;
    case 1:
486
487
      vp9_write(w, 1, ref_id_probs[0]);
      vp9_write(w, 0, ref_id_probs[1]);
488
489
      break;
    case 2:
490
491
492
      vp9_write(w, 1, ref_id_probs[0]);
      vp9_write(w, 1, ref_id_probs[1]);
      vp9_write(w, 0, ref_id_probs[2]);
493
494
      break;
    case 3:
495
496
497
      vp9_write(w, 1, ref_id_probs[0]);
      vp9_write(w, 1, ref_id_probs[1]);
      vp9_write(w, 1, ref_id_probs[2]);
498
499
500
501
502
503
504
505
506
507
      break;

      // TRAP.. This should not happen
    default:
      assert(0);
      break;
  }
}
#endif

Paul Wilkins's avatar
Paul Wilkins committed
508
509
// This function writes the current macro block's segnment id to the bitstream
// It should only be called if a segment map update is indicated.
510
static void write_mb_segid(vp9_writer *bc,
Paul Wilkins's avatar
Paul Wilkins committed
511
                           const MB_MODE_INFO *mi, const MACROBLOCKD *xd) {
John Koleszar's avatar
John Koleszar committed
512
  // Encode the MB segment id.
Ronald S. Bultje's avatar
Ronald S. Bultje committed
513
514
515
  int seg_id = mi->segment_id;
#if CONFIG_SUPERBLOCKS
  if (mi->encoded_as_sb) {
516
    if (xd->mb_to_right_edge >= 0)
Ronald S. Bultje's avatar
Ronald S. Bultje committed
517
      seg_id = seg_id && xd->mode_info_context[1].mbmi.segment_id;
518
    if (xd->mb_to_bottom_edge >= 0) {
Ronald S. Bultje's avatar
Ronald S. Bultje committed
519
520
      seg_id = seg_id &&
               xd->mode_info_context[xd->mode_info_stride].mbmi.segment_id;
521
      if (xd->mb_to_right_edge >= 0)
Ronald S. Bultje's avatar
Ronald S. Bultje committed
522
523
524
525
526
        seg_id = seg_id &&
                xd->mode_info_context[xd->mode_info_stride + 1].mbmi.segment_id;
    }
  }
#endif
Paul Wilkins's avatar
Paul Wilkins committed
527
  if (xd->segmentation_enabled && xd->update_mb_segmentation_map) {
Ronald S. Bultje's avatar
Ronald S. Bultje committed
528
    switch (seg_id) {
John Koleszar's avatar
John Koleszar committed
529
      case 0:
530
531
        vp9_write(bc, 0, xd->mb_segment_tree_probs[0]);
        vp9_write(bc, 0, xd->mb_segment_tree_probs[1]);
John Koleszar's avatar
John Koleszar committed
532
533
        break;
      case 1:
534
535
        vp9_write(bc, 0, xd->mb_segment_tree_probs[0]);
        vp9_write(bc, 1, xd->mb_segment_tree_probs[1]);
John Koleszar's avatar
John Koleszar committed
536
537
        break;
      case 2:
538
539
        vp9_write(bc, 1, xd->mb_segment_tree_probs[0]);
        vp9_write(bc, 0, xd->mb_segment_tree_probs[2]);
John Koleszar's avatar
John Koleszar committed
540
541
        break;
      case 3:
542
543
        vp9_write(bc, 1, xd->mb_segment_tree_probs[0]);
        vp9_write(bc, 1, xd->mb_segment_tree_probs[2]);
John Koleszar's avatar
John Koleszar committed
544
545
546
547
        break;

        // TRAP.. This should not happen
      default:
548
549
        vp9_write(bc, 0, xd->mb_segment_tree_probs[0]);
        vp9_write(bc, 0, xd->mb_segment_tree_probs[1]);
John Koleszar's avatar
John Koleszar committed
550
        break;
John Koleszar's avatar
John Koleszar committed
551
    }
John Koleszar's avatar
John Koleszar committed
552
  }
John Koleszar's avatar
John Koleszar committed
553
554
}

Paul Wilkins's avatar
Paul Wilkins committed
555
// This function encodes the reference frame
556
static void encode_ref_frame(vp9_writer *const bc,
557
                             VP9_COMMON *const cm,
John Koleszar's avatar
John Koleszar committed
558
559
560
561
562
                             MACROBLOCKD *xd,
                             int segment_id,
                             MV_REFERENCE_FRAME rf) {
  int seg_ref_active;
  int seg_ref_count = 0;
563
564
565
  seg_ref_active = vp9_segfeature_active(xd,
                                         segment_id,
                                         SEG_LVL_REF_FRAME);
John Koleszar's avatar
John Koleszar committed
566
567

  if (seg_ref_active) {
568
569
570
571
    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
572
573
574
575
576
577
578
  }

  // If segment level coding of this signal is disabled...
  // or the segment allows multiple reference frame options
  if (!seg_ref_active || (seg_ref_count > 1)) {
    // Values used in prediction model coding
    unsigned char prediction_flag;
579
    vp9_prob pred_prob;
John Koleszar's avatar
John Koleszar committed
580
581
582
    MV_REFERENCE_FRAME pred_rf;

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

    // Get the predicted value.
Paul Wilkins's avatar
Paul Wilkins committed
586
    pred_rf = vp9_get_pred_ref(cm, xd);
John Koleszar's avatar
John Koleszar committed
587
588
589
590
591

    // Did the chosen reference frame match its predicted value.
    prediction_flag =
      (xd->mode_info_context->mbmi.ref_frame == pred_rf);

Paul Wilkins's avatar
Paul Wilkins committed
592
    vp9_set_pred_flag(xd, PRED_REF, prediction_flag);
593
    vp9_write(bc, prediction_flag, pred_prob);
John Koleszar's avatar
John Koleszar committed
594
595
596

    // If not predicted correctly then code value explicitly
    if (!prediction_flag) {
597
      vp9_prob mod_refprobs[PREDICTION_PROBS];
John Koleszar's avatar
John Koleszar committed
598
599
600
601
602
603
604
605

      vpx_memcpy(mod_refprobs,
                 cm->mod_refprobs[pred_rf], 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] *=
606
          vp9_check_segref(xd, segment_id, INTRA_FRAME);
John Koleszar's avatar
John Koleszar committed
607
        mod_refprobs[LAST_FRAME] *=
608
          vp9_check_segref(xd, segment_id, LAST_FRAME);
John Koleszar's avatar
John Koleszar committed
609
        mod_refprobs[GOLDEN_FRAME] *=
610
611
          (vp9_check_segref(xd, segment_id, GOLDEN_FRAME) *
           vp9_check_segref(xd, segment_id, ALTREF_FRAME));
John Koleszar's avatar
John Koleszar committed
612
613
614
      }

      if (mod_refprobs[0]) {
615
        vp9_write(bc, (rf != INTRA_FRAME), mod_refprobs[0]);
John Koleszar's avatar
John Koleszar committed
616
617
618
619
620
      }

      // Inter coded
      if (rf != INTRA_FRAME) {
        if (mod_refprobs[1]) {
621
          vp9_write(bc, (rf != LAST_FRAME), mod_refprobs[1]);
John Koleszar's avatar
John Koleszar committed
622
        }
623

John Koleszar's avatar
John Koleszar committed
624
625
        if (rf != LAST_FRAME) {
          if (mod_refprobs[2]) {
626
            vp9_write(bc, (rf != GOLDEN_FRAME), mod_refprobs[2]);
John Koleszar's avatar
John Koleszar committed
627
          }
628
        }
John Koleszar's avatar
John Koleszar committed
629
      }
Paul Wilkins's avatar
Paul Wilkins committed
630
    }
John Koleszar's avatar
John Koleszar committed
631
  }
Paul Wilkins's avatar
Paul Wilkins committed
632

John Koleszar's avatar
John Koleszar committed
633
634
  // if using the prediction mdoel we have nothing further to do because
  // the reference frame is fully coded by the segment
Paul Wilkins's avatar
Paul Wilkins committed
635
}
John Koleszar's avatar
John Koleszar committed
636

637
// Update the probabilities used to encode reference frame data
638
639
static void update_ref_probs(VP9_COMP *const cpi) {
  VP9_COMMON *const cm = &cpi->common;
640

John Koleszar's avatar
John Koleszar committed
641
642
643
644
  const int *const rfct = cpi->count_mb_ref_frame_usage;
  const int rf_intra = rfct[INTRA_FRAME];
  const int rf_inter = rfct[LAST_FRAME] +
                       rfct[GOLDEN_FRAME] + rfct[ALTREF_FRAME];
645

John Koleszar's avatar
John Koleszar committed
646
647
648
  cm->prob_intra_coded = get_binary_prob(rf_intra, rf_inter);
  cm->prob_last_coded = get_prob(rfct[LAST_FRAME], rf_inter);
  cm->prob_gf_coded = get_binary_prob(rfct[GOLDEN_FRAME], rfct[ALTREF_FRAME]);
649

John Koleszar's avatar
John Koleszar committed
650
651
  // Compute a modified set of probabilities to use when prediction of the
  // reference frame fails
Paul Wilkins's avatar
Paul Wilkins committed
652
  vp9_compute_mod_refprobs(cm);
653
654
}

655
static void pack_inter_mode_mvs(VP9_COMP *const cpi, vp9_writer *const bc) {
656
  VP9_COMMON *const pc = &cpi->common;
657
  const nmv_context *nmvc = &pc->fc.nmvc;
John Koleszar's avatar
John Koleszar committed
658
659
660
  MACROBLOCKD *xd = &cpi->mb.e_mbd;
  MODE_INFO *m;
  MODE_INFO *prev_m;
661
662
  TOKENEXTRA *tok = cpi->tok;
  TOKENEXTRA *tok_end = tok + cpi->tok_count;
663

John Koleszar's avatar
John Koleszar committed
664
665
666
  const int mis = pc->mode_info_stride;
  int mb_row, mb_col;
  int row, col;
John Koleszar's avatar
John Koleszar committed
667

John Koleszar's avatar
John Koleszar committed
668
  // Values used in prediction model coding
669
  vp9_prob pred_prob;
John Koleszar's avatar
John Koleszar committed
670
  unsigned char prediction_flag;
671

John Koleszar's avatar
John Koleszar committed
672
673
  int row_delta[4] = { 0, +1,  0, -1};
  int col_delta[4] = { +1, -1, +1, +1};
Adrian Grange's avatar
Adrian Grange committed
674

John Koleszar's avatar
John Koleszar committed
675
  cpi->mb.partition_info = cpi->mb.pi;
676

John Koleszar's avatar
John Koleszar committed
677
678
679
680
681
682
683
684
685
686
687
  mb_row = 0;
  for (row = 0; row < pc->mb_rows; row += 2) {
    m = pc->mi + row * mis;
    prev_m = pc->prev_mi + row * mis;

    mb_col = 0;
    for (col = 0; col < pc->mb_cols; col += 2) {
      int i;

      // Process the 4 MBs in the order:
      // top-left, top-right, bottom-left, bottom-right
Ronald S. Bultje's avatar
Ronald S. Bultje committed
688
#if CONFIG_SUPERBLOCKS
689
      vp9_write(bc, m->mbmi.encoded_as_sb, pc->sb_coded);
Ronald S. Bultje's avatar
Ronald S. Bultje committed
690
#endif
John Koleszar's avatar
John Koleszar committed
691
692
693
      for (i = 0; i < 4; i++) {
        MB_MODE_INFO *mi;
        MV_REFERENCE_FRAME rf;
Deb Mukherjee's avatar
Deb Mukherjee committed
694
        MV_REFERENCE_FRAME sec_ref_frame;
John Koleszar's avatar
John Koleszar committed
695
        MB_PREDICTION_MODE mode;
696
        int segment_id, skip_coeff;
John Koleszar's avatar
John Koleszar committed
697
698
699
700
701
702
703
704
705
706
707
708
709
710

        int dy = row_delta[i];
        int dx = col_delta[i];
        int offset_extended = dy * mis + dx;

        if ((mb_row >= pc->mb_rows) || (mb_col >= pc->mb_cols)) {
          // MB lies outside frame, move on
          mb_row += dy;
          mb_col += dx;
          m += offset_extended;
          prev_m += offset_extended;
          cpi->mb.partition_info += offset_extended;
          continue;
        }
Adrian Grange's avatar
Adrian Grange committed
711

John Koleszar's avatar
John Koleszar committed
712
        mi = &m->mbmi;
John Koleszar's avatar
John Koleszar committed
713
        rf = mi->ref_frame;
Deb Mukherjee's avatar
Deb Mukherjee committed
714
        sec_ref_frame = mi->second_ref_frame;
John Koleszar's avatar
John Koleszar committed
715
716
        mode = mi->mode;
        segment_id = mi->segment_id;
717

John Koleszar's avatar
John Koleszar committed
718
719
720
721
722
        // 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 = -((mb_col * 16) << 3);
        xd->mb_to_top_edge = -((mb_row * 16)) << 3;
723
724
725
726
727
728
729
730
731
732
733
734

#if CONFIG_SUPERBLOCKS
        if (mi->encoded_as_sb) {
          xd->mb_to_right_edge = ((pc->mb_cols - 2 - mb_col) * 16) << 3;
          xd->mb_to_bottom_edge = ((pc->mb_rows - 2 - mb_row) * 16) << 3;
        } else {
#endif
          xd->mb_to_right_edge = ((pc->mb_cols - 1 - mb_col) * 16) << 3;
          xd->mb_to_bottom_edge = ((pc->mb_rows - 1 - mb_row) * 16) << 3;
#if CONFIG_SUPERBLOCKS
        }
#endif
735

John Koleszar's avatar
John Koleszar committed
736
737
738
        // Make sure the MacroBlockD mode info pointer is set correctly
        xd->mode_info_context = m;
        xd->prev_mode_info_context = prev_m;
Paul Wilkins's avatar
Paul Wilkins committed
739

John Koleszar's avatar
John Koleszar committed
740
#ifdef ENTROPY_STATS
John Koleszar's avatar
John Koleszar committed
741
        active_section = 9;
John Koleszar's avatar
John Koleszar committed
742
#endif
John Koleszar's avatar
John Koleszar committed
743
744
745
        if (cpi->mb.e_mbd.update_mb_segmentation_map) {
          // Is temporal coding of the segment map enabled
          if (pc->temporal_update) {
Paul Wilkins's avatar
Paul Wilkins committed
746
747
            prediction_flag = vp9_get_pred_flag(xd, PRED_SEG_ID);
            pred_prob = vp9_get_pred_prob(pc, xd, PRED_SEG_ID);
748

John Koleszar's avatar
John Koleszar committed
749
            // Code the segment id prediction flag for this mb
750
            vp9_write(bc, prediction_flag, pred_prob);
751

John Koleszar's avatar
John Koleszar committed
752
753
            // If the mb segment id wasn't predicted code explicitly
            if (!prediction_flag)
John Koleszar's avatar
John Koleszar committed
754
              write_mb_segid(bc, mi, &cpi->mb.e_mbd);
John Koleszar's avatar
John Koleszar committed
755
756
          } else {
            // Normal unpredicted coding
John Koleszar's avatar
John Koleszar committed
757
            write_mb_segid(bc, mi, &cpi->mb.e_mbd);
John Koleszar's avatar
John Koleszar committed
758
759
          }
        }
John Koleszar's avatar
John Koleszar committed
760

761
        skip_coeff = 1;
John Koleszar's avatar
John Koleszar committed
762
        if (pc->mb_no_coeff_skip &&
763
764
            (!vp9_segfeature_active(xd, segment_id, SEG_LVL_EOB) ||
             (vp9_get_segdata(xd, segment_id, SEG_LVL_EOB) != 0))) {
765
          skip_coeff = mi->mb_skip_coeff;
Ronald S. Bultje's avatar
Ronald S. Bultje committed
766
767
768
769
770
771
772
#if CONFIG_SUPERBLOCKS
          if (mi->encoded_as_sb) {
            skip_coeff &= m[1].mbmi.mb_skip_coeff;
            skip_coeff &= m[mis].mbmi.mb_skip_coeff;
            skip_coeff &= m[mis + 1].mbmi.mb_skip_coeff;
          }
#endif
773
774
          vp9_write(bc, skip_coeff,
                    vp9_get_pred_prob(pc, xd, PRED_MBSKIP));
John Koleszar's avatar
John Koleszar committed
775
        }
John Koleszar's avatar
John Koleszar committed
776

John Koleszar's avatar
John Koleszar committed
777
        // Encode the reference frame.
778
779
780
781
782
783
        if (!vp9_segfeature_active(xd, segment_id, SEG_LVL_MODE)
            || vp9_get_segdata(xd, segment_id, SEG_LVL_MODE) >= NEARESTMV) {
          encode_ref_frame(bc, pc, xd, segment_id, rf);
        } else {
          assert(rf == INTRA_FRAME);
        }
Paul Wilkins's avatar
Paul Wilkins committed
784

John Koleszar's avatar
John Koleszar committed
785
        if (rf == INTRA_FRAME) {
786
#ifdef ENTROPY_STATS
John Koleszar's avatar
John Koleszar committed
787
          active_section = 6;
788
#endif
Paul Wilkins's avatar
Paul Wilkins committed
789

790
          if (!vp9_segfeature_active(xd, segment_id, SEG_LVL_MODE)) {
791
792
793
794
795
#if CONFIG_SUPERBLOCKS
            if (m->mbmi.encoded_as_sb)
              write_sb_ymode(bc, mode, pc->fc.sb_ymode_prob);
            else
#endif
John Koleszar's avatar
John Koleszar committed
796
            write_ymode(bc, mode, pc->fc.ymode_prob);
John Koleszar's avatar
John Koleszar committed
797
798
799
          }
          if (mode == B_PRED) {
            int j = 0;
800
#if CONFIG_COMP_INTRA_PRED
John Koleszar's avatar
John Koleszar committed
801
802
803
            int uses_second =
              m->bmi[0].as_mode.second !=
              (B_PREDICTION_MODE)(B_DC_PRED - 1);
804
            vp9_write(bc, uses_second, DEFAULT_COMP_INTRA_PROB);
805
#endif
John Koleszar's avatar
John Koleszar committed
806
            do {
807
#if CONFIG_COMP_INTRA_PRED
John Koleszar's avatar
John Koleszar committed
808
              B_PREDICTION_MODE mode2 = m->bmi[j].as_mode.second;
809
#endif
John Koleszar's avatar
John Koleszar committed
810
              write_bmode(bc, m->bmi[j].as_mode.first,
John Koleszar's avatar
John Koleszar committed
811
                          pc->fc.bmode_prob);
812
#if CONFIG_COMP_INTRA_PRED
John Koleszar's avatar
John Koleszar committed
813
              if (uses_second) {
John Koleszar's avatar
John Koleszar committed
814
                write_bmode(bc, mode2, pc->fc.bmode_prob);
John Koleszar's avatar
John Koleszar committed
815
816
817
818
819
              }
#endif
            } while (++j < 16);
          }
          if (mode == I8X8_PRED) {
John Koleszar's avatar
John Koleszar committed
820
            write_i8x8_mode(bc, m->bmi[0].as_mode.first,
John Koleszar's avatar
John Koleszar committed
821
                            pc->fc.i8x8_mode_prob);
John Koleszar's avatar
John Koleszar committed
822
            write_i8x8_mode(bc, m->bmi[2].as_mode.first,
John Koleszar's avatar
John Koleszar committed
823
                            pc->fc.i8x8_mode_prob);
John Koleszar's avatar
John Koleszar committed
824
            write_i8x8_mode(bc, m->bmi[8].as_mode.first,
John Koleszar's avatar
John Koleszar committed
825
                            pc->fc.i8x8_mode_prob);
John Koleszar's avatar
John Koleszar committed
826
            write_i8x8_mode(bc, m->bmi[10].as_mode.first,
John Koleszar's avatar
John Koleszar committed
827
828
                            pc->fc.i8x8_mode_prob);
          } else {
John Koleszar's avatar
John Koleszar committed
829
            write_uv_mode(bc, mi->uv_mode,
John Koleszar's avatar
John Koleszar committed
830
831
832
                          pc->fc.uv_mode_prob[mode]);
          }
        } else {
833
          vp9_prob mv_ref_p [VP9_MVREFS - 1];
John Koleszar's avatar
John Koleszar committed
834

835
          vp9_mv_ref_probs(&cpi->common, mv_ref_p, mi->mb_mode_context[rf]);
836

Yaowu Xu's avatar
Yaowu Xu committed
837

838
// #ifdef ENTROPY_STATS
John Koleszar's avatar
John Koleszar committed
839
#ifdef ENTROPY_STATS
840
          accum_mv_refs(mode, ct);
John Koleszar's avatar
John Koleszar committed
841
          active_section = 3;
John Koleszar's avatar
John Koleszar committed
842
843
#endif

John Koleszar's avatar
John Koleszar committed
844
          // Is the segment coding of mode enabled
845
          if (!vp9_segfeature_active(xd, segment_id, SEG_LVL_MODE)) {
Ronald S. Bultje's avatar
Ronald S. Bultje committed
846
847
#if CONFIG_SUPERBLOCKS
            if (mi->encoded_as_sb) {
John Koleszar's avatar
John Koleszar committed
848
              write_sb_mv_ref(bc, mode, mv_ref_p);
Ronald S. Bultje's avatar
Ronald S. Bultje committed
849
850
851
            } else
#endif
            {
John Koleszar's avatar
John Koleszar committed
852
              write_mv_ref(bc, mode, mv_ref_p);
Ronald S. Bultje's avatar
Ronald S. Bultje committed
853
            }
Paul Wilkins's avatar
Paul Wilkins committed
854
            vp9_accum_mv_refs(&cpi->common, mode, mi->mb_mode_context[rf]);
John Koleszar's avatar
John Koleszar committed
855
          }
856

857
#if CONFIG_PRED_FILTER
John Koleszar's avatar
John Koleszar committed
858
859
860
          // Is the prediction filter enabled
          if (mode >= NEARESTMV && mode < SPLITMV) {
            if (cpi->common.pred_filter_mode == 2)
861
              vp9_write(bc, mi->pred_filter_enabled,
John Koleszar's avatar
John Koleszar committed
862
863
864
865
866
                        pc->prob_pred_filter_off);
            else
              assert(mi->pred_filter_enabled ==
                     cpi->common.pred_filter_mode);
          }
867
868
869
870
#endif
          if (mode >= NEARESTMV && mode <= SPLITMV)
          {
            if (cpi->common.mcomp_filter_type == SWITCHABLE) {
871
872
873
874
              write_token(bc, vp9_switchable_interp_tree,
                          vp9_get_pred_probs(&cpi->common, xd,
                                             PRED_SWITCHABLE_INTERP),
                          vp9_switchable_interp_encodings +
875
                              vp9_switchable_interp_map[mi->interp_filter]);
876
877
878
879
880
            } else {
              assert (mi->interp_filter ==
                      cpi->common.mcomp_filter_type);
            }
          }
881

John Koleszar's avatar
John Koleszar committed
882
883
884
          // does the feature use compound prediction or not
          // (if not specified at the frame/segment level)
          if (cpi->common.comp_pred_mode == HYBRID_PREDICTION) {
885
            vp9_write(bc, mi->second_ref_frame > INTRA_FRAME,
Paul Wilkins's avatar
Paul Wilkins committed
886
                      vp9_get_pred_prob(pc, xd, PRED_COMP));
John Koleszar's avatar
John Koleszar committed
887
          }
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
#if CONFIG_COMP_INTERINTRA_PRED
          if (cpi->common.use_interintra &&
              mode >= NEARESTMV && mode < SPLITMV &&
              mi->second_ref_frame <= INTRA_FRAME) {
            vp9_write(bc, mi->second_ref_frame == INTRA_FRAME,
                      pc->fc.interintra_prob);
            // if (!cpi->dummy_packing)
            //   printf("-- %d (%d)\n", mi->second_ref_frame == INTRA_FRAME,
            //          pc->fc.interintra_prob);
            if (mi->second_ref_frame == INTRA_FRAME) {
              // if (!cpi->dummy_packing)
              //   printf("** %d %d\n", mi->interintra_mode,
                       // mi->interintra_uv_mode);
              write_ymode(bc, mi->interintra_mode, pc->fc.ymode_prob);
#if SEPARATE_INTERINTRA_UV
              write_uv_mode(bc, mi->interintra_uv_mode,
                            pc->fc.uv_mode_prob[mi->interintra_mode]);
#endif
            }
          }
#endif
John Koleszar's avatar
John Koleszar committed
909

910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
#if CONFIG_NEW_MVREF
          // if ((mode == NEWMV) || (mode == SPLITMV)) {
          if (mode == NEWMV) {
            // Encode the index of the choice.
            vp9_write_mv_ref_id(bc,
                                xd->mb_mv_ref_id_probs[rf], mi->best_index);
            cpi->best_ref_index_counts[rf][mi->best_index]++;

            if (mi->second_ref_frame > 0) {
              // Encode the index of the choice.
              vp9_write_mv_ref_id(
                bc, xd->mb_mv_ref_id_probs[mi->second_ref_frame],
                mi->best_second_index);

              cpi->best_ref_index_counts[mi->second_ref_frame]
                                        [mi->best_second_index]++;
            }
          }
#endif
John Koleszar's avatar
John Koleszar committed
929
930
931
          {
            switch (mode) { /* new, split require MVs */
              case NEWMV:
932
#ifdef ENTROPY_STATS
John Koleszar's avatar
John Koleszar committed