decodemv.c 39.4 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
#include "vp8/common/seg_common.h"
19
#include "vp8/common/pred_common.h"
20
#include "vp8/common/entropy.h"
21

John Koleszar's avatar
John Koleszar committed
22 23 24
#if CONFIG_DEBUG
#include <assert.h>
#endif
25 26 27 28 29 30

//#define DEBUG_DEC_MV
#ifdef DEBUG_DEC_MV
int dec_mvcount = 0;
#endif

Scott LaVarnway's avatar
Scott LaVarnway committed
31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51
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
52 53 54
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
55

Yaowu Xu's avatar
Yaowu Xu committed
56 57
    return i;
}
Scott LaVarnway's avatar
Scott LaVarnway committed
58 59 60 61 62 63 64 65 66


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

67
// This function reads the current macro block's segnent id from the bitstream
Paul Wilkins's avatar
Paul Wilkins committed
68 69
// 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
70
{
71
    /* Is segmentation enabled */
Scott LaVarnway's avatar
Scott LaVarnway committed
72 73
    if (x->segmentation_enabled && x->update_mb_segmentation_map)
    {
74
        /* If so then read the segment id. */
Scott LaVarnway's avatar
Scott LaVarnway committed
75 76 77 78 79 80
        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]));
    }
}
81

Yaowu Xu's avatar
Yaowu Xu committed
82
extern const int vp8_i8x8_block[4];
Paul Wilkins's avatar
Paul Wilkins committed
83 84 85 86
static void vp8_kfread_modes(VP8D_COMP *pbi,
                             MODE_INFO *m,
                             int mb_row,
                             int mb_col)
Scott LaVarnway's avatar
Scott LaVarnway committed
87
{
88
    VP8_COMMON *const cm = & pbi->common;
Scott LaVarnway's avatar
Scott LaVarnway committed
89 90
    vp8_reader *const bc = & pbi->bc;
    const int mis = pbi->common.mode_info_stride;
Paul Wilkins's avatar
Paul Wilkins committed
91
    int map_index = mb_row * pbi->common.mb_cols + mb_col;
Paul Wilkins's avatar
Paul Wilkins committed
92
    MB_PREDICTION_MODE y_mode;
Paul Wilkins's avatar
Paul Wilkins committed
93

Paul Wilkins's avatar
Paul Wilkins committed
94
    // Read the Macroblock segmentation map if it is being updated explicitly
95
    // this frame (reset to 0 by default).
Paul Wilkins's avatar
Paul Wilkins committed
96 97 98 99
    m->mbmi.segment_id = 0;
    if (pbi->mb.update_mb_segmentation_map)
    {
        vp8_read_mb_segid(bc, &m->mbmi, &pbi->mb);
100
        pbi->common.last_frame_seg_map[map_index] = m->mbmi.segment_id;
Paul Wilkins's avatar
Paul Wilkins committed
101
    }
Scott LaVarnway's avatar
Scott LaVarnway committed
102

103
    m->mbmi.mb_skip_coeff = 0;
Paul Wilkins's avatar
Paul Wilkins committed
104 105 106 107 108 109
    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 ) ) )
    {
110 111 112 113
#if CONFIG_NEWENTROPY
        MACROBLOCKD *const xd  = & pbi->mb;
        m->mbmi.mb_skip_coeff = vp8_read(bc, get_pred_prob(cm, xd, PRED_MBSKIP));
#else
Paul Wilkins's avatar
Paul Wilkins committed
114
        m->mbmi.mb_skip_coeff = vp8_read(bc, pbi->prob_skip_false);
115
#endif
Paul Wilkins's avatar
Paul Wilkins committed
116 117 118 119 120 121 122 123 124 125 126 127 128
    }
    else
    {
        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;
    }
129

Paul Wilkins's avatar
Paul Wilkins committed
130 131
    y_mode = (MB_PREDICTION_MODE) vp8_kfread_ymode(bc,
        pbi->common.kf_ymode_prob[pbi->common.kf_ymode_probs_index]);
132 133 134
#if CONFIG_COMP_INTRA_PRED
    m->mbmi.second_mode = (MB_PREDICTION_MODE) (DC_PRED - 1);
#endif
135

Paul Wilkins's avatar
Paul Wilkins committed
136 137 138 139 140
    m->mbmi.ref_frame = INTRA_FRAME;

    if ((m->mbmi.mode = y_mode) == B_PRED)
    {
        int i = 0;
141 142 143
#if CONFIG_COMP_INTRA_PRED
        int use_comp_pred = vp8_read(bc, 128);
#endif
Paul Wilkins's avatar
Paul Wilkins committed
144 145 146 147 148
        do
        {
            const B_PREDICTION_MODE A = above_block_mode(m, i, mis);
            const B_PREDICTION_MODE L = left_block_mode(m, i);

149
            m->bmi[i].as_mode.first =
Paul Wilkins's avatar
Paul Wilkins committed
150 151
                (B_PREDICTION_MODE) vp8_read_bmode(
                                        bc, pbi->common.kf_bmode_prob [A] [L]);
152 153 154 155 156 157 158 159 160 161 162 163
#if CONFIG_COMP_INTRA_PRED
            if (use_comp_pred)
            {
                m->bmi[i].as_mode.second =
                    (B_PREDICTION_MODE) vp8_read_bmode(
                                                   bc, pbi->common.kf_bmode_prob [A] [L]);
            }
            else
            {
                m->bmi[i].as_mode.second = (B_PREDICTION_MODE) (B_DC_PRED - 1);
            }
#endif
Paul Wilkins's avatar
Paul Wilkins committed
164 165 166 167 168 169 170 171 172 173
        }
        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];
174
             mode8x8 = vp8_read_i8x8_mode(bc, pbi->common.fc.i8x8_mode_prob);
175 176 177 178 179 180 181 182 183 184
             m->bmi[ib+0].as_mode.first= mode8x8;
             m->bmi[ib+1].as_mode.first= mode8x8;
             m->bmi[ib+4].as_mode.first= mode8x8;
             m->bmi[ib+5].as_mode.first= mode8x8;
#if CONFIG_COMP_INTRA_PRED
             m->bmi[ib+0].as_mode.second= (MB_PREDICTION_MODE) (DC_PRED - 1);
             m->bmi[ib+1].as_mode.second= (MB_PREDICTION_MODE) (DC_PRED - 1);
             m->bmi[ib+4].as_mode.second= (MB_PREDICTION_MODE) (DC_PRED - 1);
             m->bmi[ib+5].as_mode.second= (MB_PREDICTION_MODE) (DC_PRED - 1);
#endif
Paul Wilkins's avatar
Paul Wilkins committed
185 186 187
         }
   }
    else
Yaowu Xu's avatar
Yaowu Xu committed
188 189
        m->mbmi.uv_mode = (MB_PREDICTION_MODE)vp8_read_uv_mode(bc,
            pbi->common.kf_uv_mode_prob[m->mbmi.mode]);
190 191 192
#if CONFIG_COMP_INTRA_PRED
    m->mbmi.second_uv_mode = (MB_PREDICTION_MODE) (DC_PRED - 1);
#endif
193

Scott LaVarnway's avatar
Scott LaVarnway committed
194
}
John Koleszar's avatar
John Koleszar committed
195 196 197 198 199 200 201 202 203 204 205 206 207 208

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;
        }
209
        while (++i < mvnum_short_bits);
John Koleszar's avatar
John Koleszar committed
210 211 212 213 214 215 216

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

        do
        {
            x += vp8_read(r, p [MVPbits + i]) << i;
        }
217
        while (--i > mvnum_short_bits);
John Koleszar's avatar
John Koleszar committed
218

219 220
        if (!(x & ~((2<<mvnum_short_bits)-1))  ||  vp8_read(r, p [MVPbits + mvnum_short_bits]))
            x += (mvnum_short);
John Koleszar's avatar
John Koleszar committed
221 222 223 224 225 226 227 228 229 230 231 232
    }
    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)
{
233 234
    mv->row = (short)(read_mvcomponent(r,   mvc) << 1);
    mv->col = (short)(read_mvcomponent(r, ++mvc) << 1);
235 236
#ifdef DEBUG_DEC_MV
    int i;
237 238 239
    printf("%d (np): %d %d\n", dec_mvcount++, mv->row, mv->col);
    //for (i=0; i<MVPcount;++i) printf("  %d", (&mvc[-1])->prob[i]); printf("\n");
    //for (i=0; i<MVPcount;++i) printf("  %d", (&mvc[0])->prob[i]); printf("\n");
240
#endif
John Koleszar's avatar
John Koleszar committed
241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267
}


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

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 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340
#if CONFIG_HIGH_PRECISION_MV
static int read_mvcomponent_hp(vp8_reader *r, const MV_CONTEXT_HP *mvc)
{
    const vp8_prob *const p = (const vp8_prob *) mvc;
    int x = 0;

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

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

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

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

        if (!(x & ~((2<<mvnum_short_bits_hp)-1))  ||  vp8_read(r, p [MVPbits_hp + mvnum_short_bits_hp]))
            x += (mvnum_short_hp);
    }
    else   /* small */
        x = vp8_treed_read(r, vp8_small_mvtree_hp, p + MVPshort_hp);

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

    return x;
}

static void read_mv_hp(vp8_reader *r, MV *mv, const MV_CONTEXT_HP *mvc)
{
    mv->row = (short)(read_mvcomponent_hp(r,   mvc));
    mv->col = (short)(read_mvcomponent_hp(r, ++mvc));
#ifdef DEBUG_DEC_MV
    int i;
    printf("%d (hp): %d %d\n", dec_mvcount++, mv->row, mv->col);
    //for (i=0; i<MVPcount_hp;++i) printf("  %d", (&mvc[-1])->prob[i]); printf("\n");
    //for (i=0; i<MVPcount_hp;++i) printf("  %d", (&mvc[0])->prob[i]); printf("\n");
#endif
}

static void read_mvcontexts_hp(vp8_reader *bc, MV_CONTEXT_HP *mvc)
{
    int i = 0;

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

        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);
}
#endif  /* CONFIG_HIGH_PRECISION_MV */

341 342
// Read the referncence frame
static MV_REFERENCE_FRAME read_ref_frame( VP8D_COMP *pbi,
Paul Wilkins's avatar
Paul Wilkins committed
343
                                          vp8_reader *const bc,
344 345 346
                                          unsigned char segment_id )
{
    MV_REFERENCE_FRAME ref_frame;
Paul Wilkins's avatar
Paul Wilkins committed
347
    int seg_ref_active;
Paul Wilkins's avatar
Paul Wilkins committed
348
    int seg_ref_count = 0;
349

350
    VP8_COMMON *const cm = & pbi->common;
351 352
    MACROBLOCKD *const xd = &pbi->mb;

Paul Wilkins's avatar
Paul Wilkins committed
353 354 355
    seg_ref_active = segfeature_active( xd,
                                        segment_id,
                                        SEG_LVL_REF_FRAME );
356

Paul Wilkins's avatar
Paul Wilkins committed
357 358 359 360 361 362 363 364 365 366 367 368 369
    // 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) )
370
    {
371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395
        // 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
396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411
            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 ) );
            }
412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436

            // 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
437 438 439 440 441 442 443 444 445 446 447 448 449
                        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;
450 451 452 453
                    }
                }
            }
        }
454 455
    }

Paul Wilkins's avatar
Paul Wilkins committed
456 457 458
    // Segment reference frame features are enabled
    else
    {
459 460 461 462
        // 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
463
        ref_frame = get_pred_ref( cm, xd );
Paul Wilkins's avatar
Paul Wilkins committed
464 465
    }

466 467
    return (MV_REFERENCE_FRAME)ref_frame;
}
John Koleszar's avatar
John Koleszar committed
468 469 470 471 472 473 474 475

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

476
static B_PREDICTION_MODE sub_mv_ref(vp8_reader *bc, const vp8_prob *p)
John Koleszar's avatar
John Koleszar committed
477 478 479
{
    const int i = vp8_treed_read(bc, vp8_sub_mv_ref_tree, p);

480
    return (B_PREDICTION_MODE)i;
John Koleszar's avatar
John Koleszar committed
481
}
Scott LaVarnway's avatar
Scott LaVarnway committed
482 483

#ifdef VPX_MODE_COUNT
John Koleszar's avatar
John Koleszar committed
484 485 486 487 488 489 490 491
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
492
#endif
John Koleszar's avatar
John Koleszar committed
493

494 495
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
496 497 498 499 500
    { 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
501 502 503



504
static void mb_mode_mv_init(VP8D_COMP *pbi)
Scott LaVarnway's avatar
Scott LaVarnway committed
505
{
506
    VP8_COMMON *const cm = & pbi->common;
Scott LaVarnway's avatar
Scott LaVarnway committed
507 508
    vp8_reader *const bc = & pbi->bc;
    MV_CONTEXT *const mvc = pbi->common.fc.mvc;
509 510 511 512
#if CONFIG_HIGH_PRECISION_MV
    MV_CONTEXT_HP *const mvc_hp = pbi->common.fc.mvc_hp;
    MACROBLOCKD *const xd  = & pbi->mb;
#endif
John Koleszar's avatar
John Koleszar committed
513

514 515 516
#if CONFIG_NEWENTROPY
    vpx_memset(cm->mbskip_pred_probs, 0, sizeof(cm->mbskip_pred_probs));
#else
Scott LaVarnway's avatar
Scott LaVarnway committed
517
    pbi->prob_skip_false = 0;
518
#endif
Scott LaVarnway's avatar
Scott LaVarnway committed
519
    if (pbi->common.mb_no_coeff_skip)
520 521 522 523 524 525
    {
#if CONFIG_NEWENTROPY
        int k;
        for (k=0; k<MBSKIP_CONTEXTS; ++k)
            cm->mbskip_pred_probs[k] = (vp8_prob)vp8_read_literal(bc, 8);
#else
Scott LaVarnway's avatar
Scott LaVarnway committed
526
        pbi->prob_skip_false = (vp8_prob)vp8_read_literal(bc, 8);
527 528
#endif
    }
John Koleszar's avatar
John Koleszar committed
529

530
    if(cm->frame_type != KEY_FRAME)
John Koleszar's avatar
John Koleszar committed
531
    {
532 533 534 535 536 537
#if CONFIG_PRED_FILTER
        cm->pred_filter_mode = (vp8_prob)vp8_read_literal(bc, 2);

        if (cm->pred_filter_mode == 2)
            cm->prob_pred_filter_off = (vp8_prob)vp8_read_literal(bc, 8);
#endif
538 539 540 541 542
        // 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);

543 544 545
        // Computes a modified set of probabilities for use when reference
        // frame prediction fails.
        compute_mod_refprobs( cm );
546

547 548 549 550
        pbi->common.comp_pred_mode = vp8_read(bc, 128);
        if (cm->comp_pred_mode)
            cm->comp_pred_mode += vp8_read(bc, 128);
        if (cm->comp_pred_mode == HYBRID_PREDICTION)
551
        {
Paul Wilkins's avatar
Paul Wilkins committed
552
            int i;
553 554
            for ( i = 0; i < COMP_PRED_CONTEXTS; i++ )
                cm->prob_comppred[i] = (vp8_prob)vp8_read_literal(bc, 8);
555
        }
John Koleszar's avatar
John Koleszar committed
556

Scott LaVarnway's avatar
Scott LaVarnway committed
557
        if (vp8_read_bit(bc))
John Koleszar's avatar
John Koleszar committed
558
        {
Scott LaVarnway's avatar
Scott LaVarnway committed
559
            int i = 0;
John Koleszar's avatar
John Koleszar committed
560

Scott LaVarnway's avatar
Scott LaVarnway committed
561 562
            do
            {
563
                cm->fc.ymode_prob[i] = (vp8_prob) vp8_read_literal(bc, 8);
Scott LaVarnway's avatar
Scott LaVarnway committed
564
            }
Yaowu Xu's avatar
Yaowu Xu committed
565
            while (++i < VP8_YMODES-1);
Scott LaVarnway's avatar
Scott LaVarnway committed
566
        }
567 568 569 570 571
#if CONFIG_HIGH_PRECISION_MV
        if (xd->allow_high_precision_mv)
            read_mvcontexts_hp(bc, mvc_hp);
        else
#endif
Scott LaVarnway's avatar
Scott LaVarnway committed
572
        read_mvcontexts(bc, mvc);
John Koleszar's avatar
John Koleszar committed
573
    }
Scott LaVarnway's avatar
Scott LaVarnway committed
574
}
John Koleszar's avatar
John Koleszar committed
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 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636
// 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;
    }
}
637

638
static void read_mb_modes_mv(VP8D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi,
639
                             MODE_INFO *prev_mi,
Paul Wilkins's avatar
Paul Wilkins committed
640
                             int mb_row, int mb_col)
Scott LaVarnway's avatar
Scott LaVarnway committed
641
{
642
    VP8_COMMON *const cm = & pbi->common;
Scott LaVarnway's avatar
Scott LaVarnway committed
643 644
    vp8_reader *const bc = & pbi->bc;
    MV_CONTEXT *const mvc = pbi->common.fc.mvc;
645 646 647
#if CONFIG_HIGH_PRECISION_MV
    MV_CONTEXT_HP *const mvc_hp = pbi->common.fc.mvc_hp;
#endif
Scott LaVarnway's avatar
Scott LaVarnway committed
648
    const int mis = pbi->common.mode_info_stride;
649
    MACROBLOCKD *const xd  = & pbi->mb;
650

Scott LaVarnway's avatar
Scott LaVarnway committed
651
    int_mv *const mv = & mbmi->mv;
Scott LaVarnway's avatar
Scott LaVarnway committed
652 653 654 655 656
    int mb_to_left_edge;
    int mb_to_right_edge;
    int mb_to_top_edge;
    int mb_to_bottom_edge;

657 658
    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
659 660 661
    mb_to_top_edge -= LEFT_TOP_MARGIN;
    mb_to_bottom_edge += RIGHT_BOTTOM_MARGIN;
    mbmi->need_to_clamp_mvs = 0;
Yaowu Xu's avatar
Yaowu Xu committed
662
    mbmi->need_to_clamp_secondmv = 0;
663
    mbmi->second_ref_frame = 0;
664 665 666
    /* 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
     */
667
    xd->mb_to_left_edge =
Scott LaVarnway's avatar
Scott LaVarnway committed
668 669 670
    mb_to_left_edge = -((mb_col * 16) << 3);
    mb_to_left_edge -= LEFT_TOP_MARGIN;

671
    xd->mb_to_right_edge =
Scott LaVarnway's avatar
Scott LaVarnway committed
672 673 674
    mb_to_right_edge = ((pbi->common.mb_cols - 1 - mb_col) * 16) << 3;
    mb_to_right_edge += RIGHT_BOTTOM_MARGIN;

675 676 677 678 679 680
    // 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 );
681

682 683 684
    if ( pbi->common.mb_no_coeff_skip &&
         ( !segfeature_active( xd,
                               mbmi->segment_id, SEG_LVL_EOB ) ||
Paul Wilkins's avatar
Paul Wilkins committed
685
           (get_segdata( xd, mbmi->segment_id, SEG_LVL_EOB ) != 0) ) )
686 687 688
    {
        // Read the macroblock coeff skip flag if this feature is in use,
        // else default to 0
689 690 691
#if CONFIG_NEWENTROPY
        mbmi->mb_skip_coeff = vp8_read(bc, get_pred_prob(cm, xd, PRED_MBSKIP));
#else
Scott LaVarnway's avatar
Scott LaVarnway committed
692
        mbmi->mb_skip_coeff = vp8_read(bc, pbi->prob_skip_false);
693
#endif
694
    }
Scott LaVarnway's avatar
Scott LaVarnway committed
695
    else
696 697 698
    {
        if ( segfeature_active( xd,
                                mbmi->segment_id, SEG_LVL_EOB ) &&
Paul Wilkins's avatar
Paul Wilkins committed
699
             (get_segdata( xd, mbmi->segment_id, SEG_LVL_EOB ) == 0) )
700 701 702 703 704 705
        {
            mbmi->mb_skip_coeff = 1;
        }
        else
            mbmi->mb_skip_coeff = 0;
    }
John Koleszar's avatar
John Koleszar committed
706

707
    // Read the reference frame
Paul Wilkins's avatar
Paul Wilkins committed
708
    mbmi->ref_frame = read_ref_frame( pbi, bc, mbmi->segment_id );
709 710 711

    // If reference frame is an Inter frame
    if (mbmi->ref_frame)
John Koleszar's avatar
John Koleszar committed
712
    {
Scott LaVarnway's avatar
Scott LaVarnway committed
713
        int rct[4];
Scott LaVarnway's avatar
Scott LaVarnway committed
714
        int_mv nearest, nearby, best_mv;
715
        int_mv nearest_second, nearby_second, best_mv_second;
716
        vp8_prob mv_ref_p [VP8_MVREFS-1];
John Koleszar's avatar
John Koleszar committed
717

718 719 720
        vp8_find_near_mvs(xd, mi,
            prev_mi,
            &nearest, &nearby, &best_mv, rct,
721
                          mbmi->ref_frame, pbi->common.ref_frame_sign_bias);
Yaowu Xu's avatar
Yaowu Xu committed
722
        vp8_mv_ref_probs(&pbi->common, mv_ref_p, rct);
723 724

        // Is the segment level mode feature enabled for this segment
725
        if ( segfeature_active( xd, mbmi->segment_id, SEG_LVL_MODE ) )
John Koleszar's avatar
John Koleszar committed
726
        {
727
            mbmi->mode =
Paul Wilkins's avatar
Paul Wilkins committed
728
                get_segdata( xd, mbmi->segment_id, SEG_LVL_MODE );
John Koleszar's avatar
John Koleszar committed
729
        }
730 731 732
        else
        {
            mbmi->mode = read_mv_ref(bc, mv_ref_p);
Yaowu Xu's avatar
Yaowu Xu committed
733 734

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

737 738 739 740 741 742 743 744 745 746 747 748
#if CONFIG_PRED_FILTER
        if (mbmi->mode >= NEARESTMV && mbmi->mode < SPLITMV)
        {
            // Is the prediction filter enabled
            if (cm->pred_filter_mode == 2)
                mbmi->pred_filter_enabled =
                    vp8_read(bc, cm->prob_pred_filter_off);
            else
                mbmi->pred_filter_enabled = cm->pred_filter_mode;
        }
#endif

749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773
        if ( cm->comp_pred_mode == COMP_PREDICTION_ONLY ||
            (cm->comp_pred_mode == HYBRID_PREDICTION &&
             vp8_read(bc, get_pred_prob( cm, xd, PRED_COMP ))) )
        {
            /* Since we have 3 reference frames, we can only have 3 unique
             * combinations of combinations of 2 different reference frames
             * (A-G, G-L or A-L). In the bitstream, we use this to simply
             * derive the second reference frame from the first reference
             * frame, by saying it's the next one in the enumerator, and
             * if that's > n_refs, then the second reference frame is the
             * first one in the enumerator. */
            mbmi->second_ref_frame = mbmi->ref_frame + 1;
            if (mbmi->second_ref_frame == 4)
                mbmi->second_ref_frame = 1;

            vp8_find_near_mvs(xd, mi,
                              prev_mi,
                              &nearest_second, &nearby_second, &best_mv_second, rct,
                              mbmi->second_ref_frame, pbi->common.ref_frame_sign_bias);
        }
        else
        {
            mbmi->second_ref_frame = 0;
        }

Scott LaVarnway's avatar
Scott LaVarnway committed
774
        mbmi->uv_mode = DC_PRED;
775
        switch (mbmi->mode)
John Koleszar's avatar
John Koleszar committed
776
        {
Scott LaVarnway's avatar
Scott LaVarnway committed
777 778 779
        case SPLITMV:
        {
            const int s = mbmi->partitioning =
780
                      vp8_treed_read(bc, vp8_mbsplit_tree, cm->fc.mbsplit_prob);
Scott LaVarnway's avatar
Scott LaVarnway committed
781 782
            const int num_p = vp8_mbsplit_count [s];
            int j = 0;
783 784 785
#if CONFIG_ADAPTIVE_ENTROPY
            cm->fc.mbsplit_counts[s]++;
#endif
John Koleszar's avatar
John Koleszar committed
786

787
            mbmi->need_to_clamp_mvs = 0;
Scott LaVarnway's avatar
Scott LaVarnway committed
788 789
            do  /* for each subset j */
            {
790 791
                int_mv leftmv, abovemv, second_leftmv, second_abovemv;
                int_mv blockmv, secondmv;
Scott LaVarnway's avatar
Scott LaVarnway committed
792 793
                int k;  /* first block in subset j */
                int mv_contz;
794 795
                int blockmode;

Scott LaVarnway's avatar
Scott LaVarnway committed
796
                k = vp8_mbsplit_offset[s][j];
John Koleszar's avatar
John Koleszar committed
797

Scott LaVarnway's avatar
Scott LaVarnway committed
798 799
                leftmv.as_int = left_block_mv(mi, k);
                abovemv.as_int = above_block_mv(mi, k, mis);
800 801 802 803 804
                if (mbmi->second_ref_frame)
                {
                    second_leftmv.as_int = left_block_second_mv(mi, k);
                    second_abovemv.as_int = above_block_second_mv(mi, k, mis);
                }
805
                mv_contz = vp8_mv_cont(&leftmv, &abovemv);
806 807 808 809
                blockmode = sub_mv_ref(bc, cm->fc.sub_mv_ref_prob [mv_contz]);
#if CONFIG_ADAPTIVE_ENTROPY
                cm->fc.sub_mv_ref_counts[mv_contz][blockmode-LEFT4X4]++;
#endif
John Koleszar's avatar
John Koleszar committed
810

811
                switch (blockmode)
John Koleszar's avatar
John Koleszar committed
812
                {
Scott LaVarnway's avatar
Scott LaVarnway committed
813
                case NEW4X4:
814 815
#if CONFIG_HIGH_PRECISION_MV
                    if (xd->allow_high_precision_mv)
816
                    {
817
                        read_mv_hp(bc, &blockmv.as_mv, (const MV_CONTEXT_HP *) mvc_hp);
818 819 820 821 822
#if CONFIG_ADAPTIVE_ENTROPY
                        cm->fc.MVcount_hp[0][mv_max_hp+(blockmv.as_mv.row)]++;
                        cm->fc.MVcount_hp[1][mv_max_hp+(blockmv.as_mv.col)]++;
#endif
                    }
823 824
                    else
#endif
825 826 827 828 829 830 831
                    {
                        read_mv(bc, &blockmv.as_mv, (const MV_CONTEXT *) mvc);
#if CONFIG_ADAPTIVE_ENTROPY
                        cm->fc.MVcount[0][mv_max+(blockmv.as_mv.row>>1)]++;
                        cm->fc.MVcount[1][mv_max+(blockmv.as_mv.col>>1)]++;
#endif
                    }
Scott LaVarnway's avatar
Scott LaVarnway committed
832 833
                    blockmv.as_mv.row += best_mv.as_mv.row;
                    blockmv.as_mv.col += best_mv.as_mv.col;
834 835 836 837 838

                    if (mbmi->second_ref_frame)
                    {
#if CONFIG_HIGH_PRECISION_MV
                        if (xd->allow_high_precision_mv)
839
                        {
840
                            read_mv_hp(bc, &secondmv.as_mv, (const MV_CONTEXT_HP *) mvc_hp);
841 842 843 844 845
#if CONFIG_ADAPTIVE_ENTROPY
                            cm->fc.MVcount_hp[0][mv_max_hp+(secondmv.as_mv.row)]++;
                            cm->fc.MVcount_hp[1][mv_max_hp+(secondmv.as_mv.col)]++;
#endif
                        }
846 847
                        else
#endif
848
                        {
849
                            read_mv(bc, &secondmv.as_mv, (const MV_CONTEXT *) mvc);
850 851 852 853 854
#if CONFIG_ADAPTIVE_ENTROPY
                            cm->fc.MVcount[0][mv_max+(secondmv.as_mv.row>>1)]++;
                            cm->fc.MVcount[1][mv_max+(secondmv.as_mv.col>>1)]++;
#endif
                        }
855 856 857
                        secondmv.as_mv.row += best_mv_second.as_mv.row;
                        secondmv.as_mv.col += best_mv_second.as_mv.col;
                    }
858
#ifdef VPX_MODE_COUNT
Scott LaVarnway's avatar
Scott LaVarnway committed
859
                    vp8_mv_cont_count[mv_contz][3]++;
860
#endif
Scott LaVarnway's avatar
Scott LaVarnway committed
861 862
                    break;
                case LEFT4X4:
Scott LaVarnway's avatar
Scott LaVarnway committed
863
                    blockmv.as_int = leftmv.as_int;
864 865
                    if (mbmi->second_ref_frame)
                        secondmv.as_int = second_leftmv.as_int;
866
#ifdef VPX_MODE_COUNT
Scott LaVarnway's avatar
Scott LaVarnway committed
867
                    vp8_mv_cont_count[mv_contz][0]++;
868
#endif
Scott LaVarnway's avatar
Scott LaVarnway committed
869 870
                    break;
                case ABOVE4X4:
Scott LaVarnway's avatar
Scott LaVarnway committed
871
                    blockmv.as_int = abovemv.as_int;
872 873
                    if (mbmi->second_ref_frame)
                        secondmv.as_int = second_abovemv.as_int;
874
#ifdef VPX_MODE_COUNT
Scott LaVarnway's avatar
Scott LaVarnway committed
875
                    vp8_mv_cont_count[mv_contz][1]++;
876
#endif
Scott LaVarnway's avatar
Scott LaVarnway committed
877 878
                    break;
                case ZERO4X4:
Scott LaVarnway's avatar
Scott LaVarnway committed
879
                    blockmv.as_int = 0;
880 881
                    if (mbmi->second_ref_frame)
                        secondmv.as_int = 0;
882
#ifdef VPX_MODE_COUNT
Scott LaVarnway's avatar
Scott LaVarnway committed
883
                    vp8_mv_cont_count[mv_contz][2]++;
884
#endif
Scott LaVarnway's avatar
Scott LaVarnway committed
885 886 887
                    break;
                default:
                    break;
John Koleszar's avatar
John Koleszar committed
888 889
                }

890
                mbmi->need_to_clamp_mvs |= vp8_check_mv_bounds(&blockmv,
Scott LaVarnway's avatar
Scott LaVarnway committed
891 892 893 894
                                                          mb_to_left_edge,
                                                          mb_to_right_edge,
                                                          mb_to_top_edge,
                                                          mb_to_bottom_edge);
895 896 897 898 899 900 901 902
                if (mbmi->second_ref_frame)
                {
                    mbmi->need_to_clamp_mvs |= vp8_check_mv_bounds(&secondmv,
                                                                   mb_to_left_edge,
                                                                   mb_to_right_edge,
                                                                   mb_to_top_edge,
                                                                   mb_to_bottom_edge);
                }
John Koleszar's avatar
John Koleszar committed
903 904

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

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

Scott LaVarnway's avatar
Scott LaVarnway committed
913
                    do {
914 915 916
                        mi->bmi[ *fill_offset].as_mv.first.as_int = blockmv.as_int;
                        if (mbmi->second_ref_frame)
                            mi->bmi[ *fill_offset].as_mv.second.as_int = secondmv.as_int;
917
                        fill_offset++;
Scott LaVarnway's avatar
Scott LaVarnway committed
918
                    }while (--fill_count);
John Koleszar's avatar
John Koleszar committed
919 920 921
                }

            }
Scott LaVarnway's avatar
Scott LaVarnway committed
922 923
            while (++j < num_p);
        }
John Koleszar's avatar
John Koleszar committed
924

925 926
        mv->as_int = mi->bmi[15].as_mv.first.as_int;
        mbmi->second_mv.as_int = mi->bmi[15].as_mv.second.as_int;
Scott LaVarnway's avatar
Scott LaVarnway committed
927 928 929 930

        break;  /* done with SPLITMV */

        case NEARMV:
Scott LaVarnway's avatar
Scott LaVarnway committed
931
            mv->as_int = nearby.as_int;
932
            /* Clip "next_nearest" so that it does not extend to far out of image */
Scott LaVarnway's avatar
Scott LaVarnway committed
933 934
            vp8_clamp_mv(mv, mb_to_left_edge, mb_to_right_edge,
                         mb_to_top_edge, mb_to_bottom_edge);
935 936 937 938 939 940 941
            if (mbmi->second_ref_frame)
            {
                mbmi->second_mv.as_int = nearby_second.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;
Scott LaVarnway's avatar
Scott LaVarnway committed
942 943

        case NEARESTMV:
Scott LaVarnway's avatar
Scott LaVarnway committed
944
            mv->as_int = nearest.as_int;
945
            /* Clip "next_nearest" so that it does not extend to far out of image */
Scott LaVarnway's avatar
Scott LaVarnway committed
946 947
            vp8_clamp_mv(mv, mb_to_left_edge, mb_to_right_edge,
                         mb_to_top_edge, mb_to_bottom_edge);
948 949 950 951 952 953 954
            if (mbmi->second_ref_frame)
            {
                mbmi->second_mv.as_int = nearest_second.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;
Scott LaVarnway's avatar
Scott LaVarnway committed
955 956

        case ZEROMV:
Scott LaVarnway's avatar
Scott LaVarnway committed
957
            mv->as_int = 0;
958 959 960
            if (mbmi->second_ref_frame)
                mbmi->second_mv.as_int = 0;
            break;
Scott LaVarnway's avatar
Scott LaVarnway committed
961 962

        case NEWMV:
963 964
#if CONFIG_HIGH_PRECISION_MV
            if (xd->allow_high_precision_mv)
965
            {
966
                read_mv_hp(bc, &mv->as_mv, (const MV_CONTEXT_HP *) mvc_hp);
967 968 969 970 971
#if CONFIG_ADAPTIVE_ENTROPY
                cm->fc.MVcount_hp[0][mv_max_hp+(mv->as_mv.row)]++;
                cm->fc.MVcount_hp[1][mv_max_hp+(mv->as_mv.col)]++;
#endif
            }
972 973
            else
#endif
974 975 976 977 978 979 980
            {
                read_mv(bc, &mv->as_mv, (const MV_CONTEXT *) mvc);
#if CONFIG_ADAPTIVE_ENTROPY
                cm->fc.MVcount[0][mv_max+(mv->as_mv.row>>1)]++;
                cm->fc.MVcount[1][mv_max+(mv->as_mv.col>>1)]++;
#endif
            }
Scott LaVarnway's avatar
Scott LaVarnway committed
981 982
            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
983 984 985 986 987 988

            /* 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
989 990 991 992 993
            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);
994 995
            if (mbmi->second_ref_frame)
            {
996 997
#if CONFIG_HIGH_PRECISION_MV
                    if (xd->allow_high_precision_mv)
998
                    {
999 1000
                        read_mv_hp(bc, &mbmi->second_mv.as_mv,
                                   (const MV_CONTEXT_HP *) mvc_hp);
1001 1002 1003 1004 1005
#if CONFIG_ADAPTIVE_ENTROPY
                        cm->fc.MVcount_hp[0][mv_max_hp+(mbmi->second_mv.as_mv.row)]++;
                        cm->fc.MVcount_hp[1][mv_max_hp+(mbmi->second_mv.as_mv.col)]++;
#endif
                    }
1006 1007
                    else
#endif
1008 1009 1010 1011 1012 1013 1014
                    {
                        read_mv(bc, &mbmi->second_mv.as_mv, (const MV_CONTEXT *) mvc);
#if CONFIG_ADAPTIVE_ENTROPY
                        cm->fc.MVcount[0][mv_max+(mbmi->second_mv.as_mv.row>>1)]++;
                        cm->fc.MVcount[1][mv_max+(mbmi->second_mv.as_mv.col>>1)]++;
#endif
                    }
1015 1016 1017
                    mbmi->second_mv.as_mv.row += best_mv_second.as_mv.row;
                    mbmi->second_mv.as_mv.col += best_mv_second.as_mv.col;
                    mbmi->need_to_clamp_secondmv |= vp8_check_mv_bounds(&mbmi->second_mv,
1018 1019 1020 1021 1022
                                                                   mb_to_left_edge,
                                                                   mb_to_right_edge,
                                                                   mb_to_top_edge,
                                                                   mb_to_bottom_edge);
            }
1023
            break;
Scott LaVarnway's avatar
Scott LaVarnway committed
1024 1025 1026 1027 1028 1029 1030 1031
        default:;
  #if CONFIG_DEBUG
            assert(0);
  #endif
        }
    }
    else
    {
Scott LaVarnway's avatar
Scott LaVarnway committed
1032 1033
        /* required for left and above block mv */
        mbmi->mv.as_int = 0;
John Koleszar's avatar
John Koleszar committed
1034

Paul Wilkins's avatar
Paul Wilkins committed
1035 1036 1037 1038 1039 1040 1041
        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);
1042 1043 1044
#if CONFIG_ADAPTIVE_ENTROPY
            pbi->common.fc.ymode_counts[mbmi->mode]++;
#endif
Paul Wilkins's avatar
Paul Wilkins committed
1045
        }
1046 1047 1048
#if CONFIG_COMP_INTRA_PRED
        mbmi->second_mode = (MB_PREDICTION_MODE) (DC_PRED - 1);
#endif