decodframe.c 49.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
 */


John Koleszar's avatar
John Koleszar committed
12
13
#include "vpx_config.h"
#include "vpx_rtcd.h"
John Koleszar's avatar
John Koleszar committed
14
#include "onyxd_int.h"
John Koleszar's avatar
John Koleszar committed
15
16
17
#include "vp8/common/header.h"
#include "vp8/common/reconintra4x4.h"
#include "vp8/common/reconinter.h"
John Koleszar's avatar
John Koleszar committed
18
#include "detokenize.h"
John Koleszar's avatar
John Koleszar committed
19
20
21
22
#include "vp8/common/invtrans.h"
#include "vp8/common/alloccommon.h"
#include "vp8/common/entropymode.h"
#include "vp8/common/quant_common.h"
23
#include "vpx_scale/vpxscale.h"
John Koleszar's avatar
John Koleszar committed
24
#include "vp8/common/setupintrarecon.h"
Scott LaVarnway's avatar
Scott LaVarnway committed
25

John Koleszar's avatar
John Koleszar committed
26
#include "decodemv.h"
John Koleszar's avatar
John Koleszar committed
27
#include "vp8/common/extend.h"
28
29
30
#if CONFIG_ERROR_CONCEALMENT
#include "error_concealment.h"
#endif
John Koleszar's avatar
John Koleszar committed
31
#include "vpx_mem/vpx_mem.h"
John Koleszar's avatar
John Koleszar committed
32
#include "vp8/common/threading.h"
John Koleszar's avatar
John Koleszar committed
33
34
35
36
37
38
39
40
41
42
43
44
45
#include "decoderthreading.h"
#include "dboolhuff.h"

#include <assert.h>
#include <stdio.h>

void vp8cx_init_de_quantizer(VP8D_COMP *pbi)
{
    int Q;
    VP8_COMMON *const pc = & pbi->common;

    for (Q = 0; Q < QINDEX_RANGE; Q++)
    {
46
47
48
        pc->Y1dequant[Q][0] = (short)vp8_dc_quant(Q, pc->y1dc_delta_q);
        pc->Y2dequant[Q][0] = (short)vp8_dc2quant(Q, pc->y2dc_delta_q);
        pc->UVdequant[Q][0] = (short)vp8_dc_uv_quant(Q, pc->uvdc_delta_q);
John Koleszar's avatar
John Koleszar committed
49

50
51
52
        pc->Y1dequant[Q][1] = (short)vp8_ac_yquant(Q);
        pc->Y2dequant[Q][1] = (short)vp8_ac2quant(Q, pc->y2ac_delta_q);
        pc->UVdequant[Q][1] = (short)vp8_ac_uv_quant(Q, pc->uvac_delta_q);
John Koleszar's avatar
John Koleszar committed
53
54
55
    }
}

John Koleszar's avatar
John Koleszar committed
56
void vp8_mb_init_dequantizer(VP8D_COMP *pbi, MACROBLOCKD *xd)
John Koleszar's avatar
John Koleszar committed
57
58
59
60
61
62
{
    int i;
    int QIndex;
    MB_MODE_INFO *mbmi = &xd->mode_info_context->mbmi;
    VP8_COMMON *const pc = & pbi->common;

63
    /* Decide whether to use the default or alternate baseline Q value. */
John Koleszar's avatar
John Koleszar committed
64
65
    if (xd->segmentation_enabled)
    {
66
        /* Abs Value */
John Koleszar's avatar
John Koleszar committed
67
68
69
        if (xd->mb_segement_abs_delta == SEGMENT_ABSDATA)
            QIndex = xd->segment_feature_data[MB_LVL_ALT_Q][mbmi->segment_id];

70
        /* Delta Value */
John Koleszar's avatar
John Koleszar committed
71
72
73
        else
        {
            QIndex = pc->base_qindex + xd->segment_feature_data[MB_LVL_ALT_Q][mbmi->segment_id];
74
            QIndex = (QIndex >= 0) ? ((QIndex <= MAXQ) ? QIndex : MAXQ) : 0;    /* Clamp to valid range */
John Koleszar's avatar
John Koleszar committed
75
76
77
78
79
        }
    }
    else
        QIndex = pc->base_qindex;

80
81
82
83
84
    /* Set up the macroblock dequant constants */
    xd->dequant_y1_dc[0] = 1;
    xd->dequant_y1[0] = pc->Y1dequant[QIndex][0];
    xd->dequant_y2[0] = pc->Y2dequant[QIndex][0];
    xd->dequant_uv[0] = pc->UVdequant[QIndex][0];
John Koleszar's avatar
John Koleszar committed
85

86
    for (i = 1; i < 16; i++)
John Koleszar's avatar
John Koleszar committed
87
    {
88
89
90
91
        xd->dequant_y1_dc[i] =
        xd->dequant_y1[i] = pc->Y1dequant[QIndex][1];
        xd->dequant_y2[i] = pc->Y2dequant[QIndex][1];
        xd->dequant_uv[i] = pc->UVdequant[QIndex][1];
John Koleszar's avatar
John Koleszar committed
92
93
94
    }
}

95
96
static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd,
                              unsigned int mb_idx)
John Koleszar's avatar
John Koleszar committed
97
{
Gaute Strokkenes's avatar
Gaute Strokkenes committed
98
99
    MB_PREDICTION_MODE mode;
    int i;
Scott LaVarnway's avatar
Scott LaVarnway committed
100
#if CONFIG_ERROR_CONCEALMENT
Scott LaVarnway's avatar
Scott LaVarnway committed
101
    int corruption_detected = 0;
Scott LaVarnway's avatar
Scott LaVarnway committed
102
#endif
103

104
    if (xd->mode_info_context->mbmi.mb_skip_coeff)
105
106
107
    {
        vp8_reset_mb_tokens_context(xd);
    }
108
    else if (!vp8dx_bool_error(xd->current_bc))
109
    {
Scott LaVarnway's avatar
Scott LaVarnway committed
110
        int eobtotal;
111
        eobtotal = vp8_decode_mb_tokens(pbi, xd);
Scott LaVarnway's avatar
Scott LaVarnway committed
112
113
114

        /* Special case:  Force the loopfilter to skip when eobtotal is zero */
        xd->mode_info_context->mbmi.mb_skip_coeff = (eobtotal==0);
115
116
    }

Scott LaVarnway's avatar
Scott LaVarnway committed
117
118
119
    mode = xd->mode_info_context->mbmi.mode;

    if (xd->segmentation_enabled)
John Koleszar's avatar
John Koleszar committed
120
        vp8_mb_init_dequantizer(pbi, xd);
121

122

Scott LaVarnway's avatar
Scott LaVarnway committed
123
#if CONFIG_ERROR_CONCEALMENT
Gaute Strokkenes's avatar
Gaute Strokkenes committed
124

Scott LaVarnway's avatar
Scott LaVarnway committed
125
    if(pbi->ec_active)
126
    {
Scott LaVarnway's avatar
Scott LaVarnway committed
127
128
129
130
131
132
133
        int throw_residual;
        /* When we have independent partitions we can apply residual even
         * though other partitions within the frame are corrupt.
         */
        throw_residual = (!pbi->independent_partitions &&
                          pbi->frame_corrupt_residual);
        throw_residual = (throw_residual || vp8dx_bool_error(xd->current_bc));
Scott LaVarnway's avatar
Scott LaVarnway committed
134

Scott LaVarnway's avatar
Scott LaVarnway committed
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
        if ((mb_idx >= pbi->mvs_corrupt_from_mb || throw_residual))
        {
            /* MB with corrupt residuals or corrupt mode/motion vectors.
             * Better to use the predictor as reconstruction.
             */
            pbi->frame_corrupt_residual = 1;
            vpx_memset(xd->qcoeff, 0, sizeof(xd->qcoeff));
            vp8_conceal_corrupt_mb(xd);


            corruption_detected = 1;

            /* force idct to be skipped for B_PRED and use the
             * prediction only for reconstruction
             * */
            vpx_memset(xd->eobs, 0, 25);
        }
152
    }
Scott LaVarnway's avatar
Scott LaVarnway committed
153
#endif
154

155
    /* do prediction */
156
    if (xd->mode_info_context->mbmi.ref_frame == INTRA_FRAME)
John Koleszar's avatar
John Koleszar committed
157
    {
158
        vp8_build_intra_predictors_mbuv_s(xd,
Scott LaVarnway's avatar
Scott LaVarnway committed
159
160
161
162
163
                                          xd->recon_above[1],
                                          xd->recon_above[2],
                                          xd->recon_left[1],
                                          xd->recon_left[2],
                                          xd->recon_left_stride[1],
164
165
                                          xd->dst.u_buffer, xd->dst.v_buffer,
                                          xd->dst.uv_stride);
John Koleszar's avatar
John Koleszar committed
166

Gaute Strokkenes's avatar
Gaute Strokkenes committed
167
        if (mode != B_PRED)
John Koleszar's avatar
John Koleszar committed
168
        {
Scott LaVarnway's avatar
Scott LaVarnway committed
169
            vp8_build_intra_predictors_mby_s(xd,
Scott LaVarnway's avatar
Scott LaVarnway committed
170
171
172
                                                 xd->recon_above[0],
                                                 xd->recon_left[0],
                                                 xd->recon_left_stride[0],
173
174
                                                 xd->dst.y_buffer,
                                                 xd->dst.y_stride);
Scott LaVarnway's avatar
Scott LaVarnway committed
175
176
177
        }
        else
        {
178
            short *DQC = xd->dequant_y1;
Scott LaVarnway's avatar
Scott LaVarnway committed
179
            int dst_stride = xd->dst.y_stride;
180

Scott LaVarnway's avatar
Scott LaVarnway committed
181
182
183
184
            /* clear out residual eob info */
            if(xd->mode_info_context->mbmi.mb_skip_coeff)
                vpx_memset(xd->eobs, 0, 25);

Scott LaVarnway's avatar
Scott LaVarnway committed
185
            intra_prediction_down_copy(xd, xd->recon_above[0] + 16);
Scott LaVarnway's avatar
Scott LaVarnway committed
186
187
188
189

            for (i = 0; i < 16; i++)
            {
                BLOCKD *b = &xd->block[i];
190
                unsigned char *dst = xd->dst.y_buffer + b->offset;
191
192
                B_PREDICTION_MODE b_mode =
                    xd->mode_info_context->bmi[i].as_mode;
193
194
195
196
                unsigned char *Above = dst - dst_stride;
                unsigned char *yleft = dst - 1;
                int left_stride = dst_stride;
                unsigned char top_left = Above[-1];
Scott LaVarnway's avatar
Scott LaVarnway committed
197

Johann's avatar
Johann committed
198
199
                vp8_intra4x4_predict(Above, yleft, left_stride, b_mode,
                                     dst, dst_stride, top_left);
Scott LaVarnway's avatar
Scott LaVarnway committed
200
201
202
203
204

                if (xd->eobs[i])
                {
                    if (xd->eobs[i] > 1)
                    {
205
                    vp8_dequant_idct_add(b->qcoeff, DQC, dst, dst_stride);
Scott LaVarnway's avatar
Scott LaVarnway committed
206
207
208
                    }
                    else
                    {
209
                        vp8_dc_only_idct_add
210
                            (b->qcoeff[0] * DQC[0],
211
212
                                dst, dst_stride,
                                dst, dst_stride);
Scott LaVarnway's avatar
Scott LaVarnway committed
213
214
215
216
                        ((int *)b->qcoeff)[0] = 0;
                    }
                }
            }
John Koleszar's avatar
John Koleszar committed
217
218
219
220
221
222
        }
    }
    else
    {
        vp8_build_inter_predictors_mb(xd);
    }
Scott LaVarnway's avatar
Scott LaVarnway committed
223

224

225
#if CONFIG_ERROR_CONCEALMENT
Scott LaVarnway's avatar
Scott LaVarnway committed
226
    if (corruption_detected)
227
228
229
230
231
    {
        return;
    }
#endif

Scott LaVarnway's avatar
Scott LaVarnway committed
232
    if(!xd->mode_info_context->mbmi.mb_skip_coeff)
233
    {
Scott LaVarnway's avatar
Scott LaVarnway committed
234
235
        /* dequantization and idct */
        if (mode != B_PRED)
John Koleszar's avatar
John Koleszar committed
236
        {
237
            short *DQC = xd->dequant_y1;
John Koleszar's avatar
John Koleszar committed
238

Scott LaVarnway's avatar
Scott LaVarnway committed
239
            if (mode != SPLITMV)
John Koleszar's avatar
John Koleszar committed
240
            {
Scott LaVarnway's avatar
Scott LaVarnway committed
241
242
243
244
                BLOCKD *b = &xd->block[24];

                /* do 2nd order transform on the dc block */
                if (xd->eobs[24] > 1)
245
                {
John Koleszar's avatar
John Koleszar committed
246
                    vp8_dequantize_b(b, xd->dequant_y2);
Scott LaVarnway's avatar
Scott LaVarnway committed
247

248
                    vp8_short_inv_walsh4x4(&b->dqcoeff[0],
Scott LaVarnway's avatar
Scott LaVarnway committed
249
250
251
252
253
254
255
256
257
                        xd->qcoeff);
                    ((int *)b->qcoeff)[0] = 0;
                    ((int *)b->qcoeff)[1] = 0;
                    ((int *)b->qcoeff)[2] = 0;
                    ((int *)b->qcoeff)[3] = 0;
                    ((int *)b->qcoeff)[4] = 0;
                    ((int *)b->qcoeff)[5] = 0;
                    ((int *)b->qcoeff)[6] = 0;
                    ((int *)b->qcoeff)[7] = 0;
258
259
260
                }
                else
                {
261
                    b->dqcoeff[0] = b->qcoeff[0] * xd->dequant_y2[0];
262
                    vp8_short_inv_walsh4x4_1(&b->dqcoeff[0],
Scott LaVarnway's avatar
Scott LaVarnway committed
263
                        xd->qcoeff);
264
265
                    ((int *)b->qcoeff)[0] = 0;
                }
266

Scott LaVarnway's avatar
Scott LaVarnway committed
267
268
269
                /* override the dc dequant constant in order to preserve the
                 * dc components
                 */
270
                DQC = xd->dequant_y1_dc;
271
272
            }

John Koleszar's avatar
John Koleszar committed
273
            vp8_dequant_idct_add_y_block
274
                            (xd->qcoeff, DQC,
Scott LaVarnway's avatar
Scott LaVarnway committed
275
276
277
                             xd->dst.y_buffer,
                             xd->dst.y_stride, xd->eobs);
        }
278

John Koleszar's avatar
John Koleszar committed
279
        vp8_dequant_idct_add_uv_block
280
                        (xd->qcoeff+16*16, xd->dequant_uv,
Scott LaVarnway's avatar
Scott LaVarnway committed
281
282
                         xd->dst.u_buffer, xd->dst.v_buffer,
                         xd->dst.uv_stride, xd->eobs+16);
Gaute Strokkenes's avatar
Gaute Strokkenes committed
283
    }
John Koleszar's avatar
John Koleszar committed
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
}

static int get_delta_q(vp8_reader *bc, int prev, int *q_update)
{
    int ret_val = 0;

    if (vp8_read_bit(bc))
    {
        ret_val = vp8_read_literal(bc, 4);

        if (vp8_read_bit(bc))
            ret_val = -ret_val;
    }

    /* Trigger a quantizer update if the delta-q value has changed */
    if (ret_val != prev)
        *q_update = 1;

    return ret_val;
}

#ifdef PACKET_TESTING
#include <stdio.h>
FILE *vpxlog = 0;
#endif

310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
static void yv12_extend_frame_top_c(YV12_BUFFER_CONFIG *ybf)
{
    int i;
    unsigned char *src_ptr1;
    unsigned char *dest_ptr1;

    unsigned int Border;
    int plane_stride;

    /***********/
    /* Y Plane */
    /***********/
    Border = ybf->border;
    plane_stride = ybf->y_stride;
    src_ptr1 = ybf->y_buffer - Border;
    dest_ptr1 = src_ptr1 - (Border * plane_stride);

    for (i = 0; i < (int)Border; i++)
    {
        vpx_memcpy(dest_ptr1, src_ptr1, plane_stride);
        dest_ptr1 += plane_stride;
    }


    /***********/
    /* U Plane */
    /***********/
    plane_stride = ybf->uv_stride;
    Border /= 2;
    src_ptr1 = ybf->u_buffer - Border;
    dest_ptr1 = src_ptr1 - (Border * plane_stride);

    for (i = 0; i < (int)(Border); i++)
    {
        vpx_memcpy(dest_ptr1, src_ptr1, plane_stride);
        dest_ptr1 += plane_stride;
    }

    /***********/
    /* V Plane */
    /***********/

    src_ptr1 = ybf->v_buffer - Border;
    dest_ptr1 = src_ptr1 - (Border * plane_stride);

    for (i = 0; i < (int)(Border); i++)
    {
        vpx_memcpy(dest_ptr1, src_ptr1, plane_stride);
        dest_ptr1 += plane_stride;
    }
}

static void yv12_extend_frame_bottom_c(YV12_BUFFER_CONFIG *ybf)
{
    int i;
    unsigned char *src_ptr1, *src_ptr2;
    unsigned char *dest_ptr2;

    unsigned int Border;
    int plane_stride;
    int plane_height;

    /***********/
    /* Y Plane */
    /***********/
    Border = ybf->border;
    plane_stride = ybf->y_stride;
    plane_height = ybf->y_height;

    src_ptr1 = ybf->y_buffer - Border;
    src_ptr2 = src_ptr1 + (plane_height * plane_stride) - plane_stride;
    dest_ptr2 = src_ptr2 + plane_stride;

    for (i = 0; i < (int)Border; i++)
    {
        vpx_memcpy(dest_ptr2, src_ptr2, plane_stride);
        dest_ptr2 += plane_stride;
    }


    /***********/
    /* U Plane */
    /***********/
    plane_stride = ybf->uv_stride;
    plane_height = ybf->uv_height;
    Border /= 2;

    src_ptr1 = ybf->u_buffer - Border;
    src_ptr2 = src_ptr1 + (plane_height * plane_stride) - plane_stride;
    dest_ptr2 = src_ptr2 + plane_stride;

    for (i = 0; i < (int)(Border); i++)
    {
        vpx_memcpy(dest_ptr2, src_ptr2, plane_stride);
        dest_ptr2 += plane_stride;
    }

    /***********/
    /* V Plane */
    /***********/

    src_ptr1 = ybf->v_buffer - Border;
    src_ptr2 = src_ptr1 + (plane_height * plane_stride) - plane_stride;
    dest_ptr2 = src_ptr2 + plane_stride;

    for (i = 0; i < (int)(Border); i++)
    {
        vpx_memcpy(dest_ptr2, src_ptr2, plane_stride);
        dest_ptr2 += plane_stride;
    }
}

static void yv12_extend_frame_left_right_c(YV12_BUFFER_CONFIG *ybf,
                                           unsigned char *y_src,
                                           unsigned char *u_src,
                                           unsigned char *v_src)
{
    int i;
    unsigned char *src_ptr1, *src_ptr2;
    unsigned char *dest_ptr1, *dest_ptr2;

    unsigned int Border;
    int plane_stride;
    int plane_height;
    int plane_width;

    /***********/
    /* Y Plane */
    /***********/
    Border = ybf->border;
    plane_stride = ybf->y_stride;
    plane_height = 16;
    plane_width = ybf->y_width;

    /* copy the left and right most columns out */
    src_ptr1 = y_src;
    src_ptr2 = src_ptr1 + plane_width - 1;
    dest_ptr1 = src_ptr1 - Border;
    dest_ptr2 = src_ptr2 + 1;

    for (i = 0; i < plane_height; i++)
    {
        vpx_memset(dest_ptr1, src_ptr1[0], Border);
        vpx_memset(dest_ptr2, src_ptr2[0], Border);
        src_ptr1  += plane_stride;
        src_ptr2  += plane_stride;
        dest_ptr1 += plane_stride;
        dest_ptr2 += plane_stride;
    }

    /***********/
    /* U Plane */
    /***********/
    plane_stride = ybf->uv_stride;
    plane_height = 8;
    plane_width = ybf->uv_width;
    Border /= 2;

    /* copy the left and right most columns out */
    src_ptr1 = u_src;
    src_ptr2 = src_ptr1 + plane_width - 1;
    dest_ptr1 = src_ptr1 - Border;
    dest_ptr2 = src_ptr2 + 1;

    for (i = 0; i < plane_height; i++)
    {
        vpx_memset(dest_ptr1, src_ptr1[0], Border);
        vpx_memset(dest_ptr2, src_ptr2[0], Border);
        src_ptr1  += plane_stride;
        src_ptr2  += plane_stride;
        dest_ptr1 += plane_stride;
        dest_ptr2 += plane_stride;
    }

    /***********/
    /* V Plane */
    /***********/

    /* copy the left and right most columns out */
    src_ptr1 = v_src;
    src_ptr2 = src_ptr1 + plane_width - 1;
    dest_ptr1 = src_ptr1 - Border;
    dest_ptr2 = src_ptr2 + 1;

    for (i = 0; i < plane_height; i++)
    {
        vpx_memset(dest_ptr1, src_ptr1[0], Border);
        vpx_memset(dest_ptr2, src_ptr2[0], Border);
        src_ptr1  += plane_stride;
        src_ptr2  += plane_stride;
        dest_ptr1 += plane_stride;
        dest_ptr2 += plane_stride;
    }
}

Scott LaVarnway's avatar
Scott LaVarnway committed
505
506
507
508
static void decode_mb_rows(VP8D_COMP *pbi)
{
    VP8_COMMON *const pc = & pbi->common;
    MACROBLOCKD *const xd  = & pbi->mb;
John Koleszar's avatar
John Koleszar committed
509

Scott LaVarnway's avatar
Scott LaVarnway committed
510
511
    MODE_INFO *lf_mic = xd->mode_info_context;

Scott LaVarnway's avatar
Scott LaVarnway committed
512
513
    int ibc = 0;
    int num_part = 1 << pc->multi_token_partition;
John Koleszar's avatar
John Koleszar committed
514
515

    int recon_yoffset, recon_uvoffset;
Scott LaVarnway's avatar
Scott LaVarnway committed
516
517
    int mb_row, mb_col;
    int mb_idx = 0;
518
    int dst_fb_idx = pc->new_fb_idx;
Scott LaVarnway's avatar
Scott LaVarnway committed
519
520
    int recon_y_stride = pc->yv12_fb[dst_fb_idx].y_stride;
    int recon_uv_stride = pc->yv12_fb[dst_fb_idx].uv_stride;
John Koleszar's avatar
John Koleszar committed
521

Scott LaVarnway's avatar
Scott LaVarnway committed
522
523
    unsigned char *ref_buffer[MAX_REF_FRAMES][3];
    unsigned char *dst_buffer[3];
Scott LaVarnway's avatar
Scott LaVarnway committed
524
    unsigned char *lf_dst[3];
525
    unsigned char *eb_dst[3];
Scott LaVarnway's avatar
Scott LaVarnway committed
526
527
528
    int i;
    int ref_fb_index[MAX_REF_FRAMES];
    int ref_fb_corrupted[MAX_REF_FRAMES];
John Koleszar's avatar
John Koleszar committed
529

Scott LaVarnway's avatar
Scott LaVarnway committed
530
    ref_fb_corrupted[INTRA_FRAME] = 0;
John Koleszar's avatar
John Koleszar committed
531

Scott LaVarnway's avatar
Scott LaVarnway committed
532
533
534
    ref_fb_index[LAST_FRAME]    = pc->lst_fb_idx;
    ref_fb_index[GOLDEN_FRAME]  = pc->gld_fb_idx;
    ref_fb_index[ALTREF_FRAME]  = pc->alt_fb_idx;
John Koleszar's avatar
John Koleszar committed
535

Scott LaVarnway's avatar
Scott LaVarnway committed
536
    for(i = 1; i < MAX_REF_FRAMES; i++)
John Koleszar's avatar
John Koleszar committed
537
    {
Scott LaVarnway's avatar
Scott LaVarnway committed
538
539
540
        ref_buffer[i][0] = pc->yv12_fb[ref_fb_index[i]].y_buffer;
        ref_buffer[i][1] = pc->yv12_fb[ref_fb_index[i]].u_buffer;
        ref_buffer[i][2] = pc->yv12_fb[ref_fb_index[i]].v_buffer;
541

Scott LaVarnway's avatar
Scott LaVarnway committed
542
543
544
        ref_fb_corrupted[i] = pc->yv12_fb[ref_fb_index[i]].corrupted;
    }

Scott LaVarnway's avatar
Scott LaVarnway committed
545
    /* Set up the buffer pointers */
546
547
548
    eb_dst[0] = lf_dst[0] = dst_buffer[0] = pc->yv12_fb[dst_fb_idx].y_buffer;
    eb_dst[1] = lf_dst[1] = dst_buffer[1] = pc->yv12_fb[dst_fb_idx].u_buffer;
    eb_dst[2] = lf_dst[2] = dst_buffer[2] = pc->yv12_fb[dst_fb_idx].v_buffer;
Scott LaVarnway's avatar
Scott LaVarnway committed
549
550
551

    xd->up_available = 0;

Scott LaVarnway's avatar
Scott LaVarnway committed
552
553
554
555
    /* Initialize the loop filter for this frame. */
    if(pc->filter_level)
        vp8_loop_filter_frame_init(pc, xd, pc->filter_level);

Scott LaVarnway's avatar
Scott LaVarnway committed
556
557
558
559
    /* Decode the individual macro block */
    for (mb_row = 0; mb_row < pc->mb_rows; mb_row++)
    {
        if (num_part > 1)
560
        {
Scott LaVarnway's avatar
Scott LaVarnway committed
561
562
563
564
565
            xd->current_bc = & pbi->mbc[ibc];
            ibc++;

            if (ibc == num_part)
                ibc = 0;
566
        }
John Koleszar's avatar
John Koleszar committed
567

Scott LaVarnway's avatar
Scott LaVarnway committed
568
569
        recon_yoffset = mb_row * recon_y_stride * 16;
        recon_uvoffset = mb_row * recon_uv_stride * 8;
John Koleszar's avatar
John Koleszar committed
570

Scott LaVarnway's avatar
Scott LaVarnway committed
571
572
573
        /* reset contexts */
        xd->above_context = pc->above_context;
        vpx_memset(xd->left_context, 0, sizeof(ENTROPY_CONTEXT_PLANES));
John Koleszar's avatar
John Koleszar committed
574

Scott LaVarnway's avatar
Scott LaVarnway committed
575
        xd->left_available = 0;
576

Scott LaVarnway's avatar
Scott LaVarnway committed
577
578
        xd->mb_to_top_edge = -((mb_row * 16)) << 3;
        xd->mb_to_bottom_edge = ((pc->mb_rows - 1 - mb_row) * 16) << 3;
John Koleszar's avatar
John Koleszar committed
579

Scott LaVarnway's avatar
Scott LaVarnway committed
580
581
582
583
584
585
586
587
588
589
590
591
        xd->recon_above[0] = dst_buffer[0] + recon_yoffset;
        xd->recon_above[1] = dst_buffer[1] + recon_uvoffset;
        xd->recon_above[2] = dst_buffer[2] + recon_uvoffset;

        xd->recon_left[0] = xd->recon_above[0] - 1;
        xd->recon_left[1] = xd->recon_above[1] - 1;
        xd->recon_left[2] = xd->recon_above[2] - 1;

        xd->recon_above[0] -= xd->dst.y_stride;
        xd->recon_above[1] -= xd->dst.uv_stride;
        xd->recon_above[2] -= xd->dst.uv_stride;

John Koleszar's avatar
John Koleszar committed
592
        /* TODO: move to outside row loop */
Scott LaVarnway's avatar
Scott LaVarnway committed
593
594
595
        xd->recon_left_stride[0] = xd->dst.y_stride;
        xd->recon_left_stride[1] = xd->dst.uv_stride;

Scott LaVarnway's avatar
Scott LaVarnway committed
596
        for (mb_col = 0; mb_col < pc->mb_cols; mb_col++)
597
        {
Scott LaVarnway's avatar
Scott LaVarnway committed
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
            /* Distance of Mb to the various image edges.
             * These are specified to 8th pel as they are always compared to values
             * that are in 1/8th pel units
             */
            xd->mb_to_left_edge = -((mb_col * 16) << 3);
            xd->mb_to_right_edge = ((pc->mb_cols - 1 - mb_col) * 16) << 3;

#if CONFIG_ERROR_CONCEALMENT
            {
                int corrupt_residual = (!pbi->independent_partitions &&
                                       pbi->frame_corrupt_residual) ||
                                       vp8dx_bool_error(xd->current_bc);
                if (pbi->ec_active &&
                    xd->mode_info_context->mbmi.ref_frame == INTRA_FRAME &&
                    corrupt_residual)
                {
                    /* We have an intra block with corrupt coefficients, better to
                     * conceal with an inter block. Interpolate MVs from neighboring
                     * MBs.
                     *
                     * Note that for the first mb with corrupt residual in a frame,
                     * we might not discover that before decoding the residual. That
                     * happens after this check, and therefore no inter concealment
                     * will be done.
                     */
                    vp8_interpolate_motion(xd,
                                           mb_row, mb_col,
                                           pc->mb_rows, pc->mb_cols,
                                           pc->mode_info_stride);
                }
            }
#endif

            xd->dst.y_buffer = dst_buffer[0] + recon_yoffset;
            xd->dst.u_buffer = dst_buffer[1] + recon_uvoffset;
            xd->dst.v_buffer = dst_buffer[2] + recon_uvoffset;

            xd->pre.y_buffer = ref_buffer[xd->mode_info_context->mbmi.ref_frame][0] + recon_yoffset;
            xd->pre.u_buffer = ref_buffer[xd->mode_info_context->mbmi.ref_frame][1] + recon_uvoffset;
            xd->pre.v_buffer = ref_buffer[xd->mode_info_context->mbmi.ref_frame][2] + recon_uvoffset;

639
            /* propagate errors from reference frames */
Scott LaVarnway's avatar
Scott LaVarnway committed
640
            xd->corrupted |= ref_fb_corrupted[xd->mode_info_context->mbmi.ref_frame];
641

Scott LaVarnway's avatar
Scott LaVarnway committed
642
            decode_macroblock(pbi, xd, mb_idx);
John Koleszar's avatar
John Koleszar committed
643

Scott LaVarnway's avatar
Scott LaVarnway committed
644
645
            mb_idx++;
            xd->left_available = 1;
John Koleszar's avatar
John Koleszar committed
646

Scott LaVarnway's avatar
Scott LaVarnway committed
647
648
            /* check if the boolean decoder has suffered an error */
            xd->corrupted |= vp8dx_bool_error(xd->current_bc);
John Koleszar's avatar
John Koleszar committed
649

Scott LaVarnway's avatar
Scott LaVarnway committed
650
651
652
653
654
655
656
            xd->recon_above[0] += 16;
            xd->recon_above[1] += 8;
            xd->recon_above[2] += 8;
            xd->recon_left[0] += 16;
            xd->recon_left[1] += 8;
            xd->recon_left[2] += 8;

Scott LaVarnway's avatar
Scott LaVarnway committed
657
658
            recon_yoffset += 16;
            recon_uvoffset += 8;
John Koleszar's avatar
John Koleszar committed
659

Scott LaVarnway's avatar
Scott LaVarnway committed
660
            ++xd->mode_info_context;  /* next mb */
John Koleszar's avatar
John Koleszar committed
661

Scott LaVarnway's avatar
Scott LaVarnway committed
662
663
            xd->above_context++;
        }
John Koleszar's avatar
John Koleszar committed
664

Scott LaVarnway's avatar
Scott LaVarnway committed
665
        /* adjust to the next row of mbs */
Scott LaVarnway's avatar
Scott LaVarnway committed
666
667
        vp8_extend_mb_row(&pc->yv12_fb[dst_fb_idx], xd->dst.y_buffer + 16,
                          xd->dst.u_buffer + 8, xd->dst.v_buffer + 8);
John Koleszar's avatar
John Koleszar committed
668

Scott LaVarnway's avatar
Scott LaVarnway committed
669
670
671
        ++xd->mode_info_context;      /* skip prediction column */
        xd->up_available = 1;

Scott LaVarnway's avatar
Scott LaVarnway committed
672
673
674
675
676
677
678
679
680
681
682
683
        if(pc->filter_level)
        {
            if(mb_row > 0)
            {
                if (pc->filter_type == NORMAL_LOOPFILTER)
                    vp8_loop_filter_row_normal(pc, lf_mic, mb_row-1,
                                               recon_y_stride, recon_uv_stride,
                                               lf_dst[0], lf_dst[1], lf_dst[2]);
                else
                    vp8_loop_filter_row_simple(pc, lf_mic, mb_row-1,
                                               recon_y_stride, recon_uv_stride,
                                               lf_dst[0], lf_dst[1], lf_dst[2]);
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700

                if(mb_row > 1)
                {
                    yv12_extend_frame_left_right_c(&pc->yv12_fb[dst_fb_idx],
                                                   eb_dst[0],
                                                   eb_dst[1],
                                                   eb_dst[2]);

                    eb_dst[0] += recon_y_stride  * 16;
                    eb_dst[1] += recon_uv_stride *  8;
                    eb_dst[2] += recon_uv_stride *  8;

                    if(mb_row == 2)
                        yv12_extend_frame_top_c(&pc->yv12_fb[dst_fb_idx]);

                }

Scott LaVarnway's avatar
Scott LaVarnway committed
701
702
703
704
705
706
707
                lf_dst[0] += recon_y_stride  * 16;
                lf_dst[1] += recon_uv_stride *  8;
                lf_dst[2] += recon_uv_stride *  8;
                lf_mic += pc->mb_cols;
                lf_mic++;         /* Skip border mb */
            }
        }
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
        else
        {
            if(mb_row > 0)
            {
                /**/
                yv12_extend_frame_left_right_c(&pc->yv12_fb[dst_fb_idx],
                                               eb_dst[0],
                                               eb_dst[1],
                                               eb_dst[2]);

                eb_dst[0] += recon_y_stride  * 16;
                eb_dst[1] += recon_uv_stride *  8;
                eb_dst[2] += recon_uv_stride *  8;

                if(mb_row == 1)
                    yv12_extend_frame_top_c(&pc->yv12_fb[dst_fb_idx]);
            }
        }
Scott LaVarnway's avatar
Scott LaVarnway committed
726
727
728
729
730
731
732
733
734
735
736
737
    }

    if(pc->filter_level)
    {
        if (pc->filter_type == NORMAL_LOOPFILTER)
            vp8_loop_filter_row_normal(pc, lf_mic, mb_row-1, recon_y_stride,
                                       recon_uv_stride, lf_dst[0], lf_dst[1],
                                       lf_dst[2]);
        else
            vp8_loop_filter_row_simple(pc, lf_mic, mb_row-1, recon_y_stride,
                                       recon_uv_stride, lf_dst[0], lf_dst[1],
                                       lf_dst[2]);
738
739
740
741
742
743
744
745

        yv12_extend_frame_left_right_c(&pc->yv12_fb[dst_fb_idx],
                                       eb_dst[0],
                                       eb_dst[1],
                                       eb_dst[2]);
        eb_dst[0] += recon_y_stride  * 16;
        eb_dst[1] += recon_uv_stride *  8;
        eb_dst[2] += recon_uv_stride *  8;
Scott LaVarnway's avatar
Scott LaVarnway committed
746
    }
747
748
749
750
    yv12_extend_frame_left_right_c(&pc->yv12_fb[dst_fb_idx],
                                   eb_dst[0],
                                   eb_dst[1],
                                   eb_dst[2]);
Scott LaVarnway's avatar
Scott LaVarnway committed
751

752
    yv12_extend_frame_bottom_c(&pc->yv12_fb[dst_fb_idx]);
Scott LaVarnway's avatar
Scott LaVarnway committed
753
}
John Koleszar's avatar
John Koleszar committed
754
755
756
757
758
759
760
761

static unsigned int read_partition_size(const unsigned char *cx_size)
{
    const unsigned int size =
        cx_size[0] + (cx_size[1] << 8) + (cx_size[2] << 16);
    return size;
}

762
763
764
static int read_is_valid(const unsigned char *start,
                         size_t               len,
                         const unsigned char *end)
765
{
766
767
    return (start + len > start && start + len <= end);
}
768

769
770
771
772
773
774
775
776
777
778
779
static unsigned int read_available_partition_size(
                                       VP8D_COMP *pbi,
                                       const unsigned char *token_part_sizes,
                                       const unsigned char *fragment_start,
                                       const unsigned char *first_fragment_end,
                                       const unsigned char *fragment_end,
                                       int i,
                                       int num_part)
{
    VP8_COMMON* pc = &pbi->common;
    const unsigned char *partition_size_ptr = token_part_sizes + i * 3;
Attila Nagy's avatar
Attila Nagy committed
780
    unsigned int partition_size = 0;
781
782
783
784
785
786
787
    ptrdiff_t bytes_left = fragment_end - fragment_start;
    /* Calculate the length of this partition. The last partition
     * size is implicit. If the partition size can't be read, then
     * either use the remaining data in the buffer (for EC mode)
     * or throw an error.
     */
    if (i < num_part - 1)
788
    {
789
790
791
        if (read_is_valid(partition_size_ptr, 3, first_fragment_end))
            partition_size = read_partition_size(partition_size_ptr);
        else if (pbi->ec_active)
792
            partition_size = (unsigned int)bytes_left;
793
794
795
        else
            vpx_internal_error(&pc->error, VPX_CODEC_CORRUPT_FRAME,
                               "Truncated partition size data");
796
    }
797
    else
798
        partition_size = (unsigned int)bytes_left;
799

800
801
802
803
804
    /* Validate the calculated partition length. If the buffer
     * described by the partition can't be fully read, then restrict
     * it to the portion that can be (for EC mode) or throw an error.
     */
    if (!read_is_valid(fragment_start, partition_size, fragment_end))
805
    {
806
        if (pbi->ec_active)
807
            partition_size = (unsigned int)bytes_left;
808
809
810
811
        else
            vpx_internal_error(&pc->error, VPX_CODEC_CORRUPT_FRAME,
                               "Truncated packet or corrupt partition "
                               "%d length", i + 1);
812
    }
813
    return partition_size;
814
815
816
}


John Koleszar's avatar
John Koleszar committed
817
static void setup_token_decoder(VP8D_COMP *pbi,
818
                                const unsigned char* token_part_sizes)
John Koleszar's avatar
John Koleszar committed
819
{
820
    vp8_reader *bool_decoder = &pbi->bc2;
821
    unsigned int partition_idx;
822
823
    unsigned int fragment_idx;
    unsigned int num_token_partitions;
824
825
    const unsigned char *first_fragment_end = pbi->fragments[0] +
                                          pbi->fragment_sizes[0];
John Koleszar's avatar
John Koleszar committed
826

827
    TOKEN_PARTITION multi_token_partition =
828
            (TOKEN_PARTITION)vp8_read_literal(&pbi->bc, 2);
829
830
831
832
    if (!vp8dx_bool_error(&pbi->bc))
        pbi->common.multi_token_partition = multi_token_partition;
    num_token_partitions = 1 << pbi->common.multi_token_partition;
    if (num_token_partitions > 1)
John Koleszar's avatar
John Koleszar committed
833
    {
834
835
        CHECK_MEM_ERROR(pbi->mbc, vpx_malloc(num_token_partitions *
                                             sizeof(vp8_reader)));
John Koleszar's avatar
John Koleszar committed
836
837
838
        bool_decoder = pbi->mbc;
    }

839
840
841
    /* Check for partitions within the fragments and unpack the fragments
     * so that each fragment pointer points to its corresponding partition. */
    for (fragment_idx = 0; fragment_idx < pbi->num_fragments; ++fragment_idx)
John Koleszar's avatar
John Koleszar committed
842
    {
843
844
845
846
847
848
        unsigned int fragment_size = pbi->fragment_sizes[fragment_idx];
        const unsigned char *fragment_end = pbi->fragments[fragment_idx] +
                                            fragment_size;
        /* Special case for handling the first partition since we have already
         * read its size. */
        if (fragment_idx == 0)
John Koleszar's avatar
John Koleszar committed
849
        {
850
851
852
            /* Size of first partition + token partition sizes element */
            ptrdiff_t ext_first_part_size = token_part_sizes -
                pbi->fragments[0] + 3 * (num_token_partitions - 1);
853
            fragment_size -= (unsigned int)ext_first_part_size;
854
855
            if (fragment_size > 0)
            {
856
                pbi->fragment_sizes[0] = (unsigned int)ext_first_part_size;
857
858
859
860
861
862
                /* The fragment contains an additional partition. Move to
                 * next. */
                fragment_idx++;
                pbi->fragments[fragment_idx] = pbi->fragments[0] +
                  pbi->fragment_sizes[0];
            }
John Koleszar's avatar
John Koleszar committed
863
        }
864
865
        /* Split the chunk into partitions read from the bitstream */
        while (fragment_size > 0)
John Koleszar's avatar
John Koleszar committed
866
        {
867
868
869
870
871
872
873
874
            ptrdiff_t partition_size = read_available_partition_size(
                                                 pbi,
                                                 token_part_sizes,
                                                 pbi->fragments[fragment_idx],
                                                 first_fragment_end,
                                                 fragment_end,
                                                 fragment_idx - 1,
                                                 num_token_partitions);
875
876
            pbi->fragment_sizes[fragment_idx] = (unsigned int)partition_size;
            fragment_size -= (unsigned int)partition_size;
877
878
879
880
881
882
883
884
885
            assert(fragment_idx <= num_token_partitions);
            if (fragment_size > 0)
            {
                /* The fragment contains an additional partition.
                 * Move to next. */
                fragment_idx++;
                pbi->fragments[fragment_idx] =
                    pbi->fragments[fragment_idx - 1] + partition_size;
            }
John Koleszar's avatar
John Koleszar committed
886
        }
887
888
889
    }

    pbi->num_fragments = num_token_partitions + 1;
John Koleszar's avatar
John Koleszar committed
890

891
892
893
894
895
896
897
898
    for (partition_idx = 1; partition_idx < pbi->num_fragments; ++partition_idx)
    {
        if (vp8dx_start_decode(bool_decoder,
                               pbi->fragments[partition_idx],
                               pbi->fragment_sizes[partition_idx]))
            vpx_internal_error(&pbi->common.error, VPX_CODEC_MEM_ERROR,
                               "Failed to allocate bool decoder %d",
                               partition_idx);
John Koleszar's avatar
John Koleszar committed
899
900
901
902

        bool_decoder++;
    }

903
#if CONFIG_MULTITHREAD
John Koleszar's avatar
John Koleszar committed
904
    /* Clamp number of decoder threads */
905
906
    if (pbi->decoding_thread_count > num_token_partitions - 1)
        pbi->decoding_thread_count = num_token_partitions - 1;
907
#endif
John Koleszar's avatar
John Koleszar committed
908
909
910
911
912
913
914
}

static void stop_token_decoder(VP8D_COMP *pbi)
{
    VP8_COMMON *pc = &pbi->common;

    if (pc->multi_token_partition != ONE_PARTITION)
James Zern's avatar
James Zern committed
915
    {
John Koleszar's avatar
John Koleszar committed
916
        vpx_free(pbi->mbc);
James Zern's avatar
James Zern committed
917
918
        pbi->mbc = NULL;
    }
John Koleszar's avatar
John Koleszar committed
919
920
921
922
923
924
925
926
927
}

static void init_frame(VP8D_COMP *pbi)
{
    VP8_COMMON *const pc = & pbi->common;
    MACROBLOCKD *const xd  = & pbi->mb;

    if (pc->frame_type == KEY_FRAME)
    {
928
        /* Various keyframe initializations */
John Koleszar's avatar
John Koleszar committed
929
930
931
932
933
934
        vpx_memcpy(pc->fc.mvc, vp8_default_mv_context, sizeof(vp8_default_mv_context));

        vp8_init_mbmode_probs(pc);

        vp8_default_coef_probs(pc);

935
        /* reset the segment feature data to 0 with delta coding (Default state). */
John Koleszar's avatar
John Koleszar committed
936
937
938
        vpx_memset(xd->segment_feature_data, 0, sizeof(xd->segment_feature_data));
        xd->mb_segement_abs_delta = SEGMENT_DELTADATA;

939
        /* reset the mode ref deltasa for loop filter */
John Koleszar's avatar
John Koleszar committed
940
941
942
        vpx_memset(xd->ref_lf_deltas, 0, sizeof(xd->ref_lf_deltas));
        vpx_memset(xd->mode_lf_deltas, 0, sizeof(xd->mode_lf_deltas));

943
        /* All buffers are implicitly updated on key frames. */
John Koleszar's avatar
John Koleszar committed
944
945
946
947
948
        pc->refresh_golden_frame = 1;
        pc->refresh_alt_ref_frame = 1;
        pc->copy_buffer_to_gf = 0;
        pc->copy_buffer_to_arf = 0;

949
950
951
        /* Note that Golden and Altref modes cannot be used on a key frame so
         * ref_frame_sign_bias[] is undefined and meaningless
         */
John Koleszar's avatar
John Koleszar committed
952
953
954
955
956
        pc->ref_frame_sign_bias[GOLDEN_FRAME] = 0;
        pc->ref_frame_sign_bias[ALTREF_FRAME] = 0;
    }
    else
    {
957
        /* To enable choice of different interploation filters */
Scott LaVarnway's avatar
Scott LaVarnway committed
958
        if (!pc->use_bilinear_mc_filter)
John Koleszar's avatar
John Koleszar committed
959
        {
John Koleszar's avatar
John Koleszar committed
960
961
962
963
            xd->subpixel_predict        = vp8_sixtap_predict4x4;
            xd->subpixel_predict8x4     = vp8_sixtap_predict8x4;
            xd->subpixel_predict8x8     = vp8_sixtap_predict8x8;
            xd->subpixel_predict16x16   = vp8_sixtap_predict16x16;
John Koleszar's avatar
John Koleszar committed
964
965
966
        }
        else
        {
John Koleszar's avatar
John Koleszar committed
967
968
969
970
            xd->subpixel_predict        = vp8_bilinear_predict4x4;
            xd->subpixel_predict8x4     = vp8_bilinear_predict8x4;
            xd->subpixel_predict8x8     = vp8_bilinear_predict8x8;
            xd->subpixel_predict16x16   = vp8_bilinear_predict16x16;
John Koleszar's avatar
John Koleszar committed
971
        }
972
973
974

        if (pbi->decoded_key_frame && pbi->ec_enabled && !pbi->ec_active)
            pbi->ec_active = 1;
John Koleszar's avatar
John Koleszar committed
975
976
    }

977
    xd->left_context = &pc->left_context;
John Koleszar's avatar
John Koleszar committed
978
979
    xd->mode_info_context = pc->mi;
    xd->frame_type = pc->frame_type;
980
    xd->mode_info_context->mbmi.mode = DC_PRED;
John Koleszar's avatar
John Koleszar committed
981
    xd->mode_info_stride = pc->mode_info_stride;
982
    xd->corrupted = 0; /* init without corruption */
983
984
985
986
987

    xd->fullpixel_mask = 0xffffffff;
    if(pc->full_pixel)
        xd->fullpixel_mask = 0xfffffff8;

John Koleszar's avatar
John Koleszar committed
988
989
990
991
992
993
994
}

int vp8_decode_frame(VP8D_COMP *pbi)
{
    vp8_reader *const bc = & pbi->bc;
    VP8_COMMON *const pc = & pbi->common;
    MACROBLOCKD *const xd  = & pbi->mb;
995
996
    const unsigned char *data = pbi->fragments[0];
    const unsigned char *data_end =  data + pbi->fragment_sizes[0];
997
    ptrdiff_t first_partition_length_in_bytes;
John Koleszar's avatar
John Koleszar committed
998
999
1000

    int i, j, k, l;
    const int *const mb_feature_data_bits = vp8_mb_feature_data_bits;
1001
1002
    int corrupt_tokens = 0;
    int prev_independent_partitions = pbi->independent_partitions;
John Koleszar's avatar
John Koleszar committed
1003

1004
1005
    int frame_size_change = 0;

1006
1007
1008
1009
    /* start with no corruption of current frame */
    xd->corrupted = 0;
    pc->yv12_fb[pc->new_fb_idx].corrupted = 0;

1010
    if (data_end - data < 3)
John Koleszar's avatar
John Koleszar committed
1011
    {
Johann's avatar
Johann committed
1012
        if (!pbi->ec_active)
1013
1014
1015
1016
        {
            vpx_internal_error(&pc->error, VPX_CODEC_CORRUPT_FRAME,
                               "Truncated packet");
        }
Johann's avatar
Johann committed
1017
1018
1019
1020
1021
1022
1023
1024

        /* Declare the missing frame as an inter frame since it will
           be handled as an inter frame when we have estimated its
           motion vectors. */
        pc->frame_type = INTER_FRAME;
        pc->version = 0;
        pc->show_frame = 1;
        first_partition_length_in_bytes = 0;
1025
1026
1027
1028
1029
1030
1031
1032
    }
    else
    {
        pc->frame_type = (FRAME_TYPE)(data[0] & 1);
        pc->version = (data[0] >> 1) & 7;
        pc->show_frame = (data[0] >> 4) & 1;
        first_partition_length_in_bytes =
            (data[0] | (data[1] << 8) | (data[2] << 16)) >> 5;
John Koleszar's avatar
John Koleszar committed
1033

1034
        if (!pbi->ec_active && (data + first_partition_length_in_bytes > data_end
1035
1036
1037
            || data + first_partition_length_in_bytes < data))
            vpx_internal_error(&pc->error, VPX_CODEC_CORRUPT_FRAME,
                               "Truncated packet or corrupt partition 0 length");
1038
1039
1040

        data += 3;

1041
        vp8_setup_version(pc);
John Koleszar's avatar
John Koleszar committed
1042

1043
        if (pc->frame_type == KEY_FRAME)
John Koleszar's avatar
John Koleszar committed
1044
        {
1045
1046
1047
1048
1049
1050
1051
            const int Width = pc->Width;
            const int Height = pc->Height;

            /* vet via sync code */
            /* When error concealment is enabled we should only check the sync
             * code if we have enough bits available
             */
1052
            if (!pbi->ec_active || data + 3 < data_end)
John Koleszar's avatar
John Koleszar committed
1053
            {
1054
1055
1056
                if (data[0] != 0x9d || data[1] != 0x01 || data[2] != 0x2a)
                    vpx_internal_error(&pc->error, VPX_CODEC_UNSUP_BITSTREAM,
                                   "Invalid frame sync code");
John Koleszar's avatar
John Koleszar committed
1057
1058
            }

1059
1060
1061
1062
            /* If error concealment is enabled we should only parse the new size
             * if we have enough data. Otherwise we will end up with the wrong
             * size.
             */
1063
            if (!pbi->ec_active || data + 6 < data_end)
John Koleszar's avatar
John Koleszar committed
1064
            {
1065
1066
1067
1068
                pc->Width = (data[3] | (data[4] << 8)) & 0x3fff;
                pc->horiz_scale = data[4] >> 6;
                pc->Height = (data[5] | (data[6] << 8)) & 0x3fff;
                pc->vert_scale = data[6] >> 6;
John Koleszar's avatar
John Koleszar committed
1069
            }
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
            data += 7;

            if (Width != pc->Width  ||  Height != pc->Height)
            {
                int prev_mb_rows = pc->mb_rows;

                if (pc->Width <= 0)
                {
                    pc->Width = Width;
                    vpx_internal_error(&pc->error, VPX_CODEC_CORRUPT_FRAME,
                                       "Invalid frame width");
                }

                if (pc->Height <= 0)
                {
                    pc->Height = Height;
                    vpx_internal_error(&pc->error, VPX_CODEC_CORRUPT_FRAME,
                                       "Invalid frame height");
                }
John Koleszar's avatar
John Koleszar committed
1089

1090
1091
1092
1093
                if (vp8_alloc_frame_buffers(pc, pc->Width, pc->Height))
                    vpx_internal_error(&pc->error, VPX_CODEC_MEM_ERROR,
                                       "Failed to allocate frame buffers");

1094
                /* allocate memory for last frame MODE_INFO array */
1095
#if CONFIG_ERROR_CONCEALMENT
1096

1097
1098
                if (pbi->ec_enabled)
                {
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
                    /* old prev_mip was released by vp8_de_alloc_frame_buffers()
                     * called in vp8_alloc_frame_buffers() */
                    pc->prev_mip = vpx_calloc(
                                       (pc->mb_cols + 1) * (pc->mb_rows + 1),
                                       sizeof(MODE_INFO));

                    if (!pc->prev_mip)
                    {
                        vp8_de_alloc_frame_buffers(pc);
                        vpx_internal_error(&pc->error, VPX_CODEC_MEM_ERROR,
                                           "Failed to allocate"
                                           "last frame MODE_INFO array");
                    }

                    pc->prev_mi = pc->prev_mip + pc->mode_info_stride + 1;

1115
1116
1117
1118
1119
                    if (vp8_alloc_overlap_lists(pbi))
                        vpx_internal_error(&pc->error, VPX_CODEC_MEM_ERROR,
                                           "Failed to allocate overlap lists "
                                           "for error concealment");
                }
1120

1121
#endif
1122
1123

#if CONFIG_MULTITHREAD
1124
1125
                if (pbi->b_multithreaded_rd)
                    vp8mt_alloc_temp_buffers(pbi, pc->Width, prev_mb_rows);
John Koleszar's avatar
John Koleszar committed
1126
1127
#else
                (void)prev_mb_rows;
1128
#endif
1129
                frame_size_change = 1;
1130
            }
John Koleszar's avatar
John Koleszar committed
1131
1132
1133
        }
    }

1134
1135
    if ((!pbi->decoded_key_frame && pc->frame_type != KEY_FRAME) ||
        pc->Width == 0 || pc->Height == 0)
John Koleszar's avatar
John Koleszar committed
1136
1137
1138
1139
1140
1141
    {
        return -1;
    }

    init_frame(pbi);

1142
    if (vp8dx_start_decode(bc, data, (unsigned int)(data_end - data)))
John Koleszar's avatar
John Koleszar committed
1143
1144
1145
1146
1147
1148
1149
        vpx_internal_error(&pc->error, VPX_CODEC_MEM_ERROR,
                           "Failed to allocate bool decoder 0");
    if (pc->frame_type == KEY_FRAME) {
        pc->clr_type    = (YUV_TYPE)vp8_read_bit(bc);
        pc->clamp_type  = (CLAMP_TYPE)vp8_read_bit(bc);
    }

1150
    /* Is segmentation enabled */
John Koleszar's avatar
John Koleszar committed
1151
1152
1153
1154
    xd->segmentation_enabled = (unsigned char)vp8_read_bit(bc);

    if (xd->segmentation_enabled)
    {
1155
        /* Signal whether or not the segmentation map is being explicitly updated this frame. */
John Koleszar's avatar
John Koleszar committed
1156
1157
1158
1159
1160
1161
1162
1163
1164
        xd->update_mb_segmentation_map = (unsigned char)vp8_read_bit(bc);
        xd->update_mb_segmentation_data = (unsigned char)vp8_read_bit(bc);

        if (xd->update_mb_segmentation_data)
        {
            xd->mb_segement_abs_delta = (unsigned char)vp8_read_bit(bc);

            vpx_memset(xd->segment_feature_data, 0, sizeof(xd->segment_feature_data));

1165
            /* For each segmentation feature (Quant and loop filter level) */
John Koleszar's avatar
John Koleszar committed
1166
1167
1168
1169
            for (i = 0; i < MB_LVL_MAX; i++)
            {
                for (j = 0; j < MAX_MB_SEGMENTS; j++)
                {
1170
                    /* Frame level data */
John Koleszar's avatar
John Koleszar committed
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
                    if (vp8_read_bit(bc))
                    {
                        xd->segment_feature_data[i][j] = (signed char)vp8_read_literal(bc, mb_feature_data_bits[i]);

                        if (vp8_read_bit(bc))
                            xd->segment_feature_data[i][j] = -xd->segment_feature_data[i][j];
                    }
                    else
                        xd->segment_feature_data[i][j] = 0;
                }
            }
        }

        if (xd->update_mb_segmentation_map)
        {
1186
            /* Which macro block level features are enabled */
John Koleszar's avatar
John Koleszar committed
1187
1188
            vpx_memset(xd->mb_segment_tree_probs, 255, sizeof(xd->mb_segment_tree_probs));

1189
            /* Read the probs used to decode the segment id for each macro block. */
John Koleszar's avatar
John Koleszar committed
1190
1191
            for (i = 0; i < MB_FEATURE_TREE_PROBS; i++)
            {
1192
                /* If not explicitly set value is defaulted to 255 by memset above */
John Koleszar's avatar
John Koleszar committed
1193
1194
1195
1196
1197
                if (vp8_read_bit(bc))
                    xd->mb_segment_tree_probs[i] = (vp8_prob)vp8_read_literal(bc, 8);
            }
        }
    }
1198
1199
1200
1201
1202
1203
    else
    {
        /* No segmentation updates on this frame */
        xd->update_mb_segmentation_map = 0;
        xd->update_mb_segmentation_data = 0;
    }
John Koleszar's avatar
John Koleszar committed
1204

1205
    /* Read the loop filter level and type */
John Koleszar's avatar
John Koleszar committed
1206
1207
1208
1209
    pc->filter_type = (LOOPFILTERTYPE) vp8_read_bit(bc);
    pc->filter_level = vp8_read_literal(bc, 6);
    pc->sharpness_level = vp8_read_literal(bc, 3);

1210
    /* Read in loop filter deltas applied at the MB level based on mode or ref frame. */
John Koleszar's avatar
John Koleszar committed
1211
1212
1213
1214
1215
    xd->mode_ref_lf_delta_update = 0;
    xd->mode_ref_lf_delta_enabled = (unsigned char)vp8_read_bit(bc);

    if (xd->mode_ref_lf_delta_enabled)
    {
1216
        /* Do the deltas need to be updated */
John Koleszar's avatar
John Koleszar committed
1217
1218
1219
1220
        xd->mode_ref_lf_delta_update = (unsigned char)vp8_read_bit(bc);

        if (xd->mode_ref_lf_delta_update)
        {
1221
            /* Send update */
John Koleszar's avatar
John Koleszar committed
1222
1223
1224
1225
            for (i = 0; i < MAX_REF_LF_DELTAS; i++)
            {
                if (vp8_read_bit(bc))
                {
1226
                    /*sign = vp8_read_bit( bc );*/
John Koleszar's avatar
John Koleszar committed
1227
1228
                    xd->ref_lf_deltas[i] = (signed char)vp8_read_literal(bc, 6);

1229
                    if (vp8_read_bit(bc))        /* Apply sign */
John Koleszar's avatar
John Koleszar committed
1230
1231
1232
1233
                        xd->ref_lf_deltas[i] = xd->ref_lf_deltas[i] * -1;
                }
            }

1234
            /* Send update */
John Koleszar's avatar
John Koleszar committed
1235
1236
1237
1238
            for (i = 0; i < MAX_MODE_LF_DELTAS; i++)
            {
                if (vp8_read_bit(bc))
                {
1239
                    /*sign = vp8_read_bit( bc );*/
John Koleszar's avatar
John Koleszar committed
1240
1241
                    xd->mode_lf_deltas[i] = (signed char)vp8_read_literal(bc, 6);

1242
                    if (vp8_read_bit(bc))        /* Apply sign */
John Koleszar's avatar
John Koleszar committed
1243
1244
1245
1246
1247
1248
                        xd->mode_lf_deltas[i] = xd->mode_lf_deltas[i] * -1;
                }
            }
        }
    }

1249
1250
    setup_token_decoder(pbi, data + first_partition_length_in_bytes);

John Koleszar's avatar
John Koleszar committed
1251
1252
    xd->current_bc = &pbi->bc2;

1253
    /* Read the default quantizers. */
John Koleszar's avatar
John Koleszar committed
1254
1255
1256
    {
        int Q, q_update;

1257
        Q = vp8_read_literal(bc, 7);  /* AC 1st order Q = default */
John Koleszar's avatar
John Koleszar committed
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
        pc->