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


#include "treereader.h"
John Koleszar's avatar
John Koleszar committed
13 14
#include "vp8/common/entropymv.h"
#include "vp8/common/entropymode.h"
John Koleszar's avatar
John Koleszar committed
15
#include "onyxd_int.h"
John Koleszar's avatar
John Koleszar committed
16
#include "vp8/common/findnearmv.h"
Scott LaVarnway's avatar
Scott LaVarnway committed
17

18
//#if CONFIG_SEGFEATURES
19
#include "vp8/common/seg_common.h"
20
#include "vp8/common/pred_common.h"
21

John Koleszar's avatar
John Koleszar committed
22 23 24
#if CONFIG_DEBUG
#include <assert.h>
#endif
Scott LaVarnway's avatar
Scott LaVarnway committed
25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45
static int vp8_read_bmode(vp8_reader *bc, const vp8_prob *p)
{
    const int i = vp8_treed_read(bc, vp8_bmode_tree, p);

    return i;
}


static int vp8_read_ymode(vp8_reader *bc, const vp8_prob *p)
{
    const int i = vp8_treed_read(bc, vp8_ymode_tree, p);

    return i;
}

static int vp8_kfread_ymode(vp8_reader *bc, const vp8_prob *p)
{
    const int i = vp8_treed_read(bc, vp8_kf_ymode_tree, p);

    return i;
}
Yaowu Xu's avatar
Yaowu Xu committed
46 47 48
static int vp8_read_i8x8_mode(vp8_reader *bc, const vp8_prob *p)
{
    const int i = vp8_treed_read(bc, vp8_i8x8_mode_tree, p);
Scott LaVarnway's avatar
Scott LaVarnway committed
49

Yaowu Xu's avatar
Yaowu Xu committed
50 51
    return i;
}
Scott LaVarnway's avatar
Scott LaVarnway committed
52 53 54 55 56 57 58 59 60


static int vp8_read_uv_mode(vp8_reader *bc, const vp8_prob *p)
{
    const int i = vp8_treed_read(bc, vp8_uv_mode_tree, p);

    return i;
}

61
// This function reads the current macro block's segnent id from the bitstream
Paul Wilkins's avatar
Paul Wilkins committed
62 63
// It should only be called if a segment map update is indicated.
static void vp8_read_mb_segid(vp8_reader *r, MB_MODE_INFO *mi, MACROBLOCKD *x)
Scott LaVarnway's avatar
Scott LaVarnway committed
64
{
65
    /* Is segmentation enabled */
Scott LaVarnway's avatar
Scott LaVarnway committed
66 67
    if (x->segmentation_enabled && x->update_mb_segmentation_map)
    {
68
        /* If so then read the segment id. */
Scott LaVarnway's avatar
Scott LaVarnway committed
69 70 71 72 73 74
        if (vp8_read(r, x->mb_segment_tree_probs[0]))
            mi->segment_id = (unsigned char)(2 + vp8_read(r, x->mb_segment_tree_probs[2]));
        else
            mi->segment_id = (unsigned char)(vp8_read(r, x->mb_segment_tree_probs[1]));
    }
}
Yaowu Xu's avatar
Yaowu Xu committed
75
extern const int vp8_i8x8_block[4];
Paul Wilkins's avatar
Paul Wilkins committed
76 77 78 79
static void vp8_kfread_modes(VP8D_COMP *pbi,
                             MODE_INFO *m,
                             int mb_row,
                             int mb_col)
Scott LaVarnway's avatar
Scott LaVarnway committed
80 81 82
{
    vp8_reader *const bc = & pbi->bc;
    const int mis = pbi->common.mode_info_stride;
Paul Wilkins's avatar
Paul Wilkins committed
83
    int map_index = mb_row * pbi->common.mb_cols + mb_col;
Paul Wilkins's avatar
Paul Wilkins committed
84
    MB_PREDICTION_MODE y_mode;
Paul Wilkins's avatar
Paul Wilkins committed
85

Paul Wilkins's avatar
Paul Wilkins committed
86
    // Read the Macroblock segmentation map if it is being updated explicitly
87
    // this frame (reset to 0 by default).
Paul Wilkins's avatar
Paul Wilkins committed
88 89 90 91
    m->mbmi.segment_id = 0;
    if (pbi->mb.update_mb_segmentation_map)
    {
        vp8_read_mb_segid(bc, &m->mbmi, &pbi->mb);
92
        pbi->common.last_frame_seg_map[map_index] = m->mbmi.segment_id;
Paul Wilkins's avatar
Paul Wilkins committed
93
    }
Scott LaVarnway's avatar
Scott LaVarnway committed
94

95
//#if CONFIG_SEGFEATURES
Paul Wilkins's avatar
Paul Wilkins committed
96 97 98 99 100 101 102 103 104 105
    if ( pbi->common.mb_no_coeff_skip &&
         ( !segfeature_active( &pbi->mb,
                               m->mbmi.segment_id, SEG_LVL_EOB ) ||
           ( get_segdata( &pbi->mb,
                          m->mbmi.segment_id, SEG_LVL_EOB ) != 0 ) ) )
    {
        m->mbmi.mb_skip_coeff = vp8_read(bc, pbi->prob_skip_false);
    }
    else
    {
106
//#if CONFIG_SEGFEATURES
Paul Wilkins's avatar
Paul Wilkins committed
107 108 109 110 111 112 113 114 115 116
        if ( segfeature_active( &pbi->mb,
                                m->mbmi.segment_id, SEG_LVL_EOB ) &&
             ( get_segdata( &pbi->mb,
                            m->mbmi.segment_id, SEG_LVL_EOB ) == 0 ) )
        {
            m->mbmi.mb_skip_coeff = 1;
        }
        else
            m->mbmi.mb_skip_coeff = 0;
    }
117

118
#if CONFIG_QIMODE
Paul Wilkins's avatar
Paul Wilkins committed
119 120
    y_mode = (MB_PREDICTION_MODE) vp8_kfread_ymode(bc,
        pbi->common.kf_ymode_prob[pbi->common.kf_ymode_probs_index]);
121
#else
Paul Wilkins's avatar
Paul Wilkins committed
122 123
    y_mode = (MB_PREDICTION_MODE) vp8_kfread_ymode(
                                      bc, pbi->common.kf_ymode_prob);
124
#endif
125

Paul Wilkins's avatar
Paul Wilkins committed
126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156
    m->mbmi.ref_frame = INTRA_FRAME;

    if ((m->mbmi.mode = y_mode) == B_PRED)
    {
        int i = 0;
        do
        {
            const B_PREDICTION_MODE A = above_block_mode(m, i, mis);
            const B_PREDICTION_MODE L = left_block_mode(m, i);

            m->bmi[i].as_mode =
                (B_PREDICTION_MODE) vp8_read_bmode(
                                        bc, pbi->common.kf_bmode_prob [A] [L]);
        }
        while (++i < 16);
    }
    if((m->mbmi.mode = y_mode) == I8X8_PRED)
    {
        int i;
        int mode8x8;
        for(i=0;i<4;i++)
         {
             int ib = vp8_i8x8_block[i];
             mode8x8 = vp8_read_i8x8_mode(bc, pbi->common.i8x8_mode_prob);
             m->bmi[ib+0].as_mode= mode8x8;
             m->bmi[ib+1].as_mode= mode8x8;
             m->bmi[ib+4].as_mode= mode8x8;
             m->bmi[ib+5].as_mode= mode8x8;
         }
   }
    else
157
#if CONFIG_UVINTRA
Yaowu Xu's avatar
Yaowu Xu committed
158 159
        m->mbmi.uv_mode = (MB_PREDICTION_MODE)vp8_read_uv_mode(bc,
            pbi->common.kf_uv_mode_prob[m->mbmi.mode]);
160
#else
Yaowu Xu's avatar
Yaowu Xu committed
161 162
        m->mbmi.uv_mode = (MB_PREDICTION_MODE)vp8_read_uv_mode(bc,
            pbi->common.kf_uv_mode_prob);
163
#endif
Scott LaVarnway's avatar
Scott LaVarnway committed
164
}
John Koleszar's avatar
John Koleszar committed
165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231

static int read_mvcomponent(vp8_reader *r, const MV_CONTEXT *mvc)
{
    const vp8_prob *const p = (const vp8_prob *) mvc;
    int x = 0;

    if (vp8_read(r, p [mvpis_short]))  /* Large */
    {
        int i = 0;

        do
        {
            x += vp8_read(r, p [MVPbits + i]) << i;
        }
        while (++i < 3);

        i = mvlong_width - 1;  /* Skip bit 3, which is sometimes implicit */

        do
        {
            x += vp8_read(r, p [MVPbits + i]) << i;
        }
        while (--i > 3);

        if (!(x & 0xFFF0)  ||  vp8_read(r, p [MVPbits + 3]))
            x += 8;
    }
    else   /* small */
        x = vp8_treed_read(r, vp8_small_mvtree, p + MVPshort);

    if (x  &&  vp8_read(r, p [MVPsign]))
        x = -x;

    return x;
}

static void read_mv(vp8_reader *r, MV *mv, const MV_CONTEXT *mvc)
{
    mv->row = (short)(read_mvcomponent(r,   mvc) << 1);
    mv->col = (short)(read_mvcomponent(r, ++mvc) << 1);
}


static void read_mvcontexts(vp8_reader *bc, MV_CONTEXT *mvc)
{
    int i = 0;

    do
    {
        const vp8_prob *up = vp8_mv_update_probs[i].prob;
        vp8_prob *p = (vp8_prob *)(mvc + i);
        vp8_prob *const pstop = p + MVPcount;

        do
        {
            if (vp8_read(bc, *up++))
            {
                const vp8_prob x = (vp8_prob)vp8_read_literal(bc, 7);

                *p = x ? x << 1 : 1;
            }
        }
        while (++p < pstop);
    }
    while (++i < 2);
}

232 233
// Read the referncence frame
static MV_REFERENCE_FRAME read_ref_frame( VP8D_COMP *pbi,
Paul Wilkins's avatar
Paul Wilkins committed
234
                                          vp8_reader *const bc,
235 236 237
                                          unsigned char segment_id )
{
    MV_REFERENCE_FRAME ref_frame;
Paul Wilkins's avatar
Paul Wilkins committed
238
    int seg_ref_active;
Paul Wilkins's avatar
Paul Wilkins committed
239
    int seg_ref_count = 0;
240

241
//#if CONFIG_SEGFEATURES
242
    VP8_COMMON *const cm = & pbi->common;
243 244
    MACROBLOCKD *const xd = &pbi->mb;

Paul Wilkins's avatar
Paul Wilkins committed
245 246 247
    seg_ref_active = segfeature_active( xd,
                                        segment_id,
                                        SEG_LVL_REF_FRAME );
248

Paul Wilkins's avatar
Paul Wilkins committed
249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265

#if CONFIG_COMPRED

    // If segment coding enabled does the segment allow for more than one
    // possible reference frame
    if ( seg_ref_active )
    {
        seg_ref_count = check_segref( xd, segment_id, INTRA_FRAME ) +
                        check_segref( xd, segment_id, LAST_FRAME ) +
                        check_segref( xd, segment_id, GOLDEN_FRAME ) +
                        check_segref( xd, segment_id, ALTREF_FRAME );
    }

    // Segment reference frame features not available or allows for
    // multiple reference frame options
    if ( !seg_ref_active || (seg_ref_count > 1) )
#else
Paul Wilkins's avatar
Paul Wilkins committed
266
    if ( !seg_ref_active )
Paul Wilkins's avatar
Paul Wilkins committed
267
#endif
268
    {
269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294
#if CONFIG_COMPRED
        // Values used in prediction model coding
        unsigned char prediction_flag;
        vp8_prob pred_prob;
        MV_REFERENCE_FRAME pred_ref;

        // Get the context probability the prediction flag
        pred_prob = get_pred_prob( cm, xd, PRED_REF );

        // Read the prediction status flag
        prediction_flag = (unsigned char)vp8_read( bc, pred_prob );

        // Store the prediction flag.
        set_pred_flag( xd, PRED_REF, prediction_flag );

        // Get the predicted reference frame.
        pred_ref = get_pred_ref( cm, xd );

        // If correctly predicted then use the predicted value
        if ( prediction_flag )
        {
            ref_frame = pred_ref;
        }
        // else decode the explicitly coded value
        else
        {
Paul Wilkins's avatar
Paul Wilkins committed
295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310
            vp8_prob mod_refprobs[PREDICTION_PROBS];
            vpx_memcpy( mod_refprobs,
                        cm->mod_refprobs[pred_ref], sizeof(mod_refprobs) );

            // If segment coding enabled blank out options that cant occur by
            // setting the branch probability to 0.
            if ( seg_ref_active )
            {
                mod_refprobs[INTRA_FRAME] *=
                    check_segref( xd, segment_id, INTRA_FRAME );
                mod_refprobs[LAST_FRAME] *=
                    check_segref( xd, segment_id, LAST_FRAME );
                mod_refprobs[GOLDEN_FRAME] *=
                    ( check_segref( xd, segment_id, GOLDEN_FRAME ) *
                      check_segref( xd, segment_id, ALTREF_FRAME ) );
            }
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

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

            // Do we need to decode the Intra/Inter branch
            if ( mod_refprobs[0] )
                ref_frame = (MV_REFERENCE_FRAME) vp8_read(bc, mod_refprobs[0]);
            else
                ref_frame ++;

            if (ref_frame)
            {
                // Do we need to decode the Last/Gf_Arf branch
                if ( mod_refprobs[1] )
                    ref_frame += vp8_read(bc, mod_refprobs[1]);
                else
                    ref_frame++;

                if ( ref_frame > 1 )
                {
                    // Do we need to decode the GF/Arf branch
                    if ( mod_refprobs[2] )
                        ref_frame += vp8_read(bc, mod_refprobs[2]);
                    else
                    {
Paul Wilkins's avatar
Paul Wilkins committed
336 337 338 339 340 341 342 343 344 345 346 347 348
                        if ( seg_ref_active )
                        {
                            if ( (pred_ref == GOLDEN_FRAME) ||
                                 !check_segref( xd, segment_id, GOLDEN_FRAME) )
                            {
                                ref_frame = ALTREF_FRAME;
                            }
                            else
                                ref_frame = GOLDEN_FRAME;
                        }
                        else
                            ref_frame = (pred_ref == GOLDEN_FRAME)
                                        ? ALTREF_FRAME : GOLDEN_FRAME;
349 350 351 352 353
                    }
                }
            }
        }
#else
354
        ref_frame =
355
            (MV_REFERENCE_FRAME) vp8_read(bc, cm->prob_intra_coded);
356 357 358

        if (ref_frame)
        {
359
            if (vp8_read(bc, cm->prob_last_coded))
360 361
            {
                ref_frame = (MV_REFERENCE_FRAME)((int)ref_frame +
362
                            (int)(1 + vp8_read(bc, cm->prob_gf_coded)));
363 364
            }
        }
365
#endif
366 367
    }

368
//#if CONFIG_SEGFEATURES
Paul Wilkins's avatar
Paul Wilkins committed
369 370 371
    // Segment reference frame features are enabled
    else
    {
372 373 374 375 376
#if CONFIG_COMPRED
        // The reference frame for the mb is considered as correclty predicted
        // if it is signaled at the segment level for the purposes of the
        // common prediction model
        set_pred_flag( xd, PRED_REF, 1 );
Paul Wilkins's avatar
Paul Wilkins committed
377 378
        ref_frame = get_pred_ref( cm, xd );
#else
Paul Wilkins's avatar
Paul Wilkins committed
379 380 381 382 383 384 385 386 387 388
        // If there are no inter reference frames enabled we can set INTRA
        if ( !check_segref_inter(xd, segment_id) )
        {
            ref_frame = INTRA_FRAME;
        }
        else
        {
            // Else if there are both intra and inter options we need to read
            // the inter / intra flag, else mark as inter.
            if ( check_segref( xd, segment_id, INTRA_FRAME ) )
389 390
                ref_frame =
                    (MV_REFERENCE_FRAME) vp8_read(bc, cm->prob_intra_coded);
Paul Wilkins's avatar
Paul Wilkins committed
391
            else
Paul Wilkins's avatar
Paul Wilkins committed
392
                ref_frame = LAST_FRAME;
Paul Wilkins's avatar
Paul Wilkins committed
393

Paul Wilkins's avatar
Paul Wilkins committed
394
            if ( ref_frame == LAST_FRAME )
Paul Wilkins's avatar
Paul Wilkins committed
395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413
            {
                // Now consider last vs (golden or alt) flag....
                // If Last is not enabled
                if ( !check_segref( xd, segment_id, LAST_FRAME ) )
                {
                    // If not golden then it must be altref
                    if (!check_segref( xd, segment_id, GOLDEN_FRAME ))
                    {
                        ref_frame = ALTREF_FRAME;
                    }
                    // Not Altref therefore must be Golden
                    else if (!check_segref( xd, segment_id,
                                               ALTREF_FRAME ))
                    {
                        ref_frame = GOLDEN_FRAME;
                    }
                    // Else we must read bit to decide.
                    else
                    {
414 415 416
                        ref_frame =
                            (MV_REFERENCE_FRAME)((int)ref_frame +
                            (int)(1 + vp8_read(bc, cm->prob_gf_coded)));
Paul Wilkins's avatar
Paul Wilkins committed
417 418 419 420 421 422 423
                    }
                }
                // Both last and at least one of alt or golden are enabled
                else if ( check_segref( xd, segment_id, GOLDEN_FRAME ) ||
                          check_segref( xd, segment_id, ALTREF_FRAME ) )
                {
                    // Read flag to indicate (golden or altref) vs last
424
                    if (vp8_read(bc, cm->prob_last_coded))
Paul Wilkins's avatar
Paul Wilkins committed
425 426 427 428 429 430 431 432 433 434 435 436 437 438
                    {
                        // If not golden then it must be altref
                        if (!check_segref( xd, segment_id, GOLDEN_FRAME ))
                        {
                            ref_frame = ALTREF_FRAME;
                        }
                        // Not Altref therefore must be Golden
                        else if (!check_segref( xd, segment_id,
                                                   ALTREF_FRAME ))
                        {
                            ref_frame = GOLDEN_FRAME;
                        }
                        else
                        {
439 440 441
                            ref_frame =
                                (MV_REFERENCE_FRAME)((int)ref_frame +
                                (int)(1 + vp8_read(bc, cm->prob_gf_coded)));
Paul Wilkins's avatar
Paul Wilkins committed
442 443 444 445 446 447
                        }
                    }
                    // ELSE LAST
                }
            }
        }
Paul Wilkins's avatar
Paul Wilkins committed
448
#endif
Paul Wilkins's avatar
Paul Wilkins committed
449 450
    }

451 452
    return (MV_REFERENCE_FRAME)ref_frame;
}
John Koleszar's avatar
John Koleszar committed
453 454 455 456 457 458 459 460

static MB_PREDICTION_MODE read_mv_ref(vp8_reader *bc, const vp8_prob *p)
{
    const int i = vp8_treed_read(bc, vp8_mv_ref_tree, p);

    return (MB_PREDICTION_MODE)i;
}

461
static B_PREDICTION_MODE sub_mv_ref(vp8_reader *bc, const vp8_prob *p)
John Koleszar's avatar
John Koleszar committed
462 463 464
{
    const int i = vp8_treed_read(bc, vp8_sub_mv_ref_tree, p);

465
    return (B_PREDICTION_MODE)i;
John Koleszar's avatar
John Koleszar committed
466
}
Scott LaVarnway's avatar
Scott LaVarnway committed
467 468

#ifdef VPX_MODE_COUNT
John Koleszar's avatar
John Koleszar committed
469 470 471 472 473 474 475 476
unsigned int vp8_mv_cont_count[5][4] =
{
    { 0, 0, 0, 0 },
    { 0, 0, 0, 0 },
    { 0, 0, 0, 0 },
    { 0, 0, 0, 0 },
    { 0, 0, 0, 0 }
};
Scott LaVarnway's avatar
Scott LaVarnway committed
477
#endif
John Koleszar's avatar
John Koleszar committed
478

479 480
static const unsigned char mbsplit_fill_count[4] = {8, 8, 4, 1};
static const unsigned char mbsplit_fill_offset[4][16] = {
Scott LaVarnway's avatar
Scott LaVarnway committed
481 482 483 484 485
    { 0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15},
    { 0,  1,  4,  5,  8,  9, 12, 13,  2,  3,   6,  7, 10, 11, 14, 15},
    { 0,  1,  4,  5,  2,  3,  6,  7,  8,  9,  12, 13, 10, 11, 14, 15},
    { 0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15}
};
John Koleszar's avatar
John Koleszar committed
486 487 488



489
static void mb_mode_mv_init(VP8D_COMP *pbi)
Scott LaVarnway's avatar
Scott LaVarnway committed
490
{
491
    VP8_COMMON *const cm = & pbi->common;
Scott LaVarnway's avatar
Scott LaVarnway committed
492 493
    vp8_reader *const bc = & pbi->bc;
    MV_CONTEXT *const mvc = pbi->common.fc.mvc;
John Koleszar's avatar
John Koleszar committed
494

495 496 497 498 499 500
#if CONFIG_ERROR_CONCEALMENT
    /* Default is that no macroblock is corrupt, therefore we initialize
     * mvs_corrupt_from_mb to something very big, which we can be sure is
     * outside the frame. */
    pbi->mvs_corrupt_from_mb = UINT_MAX;
#endif
Scott LaVarnway's avatar
Scott LaVarnway committed
501 502 503
    pbi->prob_skip_false = 0;
    if (pbi->common.mb_no_coeff_skip)
        pbi->prob_skip_false = (vp8_prob)vp8_read_literal(bc, 8);
John Koleszar's avatar
John Koleszar committed
504

Scott LaVarnway's avatar
Scott LaVarnway committed
505
    if(pbi->common.frame_type != KEY_FRAME)
John Koleszar's avatar
John Koleszar committed
506
    {
507 508 509 510 511
        // Decode the baseline probabilities for decoding reference frame
        cm->prob_intra_coded = (vp8_prob)vp8_read_literal(bc, 8);
        cm->prob_last_coded  = (vp8_prob)vp8_read_literal(bc, 8);
        cm->prob_gf_coded    = (vp8_prob)vp8_read_literal(bc, 8);

512 513 514 515 516
#if CONFIG_COMPRED
        // Computes a modified set of probabilities for use when reference
        // frame prediction fails.
        compute_mod_refprobs( cm );
#endif
517

518 519
#if CONFIG_DUALPRED
        pbi->common.dual_pred_mode = vp8_read(bc, 128);
520 521 522
        if (cm->dual_pred_mode)
            cm->dual_pred_mode += vp8_read(bc, 128);
        if (cm->dual_pred_mode == HYBRID_PREDICTION)
523
        {
Paul Wilkins's avatar
Paul Wilkins committed
524 525 526
            cm->prob_dualpred[0] = (vp8_prob)vp8_read_literal(bc, 8);
            cm->prob_dualpred[1] = (vp8_prob)vp8_read_literal(bc, 8);
            cm->prob_dualpred[2] = (vp8_prob)vp8_read_literal(bc, 8);
527 528
        }
#endif /* CONFIG_DUALPRED */
John Koleszar's avatar
John Koleszar committed
529

Scott LaVarnway's avatar
Scott LaVarnway committed
530
        if (vp8_read_bit(bc))
John Koleszar's avatar
John Koleszar committed
531
        {
Scott LaVarnway's avatar
Scott LaVarnway committed
532
            int i = 0;
John Koleszar's avatar
John Koleszar committed
533

Scott LaVarnway's avatar
Scott LaVarnway committed
534 535
            do
            {
536
                cm->fc.ymode_prob[i] = (vp8_prob) vp8_read_literal(bc, 8);
Scott LaVarnway's avatar
Scott LaVarnway committed
537
            }
Yaowu Xu's avatar
Yaowu Xu committed
538
            while (++i < VP8_YMODES-1);
Scott LaVarnway's avatar
Scott LaVarnway committed
539
        }
540 541 542
#if CONFIG_UVINTRA
        //vp8_read_bit(bc);
#else
Scott LaVarnway's avatar
Scott LaVarnway committed
543
        if (vp8_read_bit(bc))
John Koleszar's avatar
John Koleszar committed
544
        {
Scott LaVarnway's avatar
Scott LaVarnway committed
545 546 547 548
            int i = 0;

            do
            {
549
                cm->fc.uv_mode_prob[i] = (vp8_prob) vp8_read_literal(bc, 8);
Scott LaVarnway's avatar
Scott LaVarnway committed
550
            }
Yaowu Xu's avatar
Yaowu Xu committed
551
            while (++i < VP8_UV_MODES-1);
John Koleszar's avatar
John Koleszar committed
552
        }
553
#endif /* CONFIG_UVINTRA */
Scott LaVarnway's avatar
Scott LaVarnway committed
554
        read_mvcontexts(bc, mvc);
John Koleszar's avatar
John Koleszar committed
555
    }
Scott LaVarnway's avatar
Scott LaVarnway committed
556
}
John Koleszar's avatar
John Koleszar committed
557

558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618
// This function either reads the segment id for the current macroblock from
// the bitstream or if the value is temporally predicted asserts the predicted
// value
static void read_mb_segment_id ( VP8D_COMP *pbi,
                                 int mb_row, int mb_col )
{
    vp8_reader *const bc = & pbi->bc;
    VP8_COMMON *const cm = & pbi->common;
    MACROBLOCKD *const xd  = & pbi->mb;
    MODE_INFO *mi = xd->mode_info_context;
    MB_MODE_INFO *mbmi = &mi->mbmi;
    int index = mb_row * pbi->common.mb_cols + mb_col;

    if (xd->segmentation_enabled)
    {
        if (xd->update_mb_segmentation_map)
        {
            // Is temporal coding of the segment id for this mb enabled.
            if (cm->temporal_update)
            {
                // Get the context based probability for reading the
                // prediction status flag
                vp8_prob pred_prob =
                    get_pred_prob( cm, xd, PRED_SEG_ID );

                // Read the prediction status flag
                unsigned char seg_pred_flag =
                    (unsigned char)vp8_read(bc, pred_prob );

                // Store the prediction flag.
                set_pred_flag( xd, PRED_SEG_ID, seg_pred_flag );

                // If the value is flagged as correctly predicted
                // then use the predicted value
                if ( seg_pred_flag )
                {
                    mbmi->segment_id = get_pred_mb_segid( cm, index );
                }
                // Else .... decode it explicitly
                else
                {
                    vp8_read_mb_segid(bc, mbmi, xd );
                    cm->last_frame_seg_map[index] = mbmi->segment_id;
                }

            }
            // Normal unpredicted coding mode
            else
            {
                vp8_read_mb_segid(bc, mbmi, xd);
                cm->last_frame_seg_map[index] = mbmi->segment_id;
            }
        }
    }
    else
    {
        // The encoder explicitly sets the segment_id to 0
        // when segmentation is disabled
        mbmi->segment_id = 0;
    }
}
619

620
static void read_mb_modes_mv(VP8D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi,
621
                             MODE_INFO *prev_mi,
Paul Wilkins's avatar
Paul Wilkins committed
622
                             int mb_row, int mb_col)
Scott LaVarnway's avatar
Scott LaVarnway committed
623
{
624
    VP8_COMMON *const cm = & pbi->common;
Scott LaVarnway's avatar
Scott LaVarnway committed
625 626 627
    vp8_reader *const bc = & pbi->bc;
    MV_CONTEXT *const mvc = pbi->common.fc.mvc;
    const int mis = pbi->common.mode_info_stride;
628
    MACROBLOCKD *const xd  = & pbi->mb;
629

630
    int pred_context;
631
    int index = mb_row * pbi->common.mb_cols + mb_col;
Scott LaVarnway's avatar
Scott LaVarnway committed
632
    int_mv *const mv = & mbmi->mv;
Scott LaVarnway's avatar
Scott LaVarnway committed
633 634 635 636 637
    int mb_to_left_edge;
    int mb_to_right_edge;
    int mb_to_top_edge;
    int mb_to_bottom_edge;

638 639
    mb_to_top_edge = xd->mb_to_top_edge;
    mb_to_bottom_edge = xd->mb_to_bottom_edge;
Scott LaVarnway's avatar
Scott LaVarnway committed
640 641 642
    mb_to_top_edge -= LEFT_TOP_MARGIN;
    mb_to_bottom_edge += RIGHT_BOTTOM_MARGIN;
    mbmi->need_to_clamp_mvs = 0;
643 644 645
#if CONFIG_DUALPRED
    mbmi->second_ref_frame = 0;
#endif /* CONFIG_DUALPRED */
646 647 648
    /* Distance of Mb to the various image edges.
     * These specified to 8th pel as they are always compared to MV values that are in 1/8th pel units
     */
649
    xd->mb_to_left_edge =
Scott LaVarnway's avatar
Scott LaVarnway committed
650 651 652
    mb_to_left_edge = -((mb_col * 16) << 3);
    mb_to_left_edge -= LEFT_TOP_MARGIN;

653
    xd->mb_to_right_edge =
Scott LaVarnway's avatar
Scott LaVarnway committed
654 655 656
    mb_to_right_edge = ((pbi->common.mb_cols - 1 - mb_col) * 16) << 3;
    mb_to_right_edge += RIGHT_BOTTOM_MARGIN;

657 658 659 660 661 662
    // Make sure the MACROBLOCKD mode info pointer is pointed at the
    // correct entry for the current macroblock.
    xd->mode_info_context = mi;

    // Read the macroblock segment id.
    read_mb_segment_id ( pbi, mb_row, mb_col );
663

664
//#if CONFIG_SEGFEATURES
665 666 667
    if ( pbi->common.mb_no_coeff_skip &&
         ( !segfeature_active( xd,
                               mbmi->segment_id, SEG_LVL_EOB ) ||
Paul Wilkins's avatar
Paul Wilkins committed
668
           (get_segdata( xd, mbmi->segment_id, SEG_LVL_EOB ) != 0) ) )
669 670 671
    {
        // Read the macroblock coeff skip flag if this feature is in use,
        // else default to 0
Scott LaVarnway's avatar
Scott LaVarnway committed
672
        mbmi->mb_skip_coeff = vp8_read(bc, pbi->prob_skip_false);
673
    }
Scott LaVarnway's avatar
Scott LaVarnway committed
674
    else
675
    {
676
//#if CONFIG_SEGFEATURES
677 678
        if ( segfeature_active( xd,
                                mbmi->segment_id, SEG_LVL_EOB ) &&
Paul Wilkins's avatar
Paul Wilkins committed
679
             (get_segdata( xd, mbmi->segment_id, SEG_LVL_EOB ) == 0) )
680 681 682 683 684 685
        {
            mbmi->mb_skip_coeff = 1;
        }
        else
            mbmi->mb_skip_coeff = 0;
    }
John Koleszar's avatar
John Koleszar committed
686

687
    // Read the reference frame
Paul Wilkins's avatar
Paul Wilkins committed
688
    mbmi->ref_frame = read_ref_frame( pbi, bc, mbmi->segment_id );
689 690 691

    // If reference frame is an Inter frame
    if (mbmi->ref_frame)
John Koleszar's avatar
John Koleszar committed
692
    {
Scott LaVarnway's avatar
Scott LaVarnway committed
693
        int rct[4];
Scott LaVarnway's avatar
Scott LaVarnway committed
694
        int_mv nearest, nearby, best_mv;
695
        vp8_prob mv_ref_p [VP8_MVREFS-1];
John Koleszar's avatar
John Koleszar committed
696

697 698 699
        vp8_find_near_mvs(xd, mi,
            prev_mi,
            &nearest, &nearby, &best_mv, rct,
700
                          mbmi->ref_frame, pbi->common.ref_frame_sign_bias);
Yaowu Xu's avatar
Yaowu Xu committed
701
        vp8_mv_ref_probs(&pbi->common, mv_ref_p, rct);
702

703
//#if CONFIG_SEGFEATURES
704
        // Is the segment level mode feature enabled for this segment
705
        if ( segfeature_active( xd, mbmi->segment_id, SEG_LVL_MODE ) )
John Koleszar's avatar
John Koleszar committed
706
        {
707
            mbmi->mode =
Paul Wilkins's avatar
Paul Wilkins committed
708
                get_segdata( xd, mbmi->segment_id, SEG_LVL_MODE );
John Koleszar's avatar
John Koleszar committed
709
        }
710 711 712
        else
        {
            mbmi->mode = read_mv_ref(bc, mv_ref_p);
Yaowu Xu's avatar
Yaowu Xu committed
713 714

            vp8_accum_mv_refs(&pbi->common, mbmi->mode, rct);
715
        }
John Koleszar's avatar
John Koleszar committed
716

Scott LaVarnway's avatar
Scott LaVarnway committed
717
        mbmi->uv_mode = DC_PRED;
718
        switch (mbmi->mode)
John Koleszar's avatar
John Koleszar committed
719
        {
Scott LaVarnway's avatar
Scott LaVarnway committed
720 721 722 723 724 725
        case SPLITMV:
        {
            const int s = mbmi->partitioning =
                      vp8_treed_read(bc, vp8_mbsplit_tree, vp8_mbsplit_probs);
            const int num_p = vp8_mbsplit_count [s];
            int j = 0;
John Koleszar's avatar
John Koleszar committed
726

727
            mbmi->need_to_clamp_mvs = 0;
Scott LaVarnway's avatar
Scott LaVarnway committed
728 729
            do  /* for each subset j */
            {
Scott LaVarnway's avatar
Scott LaVarnway committed
730
                int_mv leftmv, abovemv;
Scott LaVarnway's avatar
Scott LaVarnway committed
731
                int_mv blockmv;
Scott LaVarnway's avatar
Scott LaVarnway committed
732 733 734
                int k;  /* first block in subset j */
                int mv_contz;
                k = vp8_mbsplit_offset[s][j];
John Koleszar's avatar
John Koleszar committed
735

Scott LaVarnway's avatar
Scott LaVarnway committed
736 737
                leftmv.as_int = left_block_mv(mi, k);
                abovemv.as_int = above_block_mv(mi, k, mis);
738
                mv_contz = vp8_mv_cont(&leftmv, &abovemv);
John Koleszar's avatar
John Koleszar committed
739

740
                switch (sub_mv_ref(bc, vp8_sub_mv_ref_prob2 [mv_contz])) /*pc->fc.sub_mv_ref_prob))*/
John Koleszar's avatar
John Koleszar committed
741
                {
Scott LaVarnway's avatar
Scott LaVarnway committed
742
                case NEW4X4:
Scott LaVarnway's avatar
Scott LaVarnway committed
743 744 745
                    read_mv(bc, &blockmv.as_mv, (const MV_CONTEXT *) mvc);
                    blockmv.as_mv.row += best_mv.as_mv.row;
                    blockmv.as_mv.col += best_mv.as_mv.col;
Scott LaVarnway's avatar
Scott LaVarnway committed
746 747 748 749 750
  #ifdef VPX_MODE_COUNT
                    vp8_mv_cont_count[mv_contz][3]++;
  #endif
                    break;
                case LEFT4X4:
Scott LaVarnway's avatar
Scott LaVarnway committed
751
                    blockmv.as_int = leftmv.as_int;
Scott LaVarnway's avatar
Scott LaVarnway committed
752 753 754 755 756
  #ifdef VPX_MODE_COUNT
                    vp8_mv_cont_count[mv_contz][0]++;
  #endif
                    break;
                case ABOVE4X4:
Scott LaVarnway's avatar
Scott LaVarnway committed
757
                    blockmv.as_int = abovemv.as_int;
Scott LaVarnway's avatar
Scott LaVarnway committed
758 759 760 761 762
  #ifdef VPX_MODE_COUNT
                    vp8_mv_cont_count[mv_contz][1]++;
  #endif
                    break;
                case ZERO4X4:
Scott LaVarnway's avatar
Scott LaVarnway committed
763
                    blockmv.as_int = 0;
Scott LaVarnway's avatar
Scott LaVarnway committed
764 765 766 767 768 769
  #ifdef VPX_MODE_COUNT
                    vp8_mv_cont_count[mv_contz][2]++;
  #endif
                    break;
                default:
                    break;
John Koleszar's avatar
John Koleszar committed
770 771
                }

772
                mbmi->need_to_clamp_mvs |= vp8_check_mv_bounds(&blockmv,
Scott LaVarnway's avatar
Scott LaVarnway committed
773 774 775 776
                                                          mb_to_left_edge,
                                                          mb_to_right_edge,
                                                          mb_to_top_edge,
                                                          mb_to_bottom_edge);
John Koleszar's avatar
John Koleszar committed
777 778

                {
Scott LaVarnway's avatar
Scott LaVarnway committed
779 780 781
                    /* Fill (uniform) modes, mvs of jth subset.
                     Must do it here because ensuing subsets can
                     refer back to us via "left" or "above". */
782 783
                    const unsigned char *fill_offset;
                    unsigned int fill_count = mbsplit_fill_count[s];
John Koleszar's avatar
John Koleszar committed
784

785
                    fill_offset = &mbsplit_fill_offset[s][(unsigned char)j * mbsplit_fill_count[s]];
John Koleszar's avatar
John Koleszar committed
786

Scott LaVarnway's avatar
Scott LaVarnway committed
787
                    do {
Scott LaVarnway's avatar
Scott LaVarnway committed
788
                        mi->bmi[ *fill_offset].mv.as_int = blockmv.as_int;
789
                        fill_offset++;
Scott LaVarnway's avatar
Scott LaVarnway committed
790
                    }while (--fill_count);
John Koleszar's avatar
John Koleszar committed
791 792 793
                }

            }
Scott LaVarnway's avatar
Scott LaVarnway committed
794 795
            while (++j < num_p);
        }
John Koleszar's avatar
John Koleszar committed
796

Scott LaVarnway's avatar
Scott LaVarnway committed
797
        mv->as_int = mi->bmi[15].mv.as_int;
Scott LaVarnway's avatar
Scott LaVarnway committed
798 799 800 801

        break;  /* done with SPLITMV */

        case NEARMV:
Scott LaVarnway's avatar
Scott LaVarnway committed
802
            mv->as_int = nearby.as_int;
803
            /* Clip "next_nearest" so that it does not extend to far out of image */
Scott LaVarnway's avatar
Scott LaVarnway committed
804 805
            vp8_clamp_mv(mv, mb_to_left_edge, mb_to_right_edge,
                         mb_to_top_edge, mb_to_bottom_edge);
806
            goto propagate_mv;
Scott LaVarnway's avatar
Scott LaVarnway committed
807 808

        case NEARESTMV:
Scott LaVarnway's avatar
Scott LaVarnway committed
809
            mv->as_int = nearest.as_int;
810
            /* Clip "next_nearest" so that it does not extend to far out of image */
Scott LaVarnway's avatar
Scott LaVarnway committed
811 812
            vp8_clamp_mv(mv, mb_to_left_edge, mb_to_right_edge,
                         mb_to_top_edge, mb_to_bottom_edge);
813
            goto propagate_mv;
Scott LaVarnway's avatar
Scott LaVarnway committed
814 815

        case ZEROMV:
Scott LaVarnway's avatar
Scott LaVarnway committed
816
            mv->as_int = 0;
817
            goto propagate_mv;
Scott LaVarnway's avatar
Scott LaVarnway committed
818 819

        case NEWMV:
Scott LaVarnway's avatar
Scott LaVarnway committed
820 821 822
            read_mv(bc, &mv->as_mv, (const MV_CONTEXT *) mvc);
            mv->as_mv.row += best_mv.as_mv.row;
            mv->as_mv.col += best_mv.as_mv.col;
Scott LaVarnway's avatar
Scott LaVarnway committed
823 824 825 826 827 828

            /* Don't need to check this on NEARMV and NEARESTMV modes
             * since those modes clamp the MV. The NEWMV mode does not,
             * so signal to the prediction stage whether special
             * handling may be required.
             */
Scott LaVarnway's avatar
Scott LaVarnway committed
829 830 831 832 833
            mbmi->need_to_clamp_mvs = vp8_check_mv_bounds(mv,
                                                      mb_to_left_edge,
                                                      mb_to_right_edge,
                                                      mb_to_top_edge,
                                                      mb_to_bottom_edge);
834

835
        propagate_mv:  /* same MV throughout */
836

837
#if CONFIG_DUALPRED
838 839 840 841 842 843 844 845
            if ( cm->dual_pred_mode == DUAL_PREDICTION_ONLY ||
                 (cm->dual_pred_mode == HYBRID_PREDICTION &&
#if CONFIG_COMPRED
                     vp8_read(bc, get_pred_prob( cm, xd, PRED_DUAL ))) )
#else
                     vp8_read(bc, cm->prob_dualpred[(mi[-1].mbmi.second_ref_frame != INTRA_FRAME) +
                                                    (mi[-mis].mbmi.second_ref_frame != INTRA_FRAME)])))
#endif
846 847 848 849 850 851 852
            {
                mbmi->second_ref_frame = mbmi->ref_frame + 1;
                if (mbmi->second_ref_frame == 4)
                    mbmi->second_ref_frame = 1;
            }
            if (mbmi->second_ref_frame)
            {
Paul Wilkins's avatar
Paul Wilkins committed
853 854 855 856 857
                vp8_find_near_mvs(xd, mi,
                                  prev_mi,
                                  &nearest, &nearby, &best_mv, rct,
                                  (int)mbmi->second_ref_frame,
                                  pbi->common.ref_frame_sign_bias);
858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887
                switch (mbmi->mode) {
                case ZEROMV:
                    mbmi->second_mv.as_int = 0;
                    break;
                case NEARMV:
                    mbmi->second_mv.as_int = nearby.as_int;
                    vp8_clamp_mv(&mbmi->second_mv, mb_to_left_edge, mb_to_right_edge,
                                 mb_to_top_edge, mb_to_bottom_edge);
                    break;
                case NEARESTMV:
                    mbmi->second_mv.as_int = nearest.as_int;
                    vp8_clamp_mv(&mbmi->second_mv, mb_to_left_edge, mb_to_right_edge,
                                 mb_to_top_edge, mb_to_bottom_edge);
                    break;
                case NEWMV:
                    read_mv(bc, &mbmi->second_mv.as_mv, (const MV_CONTEXT *) mvc);
                    mbmi->second_mv.as_mv.row += best_mv.as_mv.row;
                    mbmi->second_mv.as_mv.col += best_mv.as_mv.col;
                    mbmi->need_to_clamp_mvs |= vp8_check_mv_bounds(&mbmi->second_mv,
                                                                   mb_to_left_edge,
                                                                   mb_to_right_edge,
                                                                   mb_to_top_edge,
                                                                   mb_to_bottom_edge);
                    break;
                default:
                    break;
                }
            }
#endif /* CONFIG_DUALPRED */

888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909
#if CONFIG_ERROR_CONCEALMENT
            if(pbi->ec_enabled)
            {
                mi->bmi[ 0].mv.as_int =
                mi->bmi[ 1].mv.as_int =
                mi->bmi[ 2].mv.as_int =
                mi->bmi[ 3].mv.as_int =
                mi->bmi[ 4].mv.as_int =
                mi->bmi[ 5].mv.as_int =
                mi->bmi[ 6].mv.as_int =
                mi->bmi[ 7].mv.as_int =
                mi->bmi[ 8].mv.as_int =
                mi->bmi[ 9].mv.as_int =
                mi->bmi[10].mv.as_int =
                mi->bmi[11].mv.as_int =
                mi->bmi[12].mv.as_int =
                mi->bmi[13].mv.as_int =
                mi->bmi[14].mv.as_int =
                mi->bmi[15].mv.as_int = mv->as_int;
            }
#endif
            break;
Scott LaVarnway's avatar
Scott LaVarnway committed
910 911 912 913 914 915 916 917
        default:;
  #if CONFIG_DEBUG
            assert(0);
  #endif
        }
    }
    else
    {
Scott LaVarnway's avatar
Scott LaVarnway committed
918 919
        /* required for left and above block mv */
        mbmi->mv.as_int = 0;
John Koleszar's avatar
John Koleszar committed
920

921
//#if CONFIG_SEGFEATURES
Paul Wilkins's avatar
Paul Wilkins committed
922 923 924 925 926 927 928 929 930 931 932
        if ( segfeature_active( xd, mbmi->segment_id, SEG_LVL_MODE ) )
            mbmi->mode = (MB_PREDICTION_MODE)
                         get_segdata( xd, mbmi->segment_id, SEG_LVL_MODE );
        else
        {
            mbmi->mode = (MB_PREDICTION_MODE)
                         vp8_read_ymode(bc, pbi->common.fc.ymode_prob);
        }

        // If MB mode is BPRED read the block modes
        if (mbmi->mode == B_PRED)
Scott LaVarnway's avatar
Scott LaVarnway committed
933
        {
Scott LaVarnway's avatar
Scott LaVarnway committed
934
            int j = 0;
Scott LaVarnway's avatar
Scott LaVarnway committed
935 936
            do
            {
Scott LaVarnway's avatar
Scott LaVarnway committed
937
                mi->bmi[j].as_mode = (B_PREDICTION_MODE)vp8_read_bmode(bc, pbi->common.fc.bmode_prob);
Scott LaVarnway's avatar
Scott LaVarnway committed
938 939 940
            }
            while (++j < 16);
        }
John Koleszar's avatar
John Koleszar committed
941

942 943 944 945 946 947 948 949 950 951 952 953 954 955 956
        if(mbmi->mode == I8X8_PRED)
        {
            int i;
            int mode8x8;
            for(i=0;i<4;i++)
            {
                int ib = vp8_i8x8_block[i];
                mode8x8 = vp8_read_i8x8_mode(bc, pbi->common.i8x8_mode_prob);
                mi->bmi[ib+0].as_mode= mode8x8;
                mi->bmi[ib+1].as_mode= mode8x8;
                mi->bmi[ib+4].as_mode= mode8x8;
                mi->bmi[ib+5].as_mode= mode8x8;
            }
        }
        else
957 958 959 960 961 962 963
#if CONFIG_UVINTRA
            mbmi->uv_mode = (MB_PREDICTION_MODE)vp8_read_uv_mode(bc,
                                    pbi->common.fc.uv_mode_prob[mbmi->mode]);
#else
            mbmi->uv_mode = (MB_PREDICTION_MODE)vp8_read_uv_mode(bc,
                                    pbi->common.fc.uv_mode_prob);
#endif /*CONFIG_UVINTRA*/
Scott LaVarnway's avatar
Scott LaVarnway committed
964
    }
John Koleszar's avatar
John Koleszar committed
965

Scott LaVarnway's avatar
Scott LaVarnway committed
966
}
John Koleszar's avatar
John Koleszar committed
967

968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061
#if CONFIG_SUPERBLOCKS
void vp8_decode_mode_mvs(VP8D_COMP *pbi)
{
    int i;
    VP8_COMMON *cm = &pbi->common;
    int sb_row, sb_col;
    int sb_rows = (cm->mb_rows + 1)>>1;
    int sb_cols = (cm->mb_cols + 1)>>1;
    MODE_INFO *mi = cm->mi;
    int row_delta[4] = {-1,  0, +1,  0};
    int col_delta[4] = {+1, +1, -1, +1};

    MODE_INFO *prev_mi = cm->prev_mi;

    mb_mode_mv_init(pbi);

#if CONFIG_QIMODE
    if(cm->frame_type==KEY_FRAME && !cm->kf_ymode_probs_update)
    {
        cm->kf_ymode_probs_index = vp8_read_literal(&pbi->bc, 3);
    }
#endif

    for (sb_row=0; sb_row<sb_rows; sb_row++)
    {
        int mb_col = -col_delta[0];
        int mb_row = (sb_row <<1)-row_delta[0];

        for (sb_col=0; sb_col<sb_cols; sb_col++)
        {
            for ( i=0; i<4; i++ )
            {
                int mb_to_top_edge;
                int mb_to_bottom_edge;

#if CONFIG_ERROR_CONCEALMENT
                int mb_num;
#endif
                int offset_extended = row_delta[(i+1) & 0x3]
                                    * cm->mode_info_stride + col_delta[(i+1) & 0x3];
                int dy = row_delta[i];
                int dx = col_delta[i];

                mb_row += dy;
                mb_col += dx;

                if ((mb_row >= cm->mb_rows) || (mb_col >= cm->mb_cols))
                {
                    prev_mi += offset_extended;
                    mi += offset_extended;       /* next macroblock */
                    continue;
                }

                pbi->mb.mb_to_top_edge =
                mb_to_top_edge = -((mb_row * 16)) << 3;
                mb_to_top_edge -= LEFT_TOP_MARGIN;

                pbi->mb.mb_to_bottom_edge =
                mb_to_bottom_edge = ((pbi->common.mb_rows - 1 - mb_row) * 16) << 3;
                mb_to_bottom_edge += RIGHT_BOTTOM_MARGIN;

#if CONFIG_ERROR_CONCEALMENT
                mb_num = mb_row * pbi->common.mb_cols + mb_col;
#endif
                /*read_mb_modes_mv(pbi, cm->mode_info_context, &cm->mode_info_context->mbmi, mb_row, mb_col);*/
                if(pbi->common.frame_type == KEY_FRAME)
                    vp8_kfread_modes(pbi, mi, mb_row, mb_col);
                else
                    read_mb_modes_mv(pbi, mi, &mi->mbmi,
                    prev_mi,
                    mb_row, mb_col);

#if CONFIG_ERROR_CONCEALMENT
                /* look for corruption. set mvs_corrupt_from_mb to the current
                 * mb_num if the frame is corrupt from this macroblock. */
                if (vp8dx_bool_error(&pbi->bc) && mb_num < pbi->mvs_corrupt_from_mb)
                {
                    pbi->mvs_corrupt_from_mb = mb_num;
                    /* no need to continue since the partition is corrupt from
                     * here on.
                     */
                    return;
                }
#endif

                prev_mi += offset_extended;
                mi += offset_extended;       /* next macroblock */
            }
        }

        mi += cm->mode_info_stride + (1 - (cm->mb_cols & 0x1));
    }
}
#else
Scott LaVarnway's avatar
Scott LaVarnway committed
1062 1063 1064
void vp8_decode_mode_mvs(VP8D_COMP *pbi)
{
    MODE_INFO *mi = pbi->common.mi;
1065 1066 1067

    MODE_INFO *prev_mi = pbi->common.prev_mi;

Scott LaVarnway's avatar
Scott LaVarnway committed
1068
    int mb_row = -1;
John Koleszar's avatar
John Koleszar committed
1069

1070
//#if CONFIG_SEGFEATURES
1071 1072 1073 1074 1075 1076
#if 0
    FILE *statsfile;
    statsfile = fopen("decsegmap.stt", "a");
    fprintf(statsfile, "\n" );
#endif

1077
    mb_mode_mv_init(pbi);
John Koleszar's avatar
John Koleszar committed
1078

1079 1080 1081 1082 1083 1084 1085
#if CONFIG_QIMODE
    if(pbi->common.frame_type==KEY_FRAME && !pbi->common.kf_ymode_probs_update)
    {
        pbi->common.kf_ymode_probs_index = vp8_read_literal(&pbi->bc, 3);
    }
#endif

Scott LaVarnway's avatar
Scott LaVarnway committed
1086 1087 1088 1089 1090
    while (++mb_row < pbi->common.mb_rows)
    {
        int mb_col = -1;
        int mb_to_top_edge;
        int mb_to_bottom_edge;
John Koleszar's avatar
John Koleszar committed
1091

Scott LaVarnway's avatar
Scott LaVarnway committed
1092 1093 1094
        pbi->mb.mb_to_top_edge =
        mb_to_top_edge = -((mb_row * 16)) << 3;
        mb_to_top_edge -= LEFT_TOP_MARGIN;
John Koleszar's avatar
John Koleszar committed
1095

Scott LaVarnway's avatar
Scott LaVarnway committed
1096 1097 1098
        pbi->mb.mb_to_bottom_edge =
        mb_to_bottom_edge = ((pbi->common.mb_rows - 1 - mb_row) * 16) << 3;
        mb_to_bottom_edge += RIGHT_BOTTOM_MARGIN;
John Koleszar's avatar
John Koleszar committed
1099

1100
//#if CONFIG_SEGFEATURES
1101 1102 1103 1104
#if 0
        fprintf(statsfile, "\n" );
#endif

Scott LaVarnway's avatar
Scott LaVarnway committed
1105 1106
        while (++mb_col < pbi->common.mb_cols)
        {