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


12
#include "vp9/common/vp9_blockd.h"
John Koleszar's avatar
John Koleszar committed
13
#include "vp9/common/vp9_common.h"
14
#include "vp9/decoder/vp9_onyxd_int.h"
John Koleszar's avatar
John Koleszar committed
15
16
#include "vpx_mem/vpx_mem.h"
#include "vpx_ports/mem.h"
17
#include "vp9/decoder/vp9_detokenize.h"
18
#include "vp9/common/vp9_seg_common.h"
19

John Koleszar's avatar
John Koleszar committed
20
21
22
23
24
25
26
27
28
29
30
31
#define EOB_CONTEXT_NODE            0
#define ZERO_CONTEXT_NODE           1
#define ONE_CONTEXT_NODE            2
#define LOW_VAL_CONTEXT_NODE        3
#define TWO_CONTEXT_NODE            4
#define THREE_CONTEXT_NODE          5
#define HIGH_LOW_CONTEXT_NODE       6
#define CAT_ONE_CONTEXT_NODE        7
#define CAT_THREEFOUR_CONTEXT_NODE  8
#define CAT_THREE_CONTEXT_NODE      9
#define CAT_FIVE_CONTEXT_NODE       10

Scott LaVarnway's avatar
Scott LaVarnway committed
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
#define CAT1_MIN_VAL    5
#define CAT2_MIN_VAL    7
#define CAT3_MIN_VAL   11
#define CAT4_MIN_VAL   19
#define CAT5_MIN_VAL   35
#define CAT6_MIN_VAL   67
#define CAT1_PROB0    159
#define CAT2_PROB0    145
#define CAT2_PROB1    165

#define CAT3_PROB0 140
#define CAT3_PROB1 148
#define CAT3_PROB2 173

#define CAT4_PROB0 135
#define CAT4_PROB1 140
#define CAT4_PROB2 155
#define CAT4_PROB3 176

#define CAT5_PROB0 130
#define CAT5_PROB1 134
#define CAT5_PROB2 141
#define CAT5_PROB3 157
#define CAT5_PROB4 180

57
static const vp9_prob cat6_prob[15] = {
58
59
  254, 254, 254, 252, 249, 243, 230, 196, 177, 153, 140, 133, 130, 129, 0
};
John Koleszar's avatar
John Koleszar committed
60

61
DECLARE_ALIGNED(16, extern const uint8_t, vp9_norm[256]);
62

Dmitry Kovalev's avatar
Dmitry Kovalev committed
63
static int16_t get_signed(BOOL_DECODER *br, int16_t value_to_sign) {
64
  return decode_bool(br, 128) ? -value_to_sign : value_to_sign;
Daniel Kang's avatar
Daniel Kang committed
65
}
John Koleszar's avatar
John Koleszar committed
66

Dmitry Kovalev's avatar
Dmitry Kovalev committed
67

68
69
#define INCREMENT_COUNT(token)               \
  do {                                       \
70
71
    coef_counts[type][ref][get_coef_band(scan, txfm_size, c)] \
               [pt][token]++;     \
72
    token_cache[c] = token; \
73
    pt = vp9_get_coef_context(scan, nb, pad, token_cache,     \
74
                              c + 1, default_eob); \
75
76
  } while (0)

77
#if CONFIG_CODE_NONZEROCOUNT
78
#define WRITE_COEF_CONTINUE(val, token)                       \
Daniel Kang's avatar
Daniel Kang committed
79
  {                                                           \
Dmitry Kovalev's avatar
Dmitry Kovalev committed
80
    qcoeff_ptr[scan[c]] = get_signed(br, val);                \
81
    INCREMENT_COUNT(token);                                   \
John Koleszar's avatar
John Koleszar committed
82
    c++;                                                      \
Dmitry Kovalev's avatar
Dmitry Kovalev committed
83
    nzc++;                                                    \
John Koleszar's avatar
John Koleszar committed
84
85
    continue;                                                 \
  }
86
#else
Dmitry Kovalev's avatar
Dmitry Kovalev committed
87
88
89
90
91
92
#define WRITE_COEF_CONTINUE(val, token)                  \
  {                                                      \
    qcoeff_ptr[scan[c]] = get_signed(br, val);           \
    INCREMENT_COUNT(token);                              \
    c++;                                                 \
    continue;                                            \
93
94
  }
#endif  // CONFIG_CODE_NONZEROCOUNT
John Koleszar's avatar
John Koleszar committed
95

Daniel Kang's avatar
Daniel Kang committed
96
97
#define ADJUST_COEF(prob, bits_count)  \
  do {                                 \
98
    if (vp9_read(br, prob))            \
Dmitry Kovalev's avatar
Dmitry Kovalev committed
99
      val += 1 << bits_count;          \
John Koleszar's avatar
John Koleszar committed
100
  } while (0);
John Koleszar's avatar
John Koleszar committed
101

102
static int decode_coefs(VP9D_COMP *dx, const MACROBLOCKD *xd,
103
                        BOOL_DECODER* const br, int block_idx,
104
105
                        PLANE_TYPE type, int seg_eob, int16_t *qcoeff_ptr,
                        TX_SIZE txfm_size) {
106
107
  ENTROPY_CONTEXT* const A0 = (ENTROPY_CONTEXT *) xd->above_context;
  ENTROPY_CONTEXT* const L0 = (ENTROPY_CONTEXT *) xd->left_context;
108
109
  int aidx, lidx;
  ENTROPY_CONTEXT above_ec, left_ec;
John Koleszar's avatar
John Koleszar committed
110
  FRAME_CONTEXT *const fc = &dx->common.fc;
111
  int pt, c = 0, pad, default_eob;
112
113
114
  vp9_coeff_probs *coef_probs;
  vp9_prob *prob;
  vp9_coeff_count *coef_counts;
115
  const int ref = xd->mode_info_context->mbmi.ref_frame != INTRA_FRAME;
116
#if CONFIG_CODE_NONZEROCOUNT
117
  const int nzc_used = get_nzc_used(txfm_size);
118
  uint16_t nzc = 0;
119
120
  uint16_t nzc_expected =
      nzc_used ? xd->mode_info_context->mbmi.nzcs[block_idx] : 0;
121
#endif
122
123
  const int *scan, *nb;
  uint8_t token_cache[1024];
Daniel Kang's avatar
Daniel Kang committed
124

125
126
127
128
129
130
131
132
133
134
135
  if (xd->mode_info_context->mbmi.sb_type == BLOCK_SIZE_SB64X64) {
    aidx = vp9_block2above_sb64[txfm_size][block_idx];
    lidx = vp9_block2left_sb64[txfm_size][block_idx];
  } else if (xd->mode_info_context->mbmi.sb_type == BLOCK_SIZE_SB32X32) {
    aidx = vp9_block2above_sb[txfm_size][block_idx];
    lidx = vp9_block2left_sb[txfm_size][block_idx];
  } else {
    aidx = vp9_block2above[txfm_size][block_idx];
    lidx = vp9_block2left[txfm_size][block_idx];
  }

136
  switch (txfm_size) {
Daniel Kang's avatar
Daniel Kang committed
137
    default:
138
    case TX_4X4: {
139
140
      const TX_TYPE tx_type = (type == PLANE_TYPE_Y_WITH_DC) ?
                              get_tx_type_4x4(xd, block_idx) : DCT_DCT;
141
142
143
144
145
146
147
148
149
150
151
      switch (tx_type) {
        default:
          scan = vp9_default_zig_zag1d_4x4;
          break;
        case ADST_DCT:
          scan = vp9_row_scan_4x4;
          break;
        case DCT_ADST:
          scan = vp9_col_scan_4x4;
          break;
      }
152
153
      above_ec = A0[aidx] != 0;
      left_ec = L0[lidx] != 0;
154
155
      coef_probs  = fc->coef_probs_4x4;
      coef_counts = fc->coef_counts_4x4;
156
      default_eob = 16;
Daniel Kang's avatar
Daniel Kang committed
157
      break;
158
    }
159
160
    case TX_8X8: {
      const BLOCK_SIZE_TYPE sb_type = xd->mode_info_context->mbmi.sb_type;
161
162
      const int sz = 3 + mb_width_log2(sb_type);
      const int x = block_idx & ((1 << sz) - 1);
163
164
165
166
167
168
169
170
171
172
173
174
175
176
      const int y = block_idx - x;
      const TX_TYPE tx_type = (type == PLANE_TYPE_Y_WITH_DC) ?
                              get_tx_type_8x8(xd, y + (x >> 1)) : DCT_DCT;
      switch (tx_type) {
        default:
          scan = vp9_default_zig_zag1d_8x8;
          break;
        case ADST_DCT:
          scan = vp9_row_scan_8x8;
          break;
        case DCT_ADST:
          scan = vp9_col_scan_8x8;
          break;
      }
177
178
      coef_probs  = fc->coef_probs_8x8;
      coef_counts = fc->coef_counts_8x8;
179
180
      above_ec = (A0[aidx] + A0[aidx + 1]) != 0;
      left_ec  = (L0[lidx] + L0[lidx + 1]) != 0;
181
      default_eob = 64;
Daniel Kang's avatar
Daniel Kang committed
182
      break;
183
184
185
    }
    case TX_16X16: {
      const BLOCK_SIZE_TYPE sb_type = xd->mode_info_context->mbmi.sb_type;
186
187
      const int sz = 4 + mb_width_log2(sb_type);
      const int x = block_idx & ((1 << sz) - 1);
188
189
190
191
192
193
194
195
196
197
198
199
200
201
      const int y = block_idx - x;
      const TX_TYPE tx_type = (type == PLANE_TYPE_Y_WITH_DC) ?
                              get_tx_type_16x16(xd, y + (x >> 2)) : DCT_DCT;
      switch (tx_type) {
        default:
          scan = vp9_default_zig_zag1d_16x16;
          break;
        case ADST_DCT:
          scan = vp9_row_scan_16x16;
          break;
        case DCT_ADST:
          scan = vp9_col_scan_16x16;
          break;
      }
202
203
      coef_probs  = fc->coef_probs_16x16;
      coef_counts = fc->coef_counts_16x16;
204
205
206
207
208
      if (type == PLANE_TYPE_UV) {
        ENTROPY_CONTEXT *A1 = (ENTROPY_CONTEXT *) (xd->above_context + 1);
        ENTROPY_CONTEXT *L1 = (ENTROPY_CONTEXT *) (xd->left_context + 1);
        above_ec = (A0[aidx] + A0[aidx + 1] + A1[aidx] + A1[aidx + 1]) != 0;
        left_ec  = (L0[lidx] + L0[lidx + 1] + L1[lidx] + L1[lidx + 1]) != 0;
209
      } else {
210
211
212
        above_ec = (A0[aidx] + A0[aidx + 1] + A0[aidx + 2] + A0[aidx + 3]) != 0;
        left_ec  = (L0[lidx] + L0[lidx + 1] + L0[lidx + 2] + L0[lidx + 3]) != 0;
      }
213
      default_eob = 256;
Daniel Kang's avatar
Daniel Kang committed
214
      break;
215
    }
216
    case TX_32X32:
217
      scan = vp9_default_zig_zag1d_32x32;
218
219
      coef_probs = fc->coef_probs_32x32;
      coef_counts = fc->coef_counts_32x32;
220
221
222
223
224
225
226
227
228
229
230
      if (type == PLANE_TYPE_UV) {
        ENTROPY_CONTEXT *A1 = (ENTROPY_CONTEXT *) (xd->above_context + 1);
        ENTROPY_CONTEXT *L1 = (ENTROPY_CONTEXT *) (xd->left_context + 1);
        ENTROPY_CONTEXT *A2 = (ENTROPY_CONTEXT *) (xd->above_context + 2);
        ENTROPY_CONTEXT *L2 = (ENTROPY_CONTEXT *) (xd->left_context + 2);
        ENTROPY_CONTEXT *A3 = (ENTROPY_CONTEXT *) (xd->above_context + 3);
        ENTROPY_CONTEXT *L3 = (ENTROPY_CONTEXT *) (xd->left_context + 3);
        above_ec = (A0[aidx] + A0[aidx + 1] + A1[aidx] + A1[aidx + 1] +
                    A2[aidx] + A2[aidx + 1] + A3[aidx] + A3[aidx + 1]) != 0;
        left_ec  = (L0[lidx] + L0[lidx + 1] + L1[lidx] + L1[lidx + 1] +
                    L2[lidx] + L2[lidx + 1] + L3[lidx] + L3[lidx + 1]) != 0;
231
      } else {
232
233
234
235
236
237
238
        ENTROPY_CONTEXT *A1 = (ENTROPY_CONTEXT *) (xd->above_context + 1);
        ENTROPY_CONTEXT *L1 = (ENTROPY_CONTEXT *) (xd->left_context + 1);
        above_ec = (A0[aidx] + A0[aidx + 1] + A0[aidx + 2] + A0[aidx + 3] +
                    A1[aidx] + A1[aidx + 1] + A1[aidx + 2] + A1[aidx + 3]) != 0;
        left_ec  = (L0[lidx] + L0[lidx + 1] + L0[lidx + 2] + L0[lidx + 3] +
                    L1[lidx] + L1[lidx + 1] + L1[lidx + 2] + L1[lidx + 3]) != 0;
      }
239
      default_eob = 1024;
240
      break;
Daniel Kang's avatar
Daniel Kang committed
241
  }
John Koleszar's avatar
John Koleszar committed
242

243
  VP9_COMBINEENTROPYCONTEXTS(pt, above_ec, left_ec);
244
245
  nb = vp9_get_coef_neighbors_handle(scan, &pad);

John Koleszar's avatar
John Koleszar committed
246
247
248
  while (1) {
    int val;
    const uint8_t *cat6 = cat6_prob;
Dmitry Kovalev's avatar
Dmitry Kovalev committed
249
250
251

    if (c >= seg_eob)
      break;
252
#if CONFIG_CODE_NONZEROCOUNT
253
    if (nzc_used && nzc == nzc_expected)
254
255
      break;
#endif
256
    prob = coef_probs[type][ref][get_coef_band(scan, txfm_size, c)][pt];
257
    fc->eob_branch_counts[txfm_size][type][ref]
258
                         [get_coef_band(scan, txfm_size, c)][pt]++;
259
260
#if CONFIG_CODE_NONZEROCOUNT
    if (!nzc_used)
261
#endif
262
263
      if (!vp9_read(br, prob[EOB_CONTEXT_NODE]))
        break;
Daniel Kang's avatar
Daniel Kang committed
264
SKIP_START:
Dmitry Kovalev's avatar
Dmitry Kovalev committed
265
266
    if (c >= seg_eob)
      break;
267
#if CONFIG_CODE_NONZEROCOUNT
268
    if (nzc_used && nzc == nzc_expected)
269
270
      break;
    // decode zero node only if there are zeros left
271
    if (!nzc_used || seg_eob - nzc_expected - c + nzc > 0)
272
#endif
273
    if (!vp9_read(br, prob[ZERO_CONTEXT_NODE])) {
274
      INCREMENT_COUNT(ZERO_TOKEN);
John Koleszar's avatar
John Koleszar committed
275
      ++c;
276
      prob = coef_probs[type][ref][get_coef_band(scan, txfm_size, c)][pt];
John Koleszar's avatar
John Koleszar committed
277
278
279
      goto SKIP_START;
    }
    // ONE_CONTEXT_NODE_0_
280
    if (!vp9_read(br, prob[ONE_CONTEXT_NODE])) {
281
      WRITE_COEF_CONTINUE(1, ONE_TOKEN);
John Koleszar's avatar
John Koleszar committed
282
283
    }
    // LOW_VAL_CONTEXT_NODE_0_
284
285
    if (!vp9_read(br, prob[LOW_VAL_CONTEXT_NODE])) {
      if (!vp9_read(br, prob[TWO_CONTEXT_NODE])) {
286
        WRITE_COEF_CONTINUE(2, TWO_TOKEN);
John Koleszar's avatar
John Koleszar committed
287
      }
288
      if (!vp9_read(br, prob[THREE_CONTEXT_NODE])) {
289
        WRITE_COEF_CONTINUE(3, THREE_TOKEN);
John Koleszar's avatar
John Koleszar committed
290
      }
291
      WRITE_COEF_CONTINUE(4, FOUR_TOKEN);
John Koleszar's avatar
John Koleszar committed
292
293
    }
    // HIGH_LOW_CONTEXT_NODE_0_
294
295
    if (!vp9_read(br, prob[HIGH_LOW_CONTEXT_NODE])) {
      if (!vp9_read(br, prob[CAT_ONE_CONTEXT_NODE])) {
John Koleszar's avatar
John Koleszar committed
296
297
        val = CAT1_MIN_VAL;
        ADJUST_COEF(CAT1_PROB0, 0);
298
        WRITE_COEF_CONTINUE(val, DCT_VAL_CATEGORY1);
John Koleszar's avatar
John Koleszar committed
299
300
301
302
      }
      val = CAT2_MIN_VAL;
      ADJUST_COEF(CAT2_PROB1, 1);
      ADJUST_COEF(CAT2_PROB0, 0);
303
      WRITE_COEF_CONTINUE(val, DCT_VAL_CATEGORY2);
Daniel Kang's avatar
Daniel Kang committed
304
    }
John Koleszar's avatar
John Koleszar committed
305
    // CAT_THREEFOUR_CONTEXT_NODE_0_
306
307
    if (!vp9_read(br, prob[CAT_THREEFOUR_CONTEXT_NODE])) {
      if (!vp9_read(br, prob[CAT_THREE_CONTEXT_NODE])) {
John Koleszar's avatar
John Koleszar committed
308
309
310
311
        val = CAT3_MIN_VAL;
        ADJUST_COEF(CAT3_PROB2, 2);
        ADJUST_COEF(CAT3_PROB1, 1);
        ADJUST_COEF(CAT3_PROB0, 0);
312
        WRITE_COEF_CONTINUE(val, DCT_VAL_CATEGORY3);
John Koleszar's avatar
John Koleszar committed
313
314
315
316
317
318
      }
      val = CAT4_MIN_VAL;
      ADJUST_COEF(CAT4_PROB3, 3);
      ADJUST_COEF(CAT4_PROB2, 2);
      ADJUST_COEF(CAT4_PROB1, 1);
      ADJUST_COEF(CAT4_PROB0, 0);
319
      WRITE_COEF_CONTINUE(val, DCT_VAL_CATEGORY4);
John Koleszar's avatar
John Koleszar committed
320
321
    }
    // CAT_FIVE_CONTEXT_NODE_0_:
322
    if (!vp9_read(br, prob[CAT_FIVE_CONTEXT_NODE])) {
John Koleszar's avatar
John Koleszar committed
323
324
325
326
327
328
      val = CAT5_MIN_VAL;
      ADJUST_COEF(CAT5_PROB4, 4);
      ADJUST_COEF(CAT5_PROB3, 3);
      ADJUST_COEF(CAT5_PROB2, 2);
      ADJUST_COEF(CAT5_PROB1, 1);
      ADJUST_COEF(CAT5_PROB0, 0);
329
      WRITE_COEF_CONTINUE(val, DCT_VAL_CATEGORY5);
John Koleszar's avatar
John Koleszar committed
330
331
332
    }
    val = 0;
    while (*cat6) {
333
      val = (val << 1) | vp9_read(br, *cat6++);
John Koleszar's avatar
John Koleszar committed
334
335
    }
    val += CAT6_MIN_VAL;
336
    WRITE_COEF_CONTINUE(val, DCT_VAL_CATEGORY6);
John Koleszar's avatar
John Koleszar committed
337
  }
Jingning Han's avatar
Jingning Han committed
338

339
340
341
342
343
344
345
346
347
348
349
#if CONFIG_CODE_NONZEROCOUNT
  if (!nzc_used)
#endif
    if (c < seg_eob)
      coef_counts[type][ref][get_coef_band(scan, txfm_size, c)]
                 [pt][DCT_EOB_TOKEN]++;
#if CONFIG_CODE_NONZEROCOUNT
  if (!nzc_used)
    xd->mode_info_context->mbmi.nzcs[block_idx] = nzc;
  else
    assert(nzc == nzc_expected);
350
#endif
351

Dmitry Kovalev's avatar
Dmitry Kovalev committed
352
  A0[aidx] = L0[lidx] = c > 0;
353
  if (txfm_size >= TX_8X8) {
354
355
356
357
358
    A0[aidx + 1] = L0[lidx + 1] = A0[aidx];
    if (txfm_size >= TX_16X16) {
      if (type == PLANE_TYPE_UV) {
        ENTROPY_CONTEXT *A1 = (ENTROPY_CONTEXT *) (xd->above_context + 1);
        ENTROPY_CONTEXT *L1 = (ENTROPY_CONTEXT *) (xd->left_context + 1);
359
        A1[aidx] = A1[aidx + 1] = L1[lidx] = L1[lidx + 1] = A0[aidx];
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
        if (txfm_size >= TX_32X32) {
          ENTROPY_CONTEXT *A2 = (ENTROPY_CONTEXT *) (xd->above_context + 2);
          ENTROPY_CONTEXT *L2 = (ENTROPY_CONTEXT *) (xd->left_context + 2);
          ENTROPY_CONTEXT *A3 = (ENTROPY_CONTEXT *) (xd->above_context + 3);
          ENTROPY_CONTEXT *L3 = (ENTROPY_CONTEXT *) (xd->left_context + 3);
          A2[aidx] = A2[aidx + 1] = A3[aidx] = A3[aidx + 1] = A0[aidx];
          L2[lidx] = L2[lidx + 1] = L3[lidx] = L3[lidx + 1] = A0[aidx];
        }
      } else {
        A0[aidx + 2] = A0[aidx + 3] = L0[lidx + 2] = L0[lidx + 3] = A0[aidx];
        if (txfm_size >= TX_32X32) {
          ENTROPY_CONTEXT *A1 = (ENTROPY_CONTEXT *) (xd->above_context + 1);
          ENTROPY_CONTEXT *L1 = (ENTROPY_CONTEXT *) (xd->left_context + 1);
          A1[aidx] = A1[aidx + 1] = A1[aidx + 2] = A1[aidx + 3] = A0[aidx];
          L1[lidx] = L1[lidx + 1] = L1[lidx + 2] = L1[lidx + 3] = A0[aidx];
        }
      }
    }
  }
John Koleszar's avatar
John Koleszar committed
379
  return c;
Daniel Kang's avatar
Daniel Kang committed
380
}
John Koleszar's avatar
John Koleszar committed
381

382
static int get_eob(MACROBLOCKD* const xd, int segment_id, int eob_max) {
Dmitry Kovalev's avatar
Dmitry Kovalev committed
383
  return vp9_get_segdata(xd, segment_id, SEG_LVL_SKIP) ? 0 : eob_max;
384
385
}

386

John Koleszar's avatar
John Koleszar committed
387
388
389
390
391
392
393
394
395
396
397
398
399
struct decode_block_args {
  VP9D_COMP *pbi;
  MACROBLOCKD *xd;
  BOOL_DECODER *bc;
  int *eobtotal;
};
static void decode_block(int plane, int block,
                         int block_size_b,
                         int ss_txfrm_size,
                         void *argv) {
  const struct decode_block_args* const arg = argv;
  const int old_block_idx = old_block_idx_4x4(arg->xd, block_size_b,
                                              plane, block);
400
401

  // find the maximum eob for this transform size, adjusted by segment
John Koleszar's avatar
John Koleszar committed
402
403
404
405
  const int segment_id = arg->xd->mode_info_context->mbmi.segment_id;
  const TX_SIZE ss_tx_size = ss_txfrm_size / 2;
  const int seg_eob = get_eob(arg->xd, segment_id, 16 << ss_txfrm_size);
  int16_t* const qcoeff_base = arg->xd->plane[plane].qcoeff;
Dmitry Kovalev's avatar
Dmitry Kovalev committed
406

John Koleszar's avatar
John Koleszar committed
407
408
409
  const int eob = decode_coefs(arg->pbi, arg->xd, arg->bc, old_block_idx,
                               arg->xd->plane[plane].plane_type, seg_eob,
                               BLOCK_OFFSET(qcoeff_base, block, 16),
410
411
                               ss_tx_size);

John Koleszar's avatar
John Koleszar committed
412
413
  arg->xd->plane[plane].eobs[block] = eob;
  arg->eobtotal[0] += eob;
414
415
}

416
int vp9_decode_tokens(VP9D_COMP* const pbi,
417
                         MACROBLOCKD* const xd,
418
419
420
                         BOOL_DECODER* const bc,
                         BLOCK_SIZE_TYPE bsize) {
  const int bwl = mb_width_log2(bsize) + 2, bhl = mb_height_log2(bsize) + 2;
John Koleszar's avatar
John Koleszar committed
421
422
423
424
  int eobtotal = 0;
  struct decode_block_args args = {pbi, xd, bc, &eobtotal};
  foreach_transformed_block(xd, bwl + bhl, decode_block, &args);
  return eobtotal;
425
426
}

427
#if CONFIG_NEWBINTRAMODES
428
429
static int decode_coefs_4x4(VP9D_COMP *dx, MACROBLOCKD *xd,
                            BOOL_DECODER* const bc,
430
                            PLANE_TYPE type, int i, int seg_eob) {
John Koleszar's avatar
John Koleszar committed
431
  const struct plane_block_idx pb_idx = plane_block_idx(16, i);
Dmitry Kovalev's avatar
Dmitry Kovalev committed
432
  const int c = decode_coefs(dx, xd, bc, i, type, seg_eob,
John Koleszar's avatar
John Koleszar committed
433
434
      BLOCK_OFFSET(xd->plane[pb_idx.plane].qcoeff, pb_idx.block, 16), TX_4X4);
  xd->plane[pb_idx.plane].eobs[pb_idx.block] = c;
435
436
437
438
439
440
441
  return c;
}

static int decode_mb_tokens_4x4_uv(VP9D_COMP* const dx,
                                   MACROBLOCKD* const xd,
                                   BOOL_DECODER* const bc,
                                   int seg_eob) {
Dmitry Kovalev's avatar
Dmitry Kovalev committed
442
  int i, eobtotal = 0;
443

444
  // chroma blocks
Dmitry Kovalev's avatar
Dmitry Kovalev committed
445
  for (i = 16; i < 24; i++)
446
    eobtotal += decode_coefs_4x4(dx, xd, bc, PLANE_TYPE_UV, i, seg_eob);
447
448
449
450

  return eobtotal;
}

451
452
453
454
455
456
457
458
459
int vp9_decode_mb_tokens_4x4_uv(VP9D_COMP* const dx,
                                MACROBLOCKD* const xd,
                                BOOL_DECODER* const bc) {
  const int segment_id = xd->mode_info_context->mbmi.segment_id;
  const int seg_eob = get_eob(xd, segment_id, 16);

  return decode_mb_tokens_4x4_uv(dx, xd, bc, seg_eob);
}

460
461
462
463
464
465
466
467
int vp9_decode_coefs_4x4(VP9D_COMP *dx, MACROBLOCKD *xd,
                         BOOL_DECODER* const bc,
                         PLANE_TYPE type, int i) {
  const int segment_id = xd->mode_info_context->mbmi.segment_id;
  const int seg_eob = get_eob(xd, segment_id, 16);
  return decode_coefs_4x4(dx, xd, bc, type, i, seg_eob);
}
#endif