decodframe.c 45.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 "onyxd_int.h"
John Koleszar's avatar
John Koleszar committed
13 14 15 16 17
#include "vp8/common/header.h"
#include "vp8/common/reconintra.h"
#include "vp8/common/reconintra4x4.h"
#include "vp8/common/recon.h"
#include "vp8/common/reconinter.h"
John Koleszar's avatar
John Koleszar committed
18 19
#include "dequantize.h"
#include "detokenize.h"
John Koleszar's avatar
John Koleszar committed
20 21 22 23
#include "vp8/common/invtrans.h"
#include "vp8/common/alloccommon.h"
#include "vp8/common/entropymode.h"
#include "vp8/common/quant_common.h"
24 25
#include "vpx_scale/vpxscale.h"
#include "vpx_scale/yv12extend.h"
John Koleszar's avatar
John Koleszar committed
26
#include "vp8/common/setupintrarecon.h"
Scott LaVarnway's avatar
Scott LaVarnway committed
27

John Koleszar's avatar
John Koleszar committed
28
#include "decodemv.h"
John Koleszar's avatar
John Koleszar committed
29
#include "vp8/common/extend.h"
30 31 32
#if CONFIG_ERROR_CONCEALMENT
#include "error_concealment.h"
#endif
John Koleszar's avatar
John Koleszar committed
33
#include "vpx_mem/vpx_mem.h"
John Koleszar's avatar
John Koleszar committed
34
#include "vp8/common/idct.h"
John Koleszar's avatar
John Koleszar committed
35
#include "dequantize.h"
John Koleszar's avatar
John Koleszar committed
36
#include "vp8/common/threading.h"
John Koleszar's avatar
John Koleszar committed
37 38 39
#include "decoderthreading.h"
#include "dboolhuff.h"

40
//#if CONFIG_SEGFEATURES
41 42
#include "vp8/common/seg_common.h"

John Koleszar's avatar
John Koleszar committed
43 44 45
#include <assert.h>
#include <stdio.h>

46 47 48 49
#ifdef DEC_DEBUG
int dec_debug = 0;
#endif

John Koleszar's avatar
John Koleszar committed
50 51 52 53 54 55 56 57
void vp8cx_init_de_quantizer(VP8D_COMP *pbi)
{
    int i;
    int Q;
    VP8_COMMON *const pc = & pbi->common;

    for (Q = 0; Q < QINDEX_RANGE; Q++)
    {
58 59 60
        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
61

62
        /* all the ac values = ; */
John Koleszar's avatar
John Koleszar committed
63 64 65 66
        for (i = 1; i < 16; i++)
        {
            int rc = vp8_default_zig_zag1d[i];

67 68 69
            pc->Y1dequant[Q][rc] = (short)vp8_ac_yquant(Q);
            pc->Y2dequant[Q][rc] = (short)vp8_ac2quant(Q, pc->y2ac_delta_q);
            pc->UVdequant[Q][rc] = (short)vp8_ac_uv_quant(Q, pc->uvac_delta_q);
John Koleszar's avatar
John Koleszar committed
70 71 72 73
        }
    }
}

74
void mb_init_dequantizer(VP8D_COMP *pbi, MACROBLOCKD *xd)
John Koleszar's avatar
John Koleszar committed
75 76 77 78
{
    int i;
    int QIndex;
    VP8_COMMON *const pc = & pbi->common;
Paul Wilkins's avatar
Paul Wilkins committed
79
    int segment_id = xd->mode_info_context->mbmi.segment_id;
John Koleszar's avatar
John Koleszar committed
80

Paul Wilkins's avatar
Paul Wilkins committed
81
    // Set the Q baseline allowing for any segment level adjustment
82
//#if CONFIG_SEGFEATURES
83
    if ( segfeature_active( xd, segment_id, SEG_LVL_ALT_Q ) )
John Koleszar's avatar
John Koleszar committed
84
    {
85
        /* Abs Value */
John Koleszar's avatar
John Koleszar committed
86
        if (xd->mb_segement_abs_delta == SEGMENT_ABSDATA)
Paul Wilkins's avatar
Paul Wilkins committed
87
            QIndex = get_segdata( xd, segment_id, SEG_LVL_ALT_Q );
John Koleszar's avatar
John Koleszar committed
88

89
        /* Delta Value */
John Koleszar's avatar
John Koleszar committed
90 91
        else
        {
92
            QIndex = pc->base_qindex +
Paul Wilkins's avatar
Paul Wilkins committed
93
                     get_segdata( xd, segment_id, SEG_LVL_ALT_Q );
94
            QIndex = (QIndex >= 0) ? ((QIndex <= MAXQ) ? QIndex : MAXQ) : 0;    /* Clamp to valid range */
John Koleszar's avatar
John Koleszar committed
95 96 97 98 99
        }
    }
    else
        QIndex = pc->base_qindex;

100
    /* Set up the block level dequant pointers */
John Koleszar's avatar
John Koleszar committed
101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120
    for (i = 0; i < 16; i++)
    {
        xd->block[i].dequant = pc->Y1dequant[QIndex];
    }

    for (i = 16; i < 24; i++)
    {
        xd->block[i].dequant = pc->UVdequant[QIndex];
    }

    xd->block[24].dequant = pc->Y2dequant[QIndex];

}

#if CONFIG_RUNTIME_CPU_DETECT
#define RTCD_VTABLE(x) (&(pbi)->common.rtcd.x)
#else
#define RTCD_VTABLE(x) NULL
#endif

121 122 123
/* skip_recon_mb() is Modified: Instead of writing the result to predictor buffer and then copying it
 *  to dst buffer, we can write the result directly to dst buffer. This eliminates unnecessary copy.
 */
John Koleszar's avatar
John Koleszar committed
124 125
static void skip_recon_mb(VP8D_COMP *pbi, MACROBLOCKD *xd)
{
126
    if (xd->mode_info_context->mbmi.ref_frame == INTRA_FRAME)
John Koleszar's avatar
John Koleszar committed
127
    {
128
        RECON_INVOKE(&pbi->common.rtcd.recon, build_intra_predictors_mbuv_s)(xd);
129 130
        RECON_INVOKE(&pbi->common.rtcd.recon,
                     build_intra_predictors_mby_s)(xd);
John Koleszar's avatar
John Koleszar committed
131 132 133
    }
    else
    {
134 135 136
        vp8_build_inter16x16_predictors_mb(xd, xd->dst.y_buffer,
                                           xd->dst.u_buffer, xd->dst.v_buffer,
                                           xd->dst.y_stride, xd->dst.uv_stride);
137 138 139 140 141 142 143 144 145 146
#ifdef DEC_DEBUG
        if (dec_debug) {
          int i, j;
          printf("Generating predictors\n");
          for (i=0;i<16;i++) {
            for (j=0;j<16;j++) printf("%3d ", xd->dst.y_buffer[i*xd->dst.y_stride+j]);
            printf("\n");
          }
        }
#endif
John Koleszar's avatar
John Koleszar committed
147 148 149
    }
}

150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171
static void clamp_mv_to_umv_border(MV *mv, const MACROBLOCKD *xd)
{
    /* If the MV points so far into the UMV border that no visible pixels
     * are used for reconstruction, the subpel part of the MV can be
     * discarded and the MV limited to 16 pixels with equivalent results.
     *
     * This limit kicks in at 19 pixels for the top and left edges, for
     * the 16 pixels plus 3 taps right of the central pixel when subpel
     * filtering. The bottom and right edges use 16 pixels plus 2 pixels
     * left of the central pixel when filtering.
     */
    if (mv->col < (xd->mb_to_left_edge - (19 << 3)))
        mv->col = xd->mb_to_left_edge - (16 << 3);
    else if (mv->col > xd->mb_to_right_edge + (18 << 3))
        mv->col = xd->mb_to_right_edge + (16 << 3);

    if (mv->row < (xd->mb_to_top_edge - (19 << 3)))
        mv->row = xd->mb_to_top_edge - (16 << 3);
    else if (mv->row > xd->mb_to_bottom_edge + (18 << 3))
        mv->row = xd->mb_to_bottom_edge + (16 << 3);
}

172 173 174
/* A version of the above function for chroma block MVs.*/
static void clamp_uvmv_to_umv_border(MV *mv, const MACROBLOCKD *xd)
{
Scott LaVarnway's avatar
Scott LaVarnway committed
175 176 177 178 179
    mv->col = (2*mv->col < (xd->mb_to_left_edge - (19 << 3))) ? (xd->mb_to_left_edge - (16 << 3)) >> 1 : mv->col;
    mv->col = (2*mv->col > xd->mb_to_right_edge + (18 << 3)) ? (xd->mb_to_right_edge + (16 << 3)) >> 1 : mv->col;

    mv->row = (2*mv->row < (xd->mb_to_top_edge - (19 << 3))) ? (xd->mb_to_top_edge - (16 << 3)) >> 1 : mv->row;
    mv->row = (2*mv->row > xd->mb_to_bottom_edge + (18 << 3)) ? (xd->mb_to_bottom_edge + (16 << 3)) >> 1 : mv->row;
180
}
181

182
void clamp_mvs(MACROBLOCKD *xd)
John Koleszar's avatar
John Koleszar committed
183
{
184
    if (xd->mode_info_context->mbmi.mode == SPLITMV)
185 186 187 188 189
    {
        int i;

        for (i=0; i<16; i++)
            clamp_mv_to_umv_border(&xd->block[i].bmi.mv.as_mv, xd);
190 191
        for (i=16; i<24; i++)
            clamp_uvmv_to_umv_border(&xd->block[i].bmi.mv.as_mv, xd);
192 193 194
    }
    else
    {
195
        clamp_mv_to_umv_border(&xd->mode_info_context->mbmi.mv.as_mv, xd);
196
        clamp_uvmv_to_umv_border(&xd->block[16].bmi.mv.as_mv, xd);
197 198 199
    }

}
Yaowu Xu's avatar
Yaowu Xu committed
200 201
#if CONFIG_I8X8
extern const int vp8_i8x8_block[4];
202

Yaowu Xu's avatar
Yaowu Xu committed
203
#endif
204 205
static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd,
                              unsigned int mb_idx)
John Koleszar's avatar
John Koleszar committed
206
{
207
    int eobtotal = 0;
208
    int throw_residual = 0;
Gaute Strokkenes's avatar
Gaute Strokkenes committed
209 210
    MB_PREDICTION_MODE mode;
    int i;
211

Paul Wilkins's avatar
Paul Wilkins committed
212 213 214 215 216
#if CONFIG_T8X8
    int tx_type = get_seg_tx_type(xd, xd->mode_info_context->mbmi.segment_id);
#endif


217
    if (xd->mode_info_context->mbmi.mb_skip_coeff)
218 219 220
    {
        vp8_reset_mb_tokens_context(xd);
    }
221
    else if (!vp8dx_bool_error(xd->current_bc))
222
    {
223 224 225 226 227 228 229

#if CONFIG_T8X8
        for(i = 0; i < 25; i++)
        {
            xd->block[i].eob = 0;
            xd->eobs[i] = 0;
        }
Paul Wilkins's avatar
Paul Wilkins committed
230 231
        if ( tx_type == TX_8X8 )
        {
232
            eobtotal = vp8_decode_mb_tokens_8x8(pbi, xd);
Paul Wilkins's avatar
Paul Wilkins committed
233
        }
234 235 236 237 238 239 240 241 242 243 244 245 246
        else
#endif
            eobtotal = vp8_decode_mb_tokens(pbi, xd);
#ifdef DEC_DEBUG
        if (dec_debug) {
            printf("\nTokens (%d)\n", eobtotal);
            for (i =0; i<400; i++) {
                printf("%3d ", xd->qcoeff[i]);
                if (i%16 == 15) printf("\n");
            }
            printf("\n");
        }
#endif
247 248 249
    }

    /* Perform temporary clamping of the MV to be used for prediction */
Gaute Strokkenes's avatar
Gaute Strokkenes committed
250
    if (xd->mode_info_context->mbmi.need_to_clamp_mvs)
251 252 253 254
    {
        clamp_mvs(xd);
    }

Gaute Strokkenes's avatar
Gaute Strokkenes committed
255 256
    mode = xd->mode_info_context->mbmi.mode;

Yaowu Xu's avatar
Yaowu Xu committed
257 258 259 260 261 262
    if (eobtotal == 0 && mode != B_PRED && mode != SPLITMV
#if CONFIG_I8X8
        && mode != I8X8_PRED
#endif
        &&!vp8dx_bool_error(xd->current_bc)
        )
263
    {
Scott LaVarnway's avatar
Scott LaVarnway committed
264
        /* Special case:  Force the loopfilter to skip when eobtotal and
Yaowu Xu's avatar
Yaowu Xu committed
265 266
         * mb_skip_coeff are zero.
         * */
Scott LaVarnway's avatar
Scott LaVarnway committed
267 268
        xd->mode_info_context->mbmi.mb_skip_coeff = 1;

269 270 271
        skip_recon_mb(pbi, xd);
        return;
    }
Yaowu Xu's avatar
Yaowu Xu committed
272

273 274 275
    if (xd->segmentation_enabled)
        mb_init_dequantizer(pbi, xd);

276
    /* do prediction */
277
    if (xd->mode_info_context->mbmi.ref_frame == INTRA_FRAME)
John Koleszar's avatar
John Koleszar committed
278
    {
Yaowu Xu's avatar
Yaowu Xu committed
279 280 281 282
#if CONFIG_I8X8
        if(mode != I8X8_PRED)
        {
#endif
283
        RECON_INVOKE(&pbi->common.rtcd.recon, build_intra_predictors_mbuv)(xd);
John Koleszar's avatar
John Koleszar committed
284

Gaute Strokkenes's avatar
Gaute Strokkenes committed
285
        if (mode != B_PRED)
John Koleszar's avatar
John Koleszar committed
286
        {
287
            RECON_INVOKE(&pbi->common.rtcd.recon,
Yaowu Xu's avatar
Yaowu Xu committed
288
                         build_intra_predictors_mby)(xd);
289 290
        } else {
            vp8_intra_prediction_down_copy(xd);
John Koleszar's avatar
John Koleszar committed
291
        }
Yaowu Xu's avatar
Yaowu Xu committed
292 293 294
#if CONFIG_I8X8
        }
#endif
John Koleszar's avatar
John Koleszar committed
295 296 297 298 299
    }
    else
    {
        vp8_build_inter_predictors_mb(xd);
    }
300 301 302 303 304 305 306
    /* 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));

307
#if CONFIG_ERROR_CONCEALMENT
308 309
    if (pbi->ec_active &&
        (mb_idx >= pbi->mvs_corrupt_from_mb || throw_residual))
310 311
    {
        /* MB with corrupt residuals or corrupt mode/motion vectors.
Yaowu Xu's avatar
Yaowu Xu committed
312 313
         * Better to use the predictor as reconstruction.
         */
314
        pbi->frame_corrupt_residual = 1;
315
        vpx_memset(xd->qcoeff, 0, sizeof(xd->qcoeff));
316 317 318 319 320
        vp8_conceal_corrupt_mb(xd);
        return;
    }
#endif

321
    /* dequantization and idct */
Yaowu Xu's avatar
Yaowu Xu committed
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
#if CONFIG_I8X8
    if (mode == I8X8_PRED)
    {
        for (i = 0; i < 4; i++)
        {
            int ib = vp8_i8x8_block[i];
            const int iblock[4]={0,1,4,5};
            int j;
            int i8x8mode;
            BLOCKD *b;

            b = &xd->block[ib];
            i8x8mode= b->bmi.as_mode;
            RECON_INVOKE(RTCD_VTABLE(recon), intra8x8_predict)
                          (b, i8x8mode, b->predictor);

            for(j = 0; j < 4; j++)
            {
                b = &xd->block[ib+iblock[j]];
                if (xd->eobs[ib+iblock[j]] > 1)
                {
                    DEQUANT_INVOKE(&pbi->dequant, idct_add)
                        (b->qcoeff, b->dequant,  b->predictor,
                        *(b->base_dst) + b->dst, 16, b->dst_stride);
                }
                else
                {
                    IDCT_INVOKE(RTCD_VTABLE(idct), idct1_scalar_add)
                        (b->qcoeff[0] * b->dequant[0], b->predictor,
                        *(b->base_dst) + b->dst, 16, b->dst_stride);
                    ((int *)b->qcoeff)[0] = 0;
                }
            }

            b = &xd->block[16+i];
            RECON_INVOKE(RTCD_VTABLE(recon), intra_uv4x4_predict)
                          (b, i8x8mode, b->predictor);
            DEQUANT_INVOKE(&pbi->dequant, idct_add)
                (b->qcoeff, b->dequant,  b->predictor,
                *(b->base_dst) + b->dst, 8, b->dst_stride);
            b = &xd->block[20+i];
            RECON_INVOKE(RTCD_VTABLE(recon), intra_uv4x4_predict)
                          (b, i8x8mode, b->predictor);
            DEQUANT_INVOKE(&pbi->dequant, idct_add)
                (b->qcoeff, b->dequant,  b->predictor,
                *(b->base_dst) + b->dst, 8, b->dst_stride);
        }
    }
    else
#endif
Gaute Strokkenes's avatar
Gaute Strokkenes committed
372
    if (mode == B_PRED)
John Koleszar's avatar
John Koleszar committed
373
    {
374
        for (i = 0; i < 16; i++)
John Koleszar's avatar
John Koleszar committed
375
        {
376
            BLOCKD *b = &xd->block[i];
377 378
            int b_mode = xd->mode_info_context->bmi[i].as_mode;

379
            RECON_INVOKE(RTCD_VTABLE(recon), intra4x4_predict)
380
                          (b, b_mode, b->predictor);
John Koleszar's avatar
John Koleszar committed
381

Fritz Koenig's avatar
Fritz Koenig committed
382
            if (xd->eobs[i] > 1)
John Koleszar's avatar
John Koleszar committed
383
            {
Fritz Koenig's avatar
Fritz Koenig committed
384
                DEQUANT_INVOKE(&pbi->dequant, idct_add)
385
                    (b->qcoeff, b->dequant,  b->predictor,
Fritz Koenig's avatar
Fritz Koenig committed
386
                    *(b->base_dst) + b->dst, 16, b->dst_stride);
John Koleszar's avatar
John Koleszar committed
387 388 389
            }
            else
            {
Fritz Koenig's avatar
Fritz Koenig committed
390
                IDCT_INVOKE(RTCD_VTABLE(idct), idct1_scalar_add)
391
                    (b->qcoeff[0] * b->dequant[0], b->predictor,
Fritz Koenig's avatar
Fritz Koenig committed
392
                    *(b->base_dst) + b->dst, 16, b->dst_stride);
John Koleszar's avatar
John Koleszar committed
393 394 395 396
                ((int *)b->qcoeff)[0] = 0;
            }
        }
    }
Gaute Strokkenes's avatar
Gaute Strokkenes committed
397
    else if (mode == SPLITMV)
John Koleszar's avatar
John Koleszar committed
398
    {
399 400 401 402
        DEQUANT_INVOKE (&pbi->dequant, idct_add_y_block)
            (xd->qcoeff, xd->block[0].dequant,
            xd->predictor, xd->dst.y_buffer,
            xd->dst.y_stride, xd->eobs);
John Koleszar's avatar
John Koleszar committed
403
    }
Gaute Strokkenes's avatar
Gaute Strokkenes committed
404 405 406 407
    else
    {
        BLOCKD *b = &xd->block[24];

408
#if CONFIG_T8X8
Paul Wilkins's avatar
Paul Wilkins committed
409
        if( tx_type == TX_8X8 )
Gaute Strokkenes's avatar
Gaute Strokkenes committed
410
        {
Yaowu Xu's avatar
Yaowu Xu committed
411
            DEQUANT_INVOKE(&pbi->dequant, block_2x2)(b);
412 413 414 415 416 417 418 419 420 421 422 423 424
#ifdef DEC_DEBUG
            if (dec_debug)
            {
                int j;
                printf("DQcoeff Haar\n");
                for (j=0;j<16;j++) {
                    printf("%d ", b->dqcoeff[j]);
                }
                printf("\n");
            }
#endif
            IDCT_INVOKE(RTCD_VTABLE(idct), ihaar2)(&b->dqcoeff[0], b->diff, 8);
            ((int *)b->qcoeff)[0] = 0;//2nd order block are set to 0 after inverse transform
Gaute Strokkenes's avatar
Gaute Strokkenes committed
425 426 427 428 429 430 431
            ((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;
432 433 434 435 436
            DEQUANT_INVOKE (&pbi->dequant, dc_idct_add_y_block_8x8)
                (xd->qcoeff, xd->block[0].dequant,
                xd->predictor, xd->dst.y_buffer,
                xd->dst.y_stride, xd->eobs, xd->block[24].diff, xd);

Gaute Strokkenes's avatar
Gaute Strokkenes committed
437
        }
438

Gaute Strokkenes's avatar
Gaute Strokkenes committed
439
        else
440
#endif
Yaowu Xu's avatar
Yaowu Xu committed
441
        {
442
            DEQUANT_INVOKE(&pbi->dequant, block)(b);
443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464
            if (xd->eobs[24] > 1)
            {
                IDCT_INVOKE(RTCD_VTABLE(idct), iwalsh16)(&b->dqcoeff[0], b->diff);
                ((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;
            }
            else
            {
                IDCT_INVOKE(RTCD_VTABLE(idct), iwalsh1)(&b->dqcoeff[0], b->diff);
                ((int *)b->qcoeff)[0] = 0;
            }

            DEQUANT_INVOKE (&pbi->dequant, dc_idct_add_y_block)
                (xd->qcoeff, xd->block[0].dequant,
                xd->predictor, xd->dst.y_buffer,
                xd->dst.y_stride, xd->eobs, xd->block[24].diff);
Yaowu Xu's avatar
Yaowu Xu committed
465
        }
466 467
    }
#if CONFIG_T8X8
Paul Wilkins's avatar
Paul Wilkins committed
468
    if( tx_type == TX_8X8 )
469 470 471 472 473 474 475 476 477
    {
        DEQUANT_INVOKE (&pbi->dequant, idct_add_uv_block_8x8)//
            (xd->qcoeff+16*16, xd->block[16].dequant,
            xd->predictor+16*16, xd->dst.u_buffer, xd->dst.v_buffer,
            xd->dst.uv_stride, xd->eobs+16, xd);//

    }
    else
#endif
Yaowu Xu's avatar
Yaowu Xu committed
478 479 480
#if CONFIG_I8X8
    if(xd->mode_info_context->mbmi.mode!=I8X8_PRED)
#endif
Yaowu Xu's avatar
Yaowu Xu committed
481 482 483 484
    DEQUANT_INVOKE (&pbi->dequant, idct_add_uv_block)
                    (xd->qcoeff+16*16, xd->block[16].dequant,
                     xd->predictor+16*16, xd->dst.u_buffer, xd->dst.v_buffer,
                     xd->dst.uv_stride, xd->eobs+16);
John Koleszar's avatar
John Koleszar committed
485

Yaowu Xu's avatar
Yaowu Xu committed
486
}
John Koleszar's avatar
John Koleszar committed
487

488

John Koleszar's avatar
John Koleszar committed
489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514
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



515 516
static void
decode_mb_row(VP8D_COMP *pbi, VP8_COMMON *pc, int mb_row, MACROBLOCKD *xd)
John Koleszar's avatar
John Koleszar committed
517 518 519
{
    int recon_yoffset, recon_uvoffset;
    int mb_col;
520 521 522 523
    int ref_fb_idx = pc->lst_fb_idx;
    int dst_fb_idx = pc->new_fb_idx;
    int recon_y_stride = pc->yv12_fb[ref_fb_idx].y_stride;
    int recon_uv_stride = pc->yv12_fb[ref_fb_idx].uv_stride;
John Koleszar's avatar
John Koleszar committed
524

525
    vpx_memset(&pc->left_context, 0, sizeof(pc->left_context));
John Koleszar's avatar
John Koleszar committed
526 527
    recon_yoffset = mb_row * recon_y_stride * 16;
    recon_uvoffset = mb_row * recon_uv_stride * 8;
528
    /* reset above block coeffs */
John Koleszar's avatar
John Koleszar committed
529

530
    xd->above_context = pc->above_context;
John Koleszar's avatar
John Koleszar committed
531 532 533 534 535 536 537
    xd->up_available = (mb_row != 0);

    xd->mb_to_top_edge = -((mb_row * 16)) << 3;
    xd->mb_to_bottom_edge = ((pc->mb_rows - 1 - mb_row) * 16) << 3;

    for (mb_col = 0; mb_col < pc->mb_cols; mb_col++)
    {
538 539 540 541 542 543 544 545 546
        /* 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
        {
547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567
            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);
            }
568 569
        }
#endif
John Koleszar's avatar
John Koleszar committed
570

Yaowu Xu's avatar
Yaowu Xu committed
571 572 573
#if CONFIG_I8X8
        update_blockd_bmi(xd);
#endif
574 575 576
        xd->dst.y_buffer = pc->yv12_fb[dst_fb_idx].y_buffer + recon_yoffset;
        xd->dst.u_buffer = pc->yv12_fb[dst_fb_idx].u_buffer + recon_uvoffset;
        xd->dst.v_buffer = pc->yv12_fb[dst_fb_idx].v_buffer + recon_uvoffset;
John Koleszar's avatar
John Koleszar committed
577 578 579

        xd->left_available = (mb_col != 0);

580
        /* Select the appropriate reference frame for this MB */
581
        if (xd->mode_info_context->mbmi.ref_frame == LAST_FRAME)
582
            ref_fb_idx = pc->lst_fb_idx;
583
        else if (xd->mode_info_context->mbmi.ref_frame == GOLDEN_FRAME)
584
            ref_fb_idx = pc->gld_fb_idx;
John Koleszar's avatar
John Koleszar committed
585
        else
586 587 588 589 590
            ref_fb_idx = pc->alt_fb_idx;

        xd->pre.y_buffer = pc->yv12_fb[ref_fb_idx].y_buffer + recon_yoffset;
        xd->pre.u_buffer = pc->yv12_fb[ref_fb_idx].u_buffer + recon_uvoffset;
        xd->pre.v_buffer = pc->yv12_fb[ref_fb_idx].v_buffer + recon_uvoffset;
John Koleszar's avatar
John Koleszar committed
591

592 593 594 595 596 597
        if (xd->mode_info_context->mbmi.ref_frame != INTRA_FRAME)
        {
            /* propagate errors from reference frames */
            xd->corrupted |= pc->yv12_fb[ref_fb_idx].corrupted;
        }

598
#ifdef DEC_DEBUG
Yaowu Xu's avatar
Yaowu Xu committed
599
        dec_debug = (pc->current_video_frame==0 && mb_row==1 && mb_col==11);
600
#endif
601
        decode_macroblock(pbi, xd, mb_row * pc->mb_cols  + mb_col);
John Koleszar's avatar
John Koleszar committed
602

603 604
        /* check if the boolean decoder has suffered an error */
        xd->corrupted |= vp8dx_bool_error(xd->current_bc);
John Koleszar's avatar
John Koleszar committed
605 606 607 608 609
        recon_yoffset += 16;
        recon_uvoffset += 8;

        ++xd->mode_info_context;  /* next mb */

610
        xd->above_context++;
John Koleszar's avatar
John Koleszar committed
611 612 613

    }

614
    /* adjust to the next row of mbs */
John Koleszar's avatar
John Koleszar committed
615
    vp8_extend_mb_row(
616
        &pc->yv12_fb[dst_fb_idx],
John Koleszar's avatar
John Koleszar committed
617 618 619 620 621 622 623 624 625 626 627 628 629 630
        xd->dst.y_buffer + 16, xd->dst.u_buffer + 8, xd->dst.v_buffer + 8
    );

    ++xd->mode_info_context;      /* skip prediction column */
}


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;
}

631 632 633 634
static void setup_token_decoder_partition_input(VP8D_COMP *pbi)
{
    vp8_reader *bool_decoder = &pbi->bc2;
    int part_idx = 1;
635
    int num_token_partitions;
636 637 638

    TOKEN_PARTITION multi_token_partition =
            (TOKEN_PARTITION)vp8_read_literal(&pbi->bc, 2);
639 640 641 642 643 644
    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 > pbi->num_partitions)
        vpx_internal_error(&pbi->common.error, VPX_CODEC_CORRUPT_FRAME,
                           "Partitions missing");
645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671
    assert(vp8dx_bool_error(&pbi->bc) ||
           multi_token_partition == pbi->common.multi_token_partition);
    if (pbi->num_partitions > 2)
    {
        CHECK_MEM_ERROR(pbi->mbc, vpx_malloc((pbi->num_partitions - 1) *
                                             sizeof(vp8_reader)));
        bool_decoder = pbi->mbc;
    }

    for (; part_idx < pbi->num_partitions; ++part_idx)
    {
        if (vp8dx_start_decode(bool_decoder,
                               pbi->partitions[part_idx],
                               pbi->partition_sizes[part_idx]))
            vpx_internal_error(&pbi->common.error, VPX_CODEC_MEM_ERROR,
                               "Failed to allocate bool decoder %d",
                               part_idx);

        bool_decoder++;
    }

#if CONFIG_MULTITHREAD
    /* Clamp number of decoder threads */
    if (pbi->decoding_thread_count > pbi->num_partitions - 1)
        pbi->decoding_thread_count = pbi->num_partitions - 1;
#endif
}
John Koleszar's avatar
John Koleszar committed
672

673 674 675 676 677 678 679 680 681

static int read_is_valid(const unsigned char *start,
                         size_t               len,
                         const unsigned char *end)
{
    return (start + len > start && start + len <= end);
}


John Koleszar's avatar
John Koleszar committed
682 683 684 685 686 687 688 689 690 691 692
static void setup_token_decoder(VP8D_COMP *pbi,
                                const unsigned char *cx_data)
{
    int num_part;
    int i;
    VP8_COMMON          *pc = &pbi->common;
    const unsigned char *user_data_end = pbi->Source + pbi->source_sz;
    vp8_reader          *bool_decoder;
    const unsigned char *partition;

    /* Parse number of token partitions to use */
693 694 695 696
    const TOKEN_PARTITION multi_token_partition =
            (TOKEN_PARTITION)vp8_read_literal(&pbi->bc, 2);
    /* Only update the multi_token_partition field if we are sure the value
     * is correct. */
697
    if (!pbi->ec_active || !vp8dx_bool_error(&pbi->bc))
698 699
        pc->multi_token_partition = multi_token_partition;

John Koleszar's avatar
John Koleszar committed
700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715
    num_part = 1 << pc->multi_token_partition;

    /* Set up pointers to the first partition */
    partition = cx_data;
    bool_decoder = &pbi->bc2;

    if (num_part > 1)
    {
        CHECK_MEM_ERROR(pbi->mbc, vpx_malloc(num_part * sizeof(vp8_reader)));
        bool_decoder = pbi->mbc;
        partition += 3 * (num_part - 1);
    }

    for (i = 0; i < num_part; i++)
    {
        const unsigned char *partition_size_ptr = cx_data + i * 3;
716 717 718
        ptrdiff_t            partition_size, bytes_left;

        bytes_left = user_data_end - partition;
John Koleszar's avatar
John Koleszar committed
719 720

        /* Calculate the length of this partition. The last partition
721 722 723
         * 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.
John Koleszar's avatar
John Koleszar committed
724 725 726
         */
        if (i < num_part - 1)
        {
727 728
            if (read_is_valid(partition_size_ptr, 3, user_data_end))
                partition_size = read_partition_size(partition_size_ptr);
729
            else if (pbi->ec_active)
730 731 732 733
                partition_size = bytes_left;
            else
                vpx_internal_error(&pc->error, VPX_CODEC_CORRUPT_FRAME,
                                   "Truncated partition size data");
John Koleszar's avatar
John Koleszar committed
734 735
        }
        else
736 737 738 739 740 741 742
            partition_size = bytes_left;

        /* 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(partition, partition_size, user_data_end))
John Koleszar's avatar
John Koleszar committed
743
        {
744
            if (pbi->ec_active)
745 746 747 748 749
                partition_size = bytes_left;
            else
                vpx_internal_error(&pc->error, VPX_CODEC_CORRUPT_FRAME,
                                   "Truncated packet or corrupt partition "
                                   "%d length", i + 1);
John Koleszar's avatar
John Koleszar committed
750 751
        }

Johann's avatar
Johann committed
752
        if (vp8dx_start_decode(bool_decoder, partition, partition_size))
John Koleszar's avatar
John Koleszar committed
753 754 755 756 757 758 759 760
            vpx_internal_error(&pc->error, VPX_CODEC_MEM_ERROR,
                               "Failed to allocate bool decoder %d", i + 1);

        /* Advance to the next partition */
        partition += partition_size;
        bool_decoder++;
    }

761
#if CONFIG_MULTITHREAD
John Koleszar's avatar
John Koleszar committed
762 763 764
    /* Clamp number of decoder threads */
    if (pbi->decoding_thread_count > num_part - 1)
        pbi->decoding_thread_count = num_part - 1;
765
#endif
John Koleszar's avatar
John Koleszar committed
766 767 768 769 770 771 772 773
}


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
774
    {
John Koleszar's avatar
John Koleszar committed
775
        vpx_free(pbi->mbc);
James Zern's avatar
James Zern committed
776 777
        pbi->mbc = NULL;
    }
John Koleszar's avatar
John Koleszar committed
778 779 780 781 782 783 784 785 786
}

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

    if (pc->frame_type == KEY_FRAME)
    {
787
        /* Various keyframe initializations */
John Koleszar's avatar
John Koleszar committed
788 789 790 791 792 793 794
        vpx_memcpy(pc->fc.mvc, vp8_default_mv_context, sizeof(vp8_default_mv_context));

        vp8_init_mbmode_probs(pc);

        vp8_default_coef_probs(pc);
        vp8_kf_default_bmode_probs(pc->kf_bmode_prob);

Paul Wilkins's avatar
Paul Wilkins committed
795 796
        // Reset the segment feature data to the default stats:
        // Features disabled, 0, with delta coding (Default state).
797
//#if CONFIG_SEGFEATURES
Paul Wilkins's avatar
Paul Wilkins committed
798
        clearall_segfeatures( xd );
Paul Wilkins's avatar
Paul Wilkins committed
799

John Koleszar's avatar
John Koleszar committed
800 801
        xd->mb_segement_abs_delta = SEGMENT_DELTADATA;

802
        /* reset the mode ref deltasa for loop filter */
John Koleszar's avatar
John Koleszar committed
803 804 805
        vpx_memset(xd->ref_lf_deltas, 0, sizeof(xd->ref_lf_deltas));
        vpx_memset(xd->mode_lf_deltas, 0, sizeof(xd->mode_lf_deltas));

806
        /* All buffers are implicitly updated on key frames. */
John Koleszar's avatar
John Koleszar committed
807 808 809 810 811
        pc->refresh_golden_frame = 1;
        pc->refresh_alt_ref_frame = 1;
        pc->copy_buffer_to_gf = 0;
        pc->copy_buffer_to_arf = 0;

812 813 814
        /* 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
815 816 817 818 819 820 821 822 823 824
        pc->ref_frame_sign_bias[GOLDEN_FRAME] = 0;
        pc->ref_frame_sign_bias[ALTREF_FRAME] = 0;
    }
    else
    {
        if (!pc->use_bilinear_mc_filter)
            pc->mcomp_filter_type = SIXTAP;
        else
            pc->mcomp_filter_type = BILINEAR;

825
        /* To enable choice of different interploation filters */
John Koleszar's avatar
John Koleszar committed
826 827 828 829 830 831 832 833 834 835 836 837 838 839
        if (pc->mcomp_filter_type == SIXTAP)
        {
            xd->subpixel_predict      = SUBPIX_INVOKE(RTCD_VTABLE(subpix), sixtap4x4);
            xd->subpixel_predict8x4   = SUBPIX_INVOKE(RTCD_VTABLE(subpix), sixtap8x4);
            xd->subpixel_predict8x8   = SUBPIX_INVOKE(RTCD_VTABLE(subpix), sixtap8x8);
            xd->subpixel_predict16x16 = SUBPIX_INVOKE(RTCD_VTABLE(subpix), sixtap16x16);
        }
        else
        {
            xd->subpixel_predict      = SUBPIX_INVOKE(RTCD_VTABLE(subpix), bilinear4x4);
            xd->subpixel_predict8x4   = SUBPIX_INVOKE(RTCD_VTABLE(subpix), bilinear8x4);
            xd->subpixel_predict8x8   = SUBPIX_INVOKE(RTCD_VTABLE(subpix), bilinear8x8);
            xd->subpixel_predict16x16 = SUBPIX_INVOKE(RTCD_VTABLE(subpix), bilinear16x16);
        }
840 841 842

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

845
    xd->left_context = &pc->left_context;
John Koleszar's avatar
John Koleszar committed
846 847
    xd->mode_info_context = pc->mi;
    xd->frame_type = pc->frame_type;
848
    xd->mode_info_context->mbmi.mode = DC_PRED;
John Koleszar's avatar
John Koleszar committed
849
    xd->mode_info_stride = pc->mode_info_stride;
850
    xd->corrupted = 0; /* init without corruption */
851 852 853 854 855

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

John Koleszar's avatar
John Koleszar committed
856 857 858 859 860 861 862 863
}

int vp8_decode_frame(VP8D_COMP *pbi)
{
    vp8_reader *const bc = & pbi->bc;
    VP8_COMMON *const pc = & pbi->common;
    MACROBLOCKD *const xd  = & pbi->mb;
    const unsigned char *data = (const unsigned char *)pbi->Source;
864
    const unsigned char *data_end = data + pbi->source_sz;
865
    ptrdiff_t first_partition_length_in_bytes;
Yaowu Xu's avatar
Yaowu Xu committed
866

John Koleszar's avatar
John Koleszar committed
867 868
    int mb_row;
    int i, j, k, l;
869 870
    int corrupt_tokens = 0;
    int prev_independent_partitions = pbi->independent_partitions;
John Koleszar's avatar
John Koleszar committed
871

872 873 874 875 876 877
    if (pbi->input_partition)
    {
        data = pbi->partitions[0];
        data_end =  data + pbi->partition_sizes[0];
    }

878 879 880 881
    /* start with no corruption of current frame */
    xd->corrupted = 0;
    pc->yv12_fb[pc->new_fb_idx].corrupted = 0;

882
    if (data_end - data < 3)
John Koleszar's avatar
John Koleszar committed
883
    {
884
        if (pbi->ec_active)
885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906
        {
            /* 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;
        }
        else
        {
            vpx_internal_error(&pc->error, VPX_CODEC_CORRUPT_FRAME,
                               "Truncated packet");
        }
    }
    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
907

908
        if (!pbi->ec_active && (data + first_partition_length_in_bytes > data_end
909 910 911
            || data + first_partition_length_in_bytes < data))
            vpx_internal_error(&pc->error, VPX_CODEC_CORRUPT_FRAME,
                               "Truncated packet or corrupt partition 0 length");
912 913 914

        data += 3;

915
        vp8_setup_version(pc);
John Koleszar's avatar
John Koleszar committed
916

917
        if (pc->frame_type == KEY_FRAME)
John Koleszar's avatar
John Koleszar committed
918
        {
919 920 921 922 923 924 925
            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
             */
926
            if (!pbi->ec_active || data + 3 < data_end)
John Koleszar's avatar
John Koleszar committed
927
            {
928 929 930
                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
931 932
            }

933 934 935 936
            /* 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.
             */
937
            if (!pbi->ec_active || data + 6 < data_end)
John Koleszar's avatar
John Koleszar committed
938
            {
939 940 941 942
                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
943
            }
944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962
            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
963

964 965 966 967 968 969 970 971 972 973 974 975 976 977
                if (vp8_alloc_frame_buffers(pc, pc->Width, pc->Height))
                    vpx_internal_error(&pc->error, VPX_CODEC_MEM_ERROR,
                                       "Failed to allocate frame buffers");

#if CONFIG_ERROR_CONCEALMENT
                pbi->overlaps = NULL;
                if (pbi->ec_enabled)
                {
                    if (vp8_alloc_overlap_lists(pbi))
                        vpx_internal_error(&pc->error, VPX_CODEC_MEM_ERROR,
                                           "Failed to allocate overlap lists "
                                           "for error concealment");
                }
#endif
978 979

#if CONFIG_MULTITHREAD
980 981
                if (pbi->b_multithreaded_rd)
                    vp8mt_alloc_temp_buffers(pbi, pc->Width, prev_mb_rows);
982
#endif
983
            }
John Koleszar's avatar
John Koleszar committed
984 985 986
        }
    }

987 988
    if ((!pbi->decoded_key_frame && pc->frame_type != KEY_FRAME) ||
        pc->Width == 0 || pc->Height == 0)
John Koleszar's avatar
John Koleszar committed
989 990 991 992 993 994
    {
        return -1;
    }

    init_frame(pbi);

Johann's avatar
Johann committed
995
    if (vp8dx_start_decode(bc, data, data_end - data))
John Koleszar's avatar
John Koleszar committed
996 997 998 999 1000 1001 1002
        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);
    }

1003
    /* Is segmentation enabled */
John Koleszar's avatar
John Koleszar committed
1004 1005 1006
    xd->segmentation_enabled = (unsigned char)vp8_read_bit(bc);
    if (xd->segmentation_enabled)
    {
Paul Wilkins's avatar
Paul Wilkins committed
1007 1008
        // Read whether or not the segmentation map is being explicitly
        // updated this frame.
John Koleszar's avatar
John Koleszar committed
1009
        xd->update_mb_segmentation_map = (unsigned char)vp8_read_bit(bc);
Paul Wilkins's avatar
Paul Wilkins committed
1010 1011 1012 1013 1014 1015 1016 1017

#if CONFIG_SEGMENTATION
        // If so what method will be used.
        if ( xd->update_mb_segmentation_map )
            xd->temporal_update = (unsigned char)vp8_read_bit(bc);
#endif

        // Is the segment data being updated
John Koleszar's avatar
John Koleszar committed
1018 1019 1020 1021
        xd->update_mb_segmentation_data = (unsigned char)vp8_read_bit(bc);

        if (xd->update_mb_segmentation_data)
        {
1022 1023
            int data;

John Koleszar's avatar
John Koleszar committed
1024 1025
            xd->mb_segement_abs_delta = (unsigned char)vp8_read_bit(bc);

1026
//#if CONFIG_SEGFEATURES
Paul Wilkins's avatar
Paul Wilkins committed
1027
            clearall_segfeatures( xd );
Paul Wilkins's avatar
Paul Wilkins committed
1028

1029
            // For each segmentation...
1030
            for (i = 0; i < MAX_MB_SEGMENTS; i++)
1031 1032
            {
                // For each of the segments features...
1033
                for (j = 0; j < SEG_LVL_MAX; j++)
John Koleszar's avatar
John Koleszar committed
1034
                {
Paul Wilkins's avatar
Paul Wilkins committed
1035
                    // Is the feature enabled
John Koleszar's avatar
John Koleszar committed
1036 1037
                    if (vp8_read_bit(bc))
                    {
1038
//#if CONFIG_SEGFEATURES
Paul Wilkins's avatar
Paul Wilkins committed
1039
                        // Update the feature data and mask
1040
                        enable_segfeature(xd, i, j);
John Koleszar's avatar
John Koleszar committed
1041

1042 1043 1044 1045
                        data = (signed char)vp8_read_literal(
                                            bc, seg_feature_data_bits(j));

//#if CONFIG_SEGFEATURES
Paul Wilkins's avatar
Paul Wilkins committed
1046
                        // Is the segment data signed..
1047
                        if ( is_segfeature_signed(j) )
Paul Wilkins's avatar
Paul Wilkins committed
1048 1049
                        {
                            if (vp8_read_bit(bc))
1050
                                data = - data;
Paul Wilkins's avatar
Paul Wilkins committed
1051
                        }
John Koleszar's avatar
John Koleszar committed
1052 1053
                    }
                    else