decodemv.c 35 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

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

Paul Wilkins's avatar
Paul Wilkins committed
141
142
143
144
145
    m->mbmi.ref_frame = INTRA_FRAME;

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

154
            m->bmi[i].as_mode.first =
Paul Wilkins's avatar
Paul Wilkins committed
155
156
                (B_PREDICTION_MODE) vp8_read_bmode(
                                        bc, pbi->common.kf_bmode_prob [A] [L]);
157
158
159
160
161
162
163
164
165
166
167
168
#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
169
170
171
172
173
174
175
176
177
178
179
        }
        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);
180
181
182
183
184
185
186
187
188
189
             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
190
191
192
         }
   }
    else
193
#if CONFIG_UVINTRA
Yaowu Xu's avatar
Yaowu Xu committed
194
195
        m->mbmi.uv_mode = (MB_PREDICTION_MODE)vp8_read_uv_mode(bc,
            pbi->common.kf_uv_mode_prob[m->mbmi.mode]);
196
#else
Yaowu Xu's avatar
Yaowu Xu committed
197
198
        m->mbmi.uv_mode = (MB_PREDICTION_MODE)vp8_read_uv_mode(bc,
            pbi->common.kf_uv_mode_prob);
199
#endif
200
201
202
#if CONFIG_COMP_INTRA_PRED
    m->mbmi.second_uv_mode = (MB_PREDICTION_MODE) (DC_PRED - 1);
#endif
203

Scott LaVarnway's avatar
Scott LaVarnway committed
204
}
John Koleszar's avatar
John Koleszar committed
205
206
207
208
209
210
211
212
213
214
215
216
217
218

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;
        }
219
        while (++i < mvnum_short_bits);
John Koleszar's avatar
John Koleszar committed
220
221
222
223
224
225
226

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

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

229
230
        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
231
232
233
234
235
236
237
238
239
240
241
242
    }
    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)
{
243
244
    mv->row = (short)(read_mvcomponent(r,   mvc) << 1);
    mv->col = (short)(read_mvcomponent(r, ++mvc) << 1);
245
246
#ifdef DEBUG_DEC_MV
    int i;
247
248
249
    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");
250
#endif
John Koleszar's avatar
John Koleszar committed
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
}


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

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
341
342
343
344
345
346
347
348
349
350
#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 */

351
352
// Read the referncence frame
static MV_REFERENCE_FRAME read_ref_frame( VP8D_COMP *pbi,
Paul Wilkins's avatar
Paul Wilkins committed
353
                                          vp8_reader *const bc,
354
355
356
                                          unsigned char segment_id )
{
    MV_REFERENCE_FRAME ref_frame;
Paul Wilkins's avatar
Paul Wilkins committed
357
    int seg_ref_active;
Paul Wilkins's avatar
Paul Wilkins committed
358
    int seg_ref_count = 0;
359

360
    VP8_COMMON *const cm = & pbi->common;
361
362
    MACROBLOCKD *const xd = &pbi->mb;

Paul Wilkins's avatar
Paul Wilkins committed
363
364
365
    seg_ref_active = segfeature_active( xd,
                                        segment_id,
                                        SEG_LVL_REF_FRAME );
366

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

            // 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
447
448
449
450
451
452
453
454
455
456
457
458
459
                        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;
460
461
462
463
                    }
                }
            }
        }
464
465
    }

Paul Wilkins's avatar
Paul Wilkins committed
466
467
468
    // Segment reference frame features are enabled
    else
    {
469
470
471
472
        // 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
473
        ref_frame = get_pred_ref( cm, xd );
Paul Wilkins's avatar
Paul Wilkins committed
474
475
    }

476
477
    return (MV_REFERENCE_FRAME)ref_frame;
}
John Koleszar's avatar
John Koleszar committed
478
479
480
481
482
483
484
485

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

486
static B_PREDICTION_MODE sub_mv_ref(vp8_reader *bc, const vp8_prob *p)
John Koleszar's avatar
John Koleszar committed
487
488
489
{
    const int i = vp8_treed_read(bc, vp8_sub_mv_ref_tree, p);

490
    return (B_PREDICTION_MODE)i;
John Koleszar's avatar
John Koleszar committed
491
}
Scott LaVarnway's avatar
Scott LaVarnway committed
492
493

#ifdef VPX_MODE_COUNT
John Koleszar's avatar
John Koleszar committed
494
495
496
497
498
499
500
501
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
502
#endif
John Koleszar's avatar
John Koleszar committed
503

504
505
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
506
507
508
509
510
    { 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
511
512
513



514
static void mb_mode_mv_init(VP8D_COMP *pbi)
Scott LaVarnway's avatar
Scott LaVarnway committed
515
{
516
    VP8_COMMON *const cm = & pbi->common;
Scott LaVarnway's avatar
Scott LaVarnway committed
517
518
    vp8_reader *const bc = & pbi->bc;
    MV_CONTEXT *const mvc = pbi->common.fc.mvc;
519
520
521
522
#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
523

524
525
526
#if CONFIG_NEWENTROPY
    vpx_memset(cm->mbskip_pred_probs, 0, sizeof(cm->mbskip_pred_probs));
#else
Scott LaVarnway's avatar
Scott LaVarnway committed
527
    pbi->prob_skip_false = 0;
528
#endif
Scott LaVarnway's avatar
Scott LaVarnway committed
529
    if (pbi->common.mb_no_coeff_skip)
530
531
532
533
534
535
    {
#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
536
        pbi->prob_skip_false = (vp8_prob)vp8_read_literal(bc, 8);
537
538
#endif
    }
John Koleszar's avatar
John Koleszar committed
539

Scott LaVarnway's avatar
Scott LaVarnway committed
540
    if(pbi->common.frame_type != KEY_FRAME)
John Koleszar's avatar
John Koleszar committed
541
    {
542
543
544
545
546
        // 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);

547
548
549
        // Computes a modified set of probabilities for use when reference
        // frame prediction fails.
        compute_mod_refprobs( cm );
550

551
552
553
554
        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)
555
        {
Paul Wilkins's avatar
Paul Wilkins committed
556
            int i;
557
558
            for ( i = 0; i < COMP_PRED_CONTEXTS; i++ )
                cm->prob_comppred[i] = (vp8_prob)vp8_read_literal(bc, 8);
559
        }
John Koleszar's avatar
John Koleszar committed
560

Scott LaVarnway's avatar
Scott LaVarnway committed
561
        if (vp8_read_bit(bc))
John Koleszar's avatar
John Koleszar committed
562
        {
Scott LaVarnway's avatar
Scott LaVarnway committed
563
            int i = 0;
John Koleszar's avatar
John Koleszar committed
564

Scott LaVarnway's avatar
Scott LaVarnway committed
565
566
            do
            {
567
                cm->fc.ymode_prob[i] = (vp8_prob) vp8_read_literal(bc, 8);
Scott LaVarnway's avatar
Scott LaVarnway committed
568
            }
Yaowu Xu's avatar
Yaowu Xu committed
569
            while (++i < VP8_YMODES-1);
Scott LaVarnway's avatar
Scott LaVarnway committed
570
        }
571
572
573
#if CONFIG_UVINTRA
        //vp8_read_bit(bc);
#else
Scott LaVarnway's avatar
Scott LaVarnway committed
574
        if (vp8_read_bit(bc))
John Koleszar's avatar
John Koleszar committed
575
        {
Scott LaVarnway's avatar
Scott LaVarnway committed
576
577
578
579
            int i = 0;

            do
            {
580
                cm->fc.uv_mode_prob[i] = (vp8_prob) vp8_read_literal(bc, 8);
Scott LaVarnway's avatar
Scott LaVarnway committed
581
            }
Yaowu Xu's avatar
Yaowu Xu committed
582
            while (++i < VP8_UV_MODES-1);
John Koleszar's avatar
John Koleszar committed
583
        }
584
#endif /* CONFIG_UVINTRA */
585
586
587
588
589
#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
590
        read_mvcontexts(bc, mvc);
John Koleszar's avatar
John Koleszar committed
591
    }
Scott LaVarnway's avatar
Scott LaVarnway committed
592
}
John Koleszar's avatar
John Koleszar committed
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
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
// 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;
    }
}
655

656
static void read_mb_modes_mv(VP8D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi,
657
                             MODE_INFO *prev_mi,
Paul Wilkins's avatar
Paul Wilkins committed
658
                             int mb_row, int mb_col)
Scott LaVarnway's avatar
Scott LaVarnway committed
659
{
660
    VP8_COMMON *const cm = & pbi->common;
Scott LaVarnway's avatar
Scott LaVarnway committed
661
662
    vp8_reader *const bc = & pbi->bc;
    MV_CONTEXT *const mvc = pbi->common.fc.mvc;
663
664
665
#if CONFIG_HIGH_PRECISION_MV
    MV_CONTEXT_HP *const mvc_hp = pbi->common.fc.mvc_hp;
#endif
Scott LaVarnway's avatar
Scott LaVarnway committed
666
    const int mis = pbi->common.mode_info_stride;
667
    MACROBLOCKD *const xd  = & pbi->mb;
668

Scott LaVarnway's avatar
Scott LaVarnway committed
669
    int_mv *const mv = & mbmi->mv;
Scott LaVarnway's avatar
Scott LaVarnway committed
670
671
672
673
674
    int mb_to_left_edge;
    int mb_to_right_edge;
    int mb_to_top_edge;
    int mb_to_bottom_edge;

675
676
    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
677
678
679
    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
680
    mbmi->need_to_clamp_secondmv = 0;
681
    mbmi->second_ref_frame = 0;
682
683
684
    /* 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
     */
685
    xd->mb_to_left_edge =
Scott LaVarnway's avatar
Scott LaVarnway committed
686
687
688
    mb_to_left_edge = -((mb_col * 16) << 3);
    mb_to_left_edge -= LEFT_TOP_MARGIN;

689
    xd->mb_to_right_edge =
Scott LaVarnway's avatar
Scott LaVarnway committed
690
691
692
    mb_to_right_edge = ((pbi->common.mb_cols - 1 - mb_col) * 16) << 3;
    mb_to_right_edge += RIGHT_BOTTOM_MARGIN;

693
694
695
696
697
698
    // 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 );
699

700
701
702
    if ( pbi->common.mb_no_coeff_skip &&
         ( !segfeature_active( xd,
                               mbmi->segment_id, SEG_LVL_EOB ) ||
Paul Wilkins's avatar
Paul Wilkins committed
703
           (get_segdata( xd, mbmi->segment_id, SEG_LVL_EOB ) != 0) ) )
704
705
706
    {
        // Read the macroblock coeff skip flag if this feature is in use,
        // else default to 0
707
708
709
#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
710
        mbmi->mb_skip_coeff = vp8_read(bc, pbi->prob_skip_false);
711
#endif
712
    }
Scott LaVarnway's avatar
Scott LaVarnway committed
713
    else
714
715
716
    {
        if ( segfeature_active( xd,
                                mbmi->segment_id, SEG_LVL_EOB ) &&
Paul Wilkins's avatar
Paul Wilkins committed
717
             (get_segdata( xd, mbmi->segment_id, SEG_LVL_EOB ) == 0) )
718
719
720
721
722
723
        {
            mbmi->mb_skip_coeff = 1;
        }
        else
            mbmi->mb_skip_coeff = 0;
    }
John Koleszar's avatar
John Koleszar committed
724

725
    // Read the reference frame
Paul Wilkins's avatar
Paul Wilkins committed
726
    mbmi->ref_frame = read_ref_frame( pbi, bc, mbmi->segment_id );
727
728
729

    // If reference frame is an Inter frame
    if (mbmi->ref_frame)
John Koleszar's avatar
John Koleszar committed
730
    {
Scott LaVarnway's avatar
Scott LaVarnway committed
731
        int rct[4];
Scott LaVarnway's avatar
Scott LaVarnway committed
732
        int_mv nearest, nearby, best_mv;
733
        vp8_prob mv_ref_p [VP8_MVREFS-1];
John Koleszar's avatar
John Koleszar committed
734

735
736
737
        vp8_find_near_mvs(xd, mi,
            prev_mi,
            &nearest, &nearby, &best_mv, rct,
738
                          mbmi->ref_frame, pbi->common.ref_frame_sign_bias);
Yaowu Xu's avatar
Yaowu Xu committed
739
        vp8_mv_ref_probs(&pbi->common, mv_ref_p, rct);
740
741

        // Is the segment level mode feature enabled for this segment
742
        if ( segfeature_active( xd, mbmi->segment_id, SEG_LVL_MODE ) )
John Koleszar's avatar
John Koleszar committed
743
        {
744
            mbmi->mode =
Paul Wilkins's avatar
Paul Wilkins committed
745
                get_segdata( xd, mbmi->segment_id, SEG_LVL_MODE );
John Koleszar's avatar
John Koleszar committed
746
        }
747
748
749
        else
        {
            mbmi->mode = read_mv_ref(bc, mv_ref_p);
Yaowu Xu's avatar
Yaowu Xu committed
750
751

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

Scott LaVarnway's avatar
Scott LaVarnway committed
754
        mbmi->uv_mode = DC_PRED;
755
        switch (mbmi->mode)
John Koleszar's avatar
John Koleszar committed
756
        {
Scott LaVarnway's avatar
Scott LaVarnway committed
757
758
759
760
761
762
        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
763

764
            mbmi->need_to_clamp_mvs = 0;
Scott LaVarnway's avatar
Scott LaVarnway committed
765
766
            do  /* for each subset j */
            {
Scott LaVarnway's avatar
Scott LaVarnway committed
767
                int_mv leftmv, abovemv;
Scott LaVarnway's avatar
Scott LaVarnway committed
768
                int_mv blockmv;
Scott LaVarnway's avatar
Scott LaVarnway committed
769
770
771
                int k;  /* first block in subset j */
                int mv_contz;
                k = vp8_mbsplit_offset[s][j];
John Koleszar's avatar
John Koleszar committed
772

Scott LaVarnway's avatar
Scott LaVarnway committed
773
774
                leftmv.as_int = left_block_mv(mi, k);
                abovemv.as_int = above_block_mv(mi, k, mis);
775
                mv_contz = vp8_mv_cont(&leftmv, &abovemv);
John Koleszar's avatar
John Koleszar committed
776

777
                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
778
                {
Scott LaVarnway's avatar
Scott LaVarnway committed
779
                case NEW4X4:
780
781
782
783
784
#if CONFIG_HIGH_PRECISION_MV
                    if (xd->allow_high_precision_mv)
                        read_mv_hp(bc, &blockmv.as_mv, (const MV_CONTEXT_HP *) mvc_hp);
                    else
#endif
Scott LaVarnway's avatar
Scott LaVarnway committed
785
786
787
                    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
788
789
790
791
792
  #ifdef VPX_MODE_COUNT
                    vp8_mv_cont_count[mv_contz][3]++;
  #endif
                    break;
                case LEFT4X4:
Scott LaVarnway's avatar
Scott LaVarnway committed
793
                    blockmv.as_int = leftmv.as_int;
Scott LaVarnway's avatar
Scott LaVarnway committed
794
795
796
797
798
  #ifdef VPX_MODE_COUNT
                    vp8_mv_cont_count[mv_contz][0]++;
  #endif
                    break;
                case ABOVE4X4:
Scott LaVarnway's avatar
Scott LaVarnway committed
799
                    blockmv.as_int = abovemv.as_int;
Scott LaVarnway's avatar
Scott LaVarnway committed
800
801
802
803
804
  #ifdef VPX_MODE_COUNT
                    vp8_mv_cont_count[mv_contz][1]++;
  #endif
                    break;
                case ZERO4X4:
Scott LaVarnway's avatar
Scott LaVarnway committed
805
                    blockmv.as_int = 0;
Scott LaVarnway's avatar
Scott LaVarnway committed
806
807
808
809
810
811
  #ifdef VPX_MODE_COUNT
                    vp8_mv_cont_count[mv_contz][2]++;
  #endif
                    break;
                default:
                    break;
John Koleszar's avatar
John Koleszar committed
812
813
                }

814
                mbmi->need_to_clamp_mvs |= vp8_check_mv_bounds(&blockmv,
Scott LaVarnway's avatar
Scott LaVarnway committed
815
816
817
818
                                                          mb_to_left_edge,
                                                          mb_to_right_edge,
                                                          mb_to_top_edge,
                                                          mb_to_bottom_edge);
John Koleszar's avatar
John Koleszar committed
819
820

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

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

Scott LaVarnway's avatar
Scott LaVarnway committed
829
                    do {
Scott LaVarnway's avatar
Scott LaVarnway committed
830
                        mi->bmi[ *fill_offset].mv.as_int = blockmv.as_int;
831
                        fill_offset++;
Scott LaVarnway's avatar
Scott LaVarnway committed
832
                    }while (--fill_count);
John Koleszar's avatar
John Koleszar committed
833
834
835
                }

            }
Scott LaVarnway's avatar
Scott LaVarnway committed
836
837
            while (++j < num_p);
        }
John Koleszar's avatar
John Koleszar committed
838

Scott LaVarnway's avatar
Scott LaVarnway committed
839
        mv->as_int = mi->bmi[15].mv.as_int;
Scott LaVarnway's avatar
Scott LaVarnway committed
840
841
842
843

        break;  /* done with SPLITMV */

        case NEARMV:
Scott LaVarnway's avatar
Scott LaVarnway committed
844
            mv->as_int = nearby.as_int;
845
            /* Clip "next_nearest" so that it does not extend to far out of image */
Scott LaVarnway's avatar
Scott LaVarnway committed
846
847
            vp8_clamp_mv(mv, mb_to_left_edge, mb_to_right_edge,
                         mb_to_top_edge, mb_to_bottom_edge);
848
            goto propagate_mv;
Scott LaVarnway's avatar
Scott LaVarnway committed
849
850

        case NEARESTMV:
Scott LaVarnway's avatar
Scott LaVarnway committed
851
            mv->as_int = nearest.as_int;
852
            /* Clip "next_nearest" so that it does not extend to far out of image */
Scott LaVarnway's avatar
Scott LaVarnway committed
853
854
            vp8_clamp_mv(mv, mb_to_left_edge, mb_to_right_edge,
                         mb_to_top_edge, mb_to_bottom_edge);
855
            goto propagate_mv;
Scott LaVarnway's avatar
Scott LaVarnway committed
856
857

        case ZEROMV:
Scott LaVarnway's avatar
Scott LaVarnway committed
858
            mv->as_int = 0;
859
            goto propagate_mv;
Scott LaVarnway's avatar
Scott LaVarnway committed
860
861

        case NEWMV:
862
863
864
865
866
#if CONFIG_HIGH_PRECISION_MV
            if (xd->allow_high_precision_mv)
                read_mv_hp(bc, &mv->as_mv, (const MV_CONTEXT_HP *) mvc_hp);
            else
#endif
Scott LaVarnway's avatar
Scott LaVarnway committed
867
868
869
            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
870
871
872
873
874
875

            /* 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
876
877
878
879
880
            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);
881

882
        propagate_mv:  /* same MV throughout */
883

884
885
886
            if ( cm->comp_pred_mode == COMP_PREDICTION_ONLY ||
                 (cm->comp_pred_mode == HYBRID_PREDICTION &&
                     vp8_read(bc, get_pred_prob( cm, xd, PRED_COMP ))) )
887
888
889
890
891
892
893
            {
                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
894
895
896
897
898
                vp8_find_near_mvs(xd, mi,
                                  prev_mi,
                                  &nearest, &nearby, &best_mv, rct,
                                  (int)mbmi->second_ref_frame,
                                  pbi->common.ref_frame_sign_bias);
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
                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:
914
915
916
917
918
919
#if CONFIG_HIGH_PRECISION_MV
                    if (xd->allow_high_precision_mv)
                        read_mv_hp(bc, &mbmi->second_mv.as_mv,
                                   (const MV_CONTEXT_HP *) mvc_hp);
                    else
#endif
920
921
922
                    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;
Yaowu Xu's avatar
Yaowu Xu committed
923
                    mbmi->need_to_clamp_secondmv = vp8_check_mv_bounds(&mbmi->second_mv,
924
925
926
927
928
929
930
931
932
933
                                                                   mb_to_left_edge,
                                                                   mb_to_right_edge,
                                                                   mb_to_top_edge,
                                                                   mb_to_bottom_edge);
                    break;
                default:
                    break;
                }
            }

934
            break;
Scott LaVarnway's avatar
Scott LaVarnway committed
935
936
937
938
939
940
941
942
        default:;
  #if CONFIG_DEBUG
            assert(0);
  #endif
        }
    }
    else
    {
Scott LaVarnway's avatar
Scott LaVarnway committed
943
944
        /* required for left and above block mv */
        mbmi->mv.as_int = 0;
John Koleszar's avatar
John Koleszar committed
945

Paul Wilkins's avatar
Paul Wilkins committed
946
947
948
949
950
951
952
953
        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);
        }
954
955
956
#if CONFIG_COMP_INTRA_PRED
        mbmi->second_mode = (MB_PREDICTION_MODE) (DC_PRED - 1);
#endif
Paul Wilkins's avatar
Paul Wilkins committed
957
958
959

        // If MB mode is BPRED read the block modes
        if (mbmi->mode == B_PRED)
Scott LaVarnway's avatar
Scott LaVarnway committed
960
        {
Scott LaVarnway's avatar
Scott LaVarnway committed
961
            int j = 0;
962
#if CONFIG_COMP_INTRA_PRED
963
            int use_comp_pred = vp8_read(bc, 128);
964
#endif
965
966
            do
            {
967
968
969
970
971
972
973
974
975
976
977
                mi->bmi[j].as_mode.first = (B_PREDICTION_MODE)vp8_read_bmode(bc, pbi->common.fc.bmode_prob);
#if CONFIG_COMP_INTRA_PRED
                if (use_comp_pred)
                {
                    mi->bmi[j].as_mode.second = (B_PREDICTION_MODE)vp8_read_bmode(bc, pbi->common.fc.bmode_prob);
                }
                else
                {
                    mi->bmi[j].as_mode.second = (B_PREDICTION_MODE) (B_DC_PRED - 1);
                }
#endif
Scott LaVarnway's avatar
Scott LaVarnway committed
978
979
980
            }
            while (++j < 16);
        }
John Koleszar's avatar
John Koleszar committed
981

982
983
984
985
986
987
988
989
        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);
990
991
992
993
994
995
996
997
998
999
                mi->bmi[ib+0].as_mode.first= mode8x8;
                mi->bmi[ib+1].as_mode.first= mode8x8;
                mi->bmi[ib+4].as_mode.first= mode8x8;
                mi->bmi[ib+5].as_mode.first= mode8x8;
#if CONFIG_COMP_INTRA_PRED
                mi->bmi[ib+0].as_mode.second= (MB_PREDICTION_MODE) (DC_PRED - 1);
                mi->bmi[ib+1].as_mode.second= (MB_PREDICTION_MODE) (DC_PRED - 1);
                mi->bmi[ib+4].as_mode.second= (MB_PREDICTION_MODE) (DC_PRED - 1);
                mi->bmi[ib+5].as_mode.second= (MB_PREDICTION_MODE) (DC_PRED - 1);
#endif
1000
1001
1002
            }
        }
        else
1003
1004
1005
1006
1007
1008
1009
#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*/
1010
1011
1012
#if CONFIG_COMP_INTRA_PRED
        mbmi->second_uv_mode = (MB_PREDICTION_MODE) (DC_PRED - 1);
#endif
Scott LaVarnway's avatar
Scott LaVarnway committed
1013
    }
John Koleszar's avatar
John Koleszar committed
1014

Scott LaVarnway's avatar
Scott LaVarnway committed
1015
}
John Koleszar's avatar
John Koleszar committed
1016

Scott LaVarnway's avatar
Scott LaVarnway committed
1017
1018
void vp8_decode_mode_mvs(VP8D_COMP *pbi)
{
Adrian Grange's avatar
Adrian Grange committed
1019
1020
1021
    int i;
    VP8_COMMON *cm = &pbi->common;
    MODE_INFO *mi = cm->mi;
1022
    MACROBLOCKD *const xd  = &pbi->mb;
Adrian Grange's avatar
Adrian Grange committed
1023
1024
1025
1026
1027
    int sb_row, sb_col;
    int sb_rows = (cm->mb_rows + 1)>>1;
    int sb_cols = (cm->mb_cols + 1)>>1;
    int row_delta[4] = { 0, +1,  0, -1};
    int col_delta[4] = {+1, -1, +1, +1};
1028

Adrian Grange's avatar
Adrian Grange committed
1029
    MODE_INFO *prev_mi = cm->prev_mi;
1030

1031
    mb_mode_mv_init(pbi);
John Koleszar's avatar
John Koleszar committed
1032

1033
#if CONFIG_QIMODE
Adrian Grange's avatar
Adrian Grange committed
1034
    if(cm->frame_type==KEY_FRAME && !cm->kf_ymode_probs_update)
1035
    {
Adrian Grange's avatar
Adrian Grange committed
1036
        cm->kf_ymode_probs_index = vp8_read_literal(&pbi->bc, 3);
1037
1038
1039
    }
#endif

Adrian Grange's avatar
Adrian Grange committed
1040
    for (sb_row=0; sb_row<sb_rows; sb_row++)
Scott LaVarnway's avatar
Scott LaVarnway committed
1041
    {
Adrian Grange's avatar
Adrian Grange committed
1042
1043
        int mb_col = 0;
        int mb_row = (sb_row <<1);
John Koleszar's avatar
John Koleszar committed
1044

Adrian Grange's avatar
Adrian Grange committed
1045
        for (sb_col=0; sb_col<sb_cols; sb_col++)
Scott LaVarnway's avatar
Scott LaVarnway committed
1046
        {
Adrian Grange's avatar
Adrian Grange committed
1047
            for ( i=0; i<4; i++ )
1048
            {
Adrian Grange's avatar
Adrian Grange committed
1049
1050
                int mb_to_top_edge;
                int mb_to_bottom_edge;
John Koleszar's avatar
John Koleszar committed
1051

Adrian Grange's avatar
Adrian Grange committed
1052
1053
1054
                int dy = row_delta[i];
                int dx = col_delta[i];
                int offset_extended = dy * cm->mode_info_stride + dx;
Yaowu Xu's avatar
Yaowu Xu committed
1055

Adrian Grange's avatar
Adrian Grange committed
1056
1057
1058
1059
1060
1061
1062
1063
1064
                if ((mb_row >= cm->mb_rows) || (mb_col >= cm->mb_cols))
                {
                    /* next macroblock */
                    mb_row += dy;
                    mb_col += dx;
                    mi += offset_extended;
                    prev_mi += offset_extended;
                    continue;
                }
Yaowu Xu's avatar
Yaowu Xu committed
1065

1066
1067
1068
1069
                // Make sure the MacroBlockD mode info pointer is set correctly
                xd->mode_info_context = mi;
                xd->prev_mode_info_context = prev_mi;

Adrian Grange's avatar
Adrian Grange committed
1070
1071
                pbi->mb.mb_to_top_edge = mb_to_top_edge = -((mb_row * 16)) << 3;
                                         mb_to_top_edge -= LEFT_TOP_MARGIN;
1072

Adrian Grange's avatar
Adrian Grange committed
1073
1074
1075
1076
                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;
1077

Adrian Grange's avatar
Adrian Grange committed
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
                if(cm->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);

                /* next macroblock */
                mb_row += dy;
                mb_col += dx;
                mi += offset_extended;
                prev_mi += offset_extended;
            }
        }
1091

Adrian Grange's avatar
Adrian Grange committed
1092
1093
1094
        mi += cm->mode_info_stride + (1 - (cm->mb_cols & 0x1));
        prev_mi += cm->mode_info_stride + (1 - (cm->mb_cols & 0x1));
    }
1095
}