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


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

John Koleszar's avatar
John Koleszar committed
18
19
20
#if CONFIG_DEBUG
#include <assert.h>
#endif
Scott LaVarnway's avatar
Scott LaVarnway committed
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
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;
}



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

static void vp8_read_mb_features(vp8_reader *r, MB_MODE_INFO *mi, MACROBLOCKD *x)
{
54
    /* Is segmentation enabled */
Scott LaVarnway's avatar
Scott LaVarnway committed
55
56
    if (x->segmentation_enabled && x->update_mb_segmentation_map)
    {
57
        /* If so then read the segment id. */
Scott LaVarnway's avatar
Scott LaVarnway committed
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
        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]));
    }
}

static void vp8_kfread_modes(VP8D_COMP *pbi, MODE_INFO *m, int mb_row, int mb_col)
{
    vp8_reader *const bc = & pbi->bc;
    const int mis = pbi->common.mode_info_stride;

        {
            MB_PREDICTION_MODE y_mode;

73
74
75
            /* Read the Macroblock segmentation map if it is being updated explicitly this frame (reset to 0 above by default)
             * By default on a key frame reset all MBs to segment 0
             */
Scott LaVarnway's avatar
Scott LaVarnway committed
76
77
78
79
80
            m->mbmi.segment_id = 0;

            if (pbi->mb.update_mb_segmentation_map)
                vp8_read_mb_features(bc, &m->mbmi, &pbi->mb);

81
            /* Read the macroblock coeff skip flag if this feature is in use, else default to 0 */
Scott LaVarnway's avatar
Scott LaVarnway committed
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
            if (pbi->common.mb_no_coeff_skip)
                m->mbmi.mb_skip_coeff = vp8_read(bc, pbi->prob_skip_false);
            else
                m->mbmi.mb_skip_coeff = 0;

            y_mode = (MB_PREDICTION_MODE) vp8_kfread_ymode(bc, pbi->common.kf_ymode_prob);

            m->mbmi.ref_frame = INTRA_FRAME;

            if ((m->mbmi.mode = y_mode) == B_PRED)
            {
                int i = 0;

                do
                {
Scott LaVarnway's avatar
Scott LaVarnway committed
97
98
                    const B_PREDICTION_MODE A = above_block_mode(m, i, mis);
                    const B_PREDICTION_MODE L = left_block_mode(m, i);
Scott LaVarnway's avatar
Scott LaVarnway committed
99

Scott LaVarnway's avatar
Scott LaVarnway committed
100
                    m->bmi[i].as_mode = (B_PREDICTION_MODE) vp8_read_bmode(bc, pbi->common.kf_bmode_prob [A] [L]);
Scott LaVarnway's avatar
Scott LaVarnway committed
101
102
103
104
105
106
107
                }
                while (++i < 16);
            }

            m->mbmi.uv_mode = (MB_PREDICTION_MODE)vp8_read_uv_mode(bc, pbi->common.kf_uv_mode_prob);
        }
}
John Koleszar's avatar
John Koleszar committed
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182

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

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

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

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

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

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

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

    return x;
}

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


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

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

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

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


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

183
static B_PREDICTION_MODE sub_mv_ref(vp8_reader *bc, const vp8_prob *p)
John Koleszar's avatar
John Koleszar committed
184
185
186
{
    const int i = vp8_treed_read(bc, vp8_sub_mv_ref_tree, p);

187
    return (B_PREDICTION_MODE)i;
John Koleszar's avatar
John Koleszar committed
188
}
Scott LaVarnway's avatar
Scott LaVarnway committed
189
190

#ifdef VPX_MODE_COUNT
John Koleszar's avatar
John Koleszar committed
191
192
193
194
195
196
197
198
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
199
#endif
John Koleszar's avatar
John Koleszar committed
200

201
202
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
203
204
205
206
207
    { 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
208
209
210



211
static void mb_mode_mv_init(VP8D_COMP *pbi)
Scott LaVarnway's avatar
Scott LaVarnway committed
212
213
214
{
    vp8_reader *const bc = & pbi->bc;
    MV_CONTEXT *const mvc = pbi->common.fc.mvc;
215
#if CONFIG_SEGMENTATION
216
    MACROBLOCKD *const xd  = & pbi->mb;
217
#endif
John Koleszar's avatar
John Koleszar committed
218

219
220
221
222
223
224
#if CONFIG_ERROR_CONCEALMENT
    /* Default is that no macroblock is corrupt, therefore we initialize
     * mvs_corrupt_from_mb to something very big, which we can be sure is
     * outside the frame. */
    pbi->mvs_corrupt_from_mb = UINT_MAX;
#endif
Scott LaVarnway's avatar
Scott LaVarnway committed
225
226
227
    pbi->prob_skip_false = 0;
    if (pbi->common.mb_no_coeff_skip)
        pbi->prob_skip_false = (vp8_prob)vp8_read_literal(bc, 8);
John Koleszar's avatar
John Koleszar committed
228

Scott LaVarnway's avatar
Scott LaVarnway committed
229
    if(pbi->common.frame_type != KEY_FRAME)
John Koleszar's avatar
John Koleszar committed
230
    {
Scott LaVarnway's avatar
Scott LaVarnway committed
231
232
233
        pbi->prob_intra = (vp8_prob)vp8_read_literal(bc, 8);
        pbi->prob_last  = (vp8_prob)vp8_read_literal(bc, 8);
        pbi->prob_gf    = (vp8_prob)vp8_read_literal(bc, 8);
John Koleszar's avatar
John Koleszar committed
234

Scott LaVarnway's avatar
Scott LaVarnway committed
235
        if (vp8_read_bit(bc))
John Koleszar's avatar
John Koleszar committed
236
        {
Scott LaVarnway's avatar
Scott LaVarnway committed
237
            int i = 0;
John Koleszar's avatar
John Koleszar committed
238

Scott LaVarnway's avatar
Scott LaVarnway committed
239
240
241
242
243
244
            do
            {
                pbi->common.fc.ymode_prob[i] = (vp8_prob) vp8_read_literal(bc, 8);
            }
            while (++i < 4);
        }
John Koleszar's avatar
John Koleszar committed
245

Scott LaVarnway's avatar
Scott LaVarnway committed
246
        if (vp8_read_bit(bc))
John Koleszar's avatar
John Koleszar committed
247
        {
Scott LaVarnway's avatar
Scott LaVarnway committed
248
249
250
251
252
253
254
            int i = 0;

            do
            {
                pbi->common.fc.uv_mode_prob[i] = (vp8_prob) vp8_read_literal(bc, 8);
            }
            while (++i < 3);
John Koleszar's avatar
John Koleszar committed
255
256
        }

Scott LaVarnway's avatar
Scott LaVarnway committed
257
        read_mvcontexts(bc, mvc);
258
259
260
#if CONFIG_SEGMENTATION
    xd->temporal_update = vp8_read_bit(bc);
#endif
John Koleszar's avatar
John Koleszar committed
261
    }
Scott LaVarnway's avatar
Scott LaVarnway committed
262
}
John Koleszar's avatar
John Koleszar committed
263

264

265
static void read_mb_modes_mv(VP8D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi,
Scott LaVarnway's avatar
Scott LaVarnway committed
266
267
268
269
270
                            int mb_row, int mb_col)
{
    vp8_reader *const bc = & pbi->bc;
    MV_CONTEXT *const mvc = pbi->common.fc.mvc;
    const int mis = pbi->common.mode_info_stride;
271
272
273
274
275
#if CONFIG_SEGMENTATION
    MACROBLOCKD *const xd  = & pbi->mb;
    int sum;
    int index = mb_row * pbi->common.mb_cols + mb_col;
#endif
Scott LaVarnway's avatar
Scott LaVarnway committed
276
    int_mv *const mv = & mbmi->mv;
Scott LaVarnway's avatar
Scott LaVarnway committed
277
278
279
280
281
282
283
284
285
286
    int mb_to_left_edge;
    int mb_to_right_edge;
    int mb_to_top_edge;
    int mb_to_bottom_edge;

    mb_to_top_edge = pbi->mb.mb_to_top_edge;
    mb_to_bottom_edge = pbi->mb.mb_to_bottom_edge;
    mb_to_top_edge -= LEFT_TOP_MARGIN;
    mb_to_bottom_edge += RIGHT_BOTTOM_MARGIN;
    mbmi->need_to_clamp_mvs = 0;
287
288
289
    /* 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
     */
Scott LaVarnway's avatar
Scott LaVarnway committed
290
291
292
293
294
295
296
297
    pbi->mb.mb_to_left_edge =
    mb_to_left_edge = -((mb_col * 16) << 3);
    mb_to_left_edge -= LEFT_TOP_MARGIN;

    pbi->mb.mb_to_right_edge =
    mb_to_right_edge = ((pbi->common.mb_cols - 1 - mb_col) * 16) << 3;
    mb_to_right_edge += RIGHT_BOTTOM_MARGIN;

298
    /* If required read in new segmentation data for this MB */
Scott LaVarnway's avatar
Scott LaVarnway committed
299
    if (pbi->mb.update_mb_segmentation_map)
300
301
            {
#if CONFIG_SEGMENTATION
302
303
304
                if (xd->temporal_update)
                {
                    sum = 0;
305

306
307
308
                    if (mb_col != 0)
                        sum += (mi-1)->mbmi.segment_flag;
                    if (mb_row != 0)
309
                        sum += (mi-pbi->common.mb_cols)->mbmi.segment_flag;
310

311
                    if (vp8_read(bc, xd->mb_segment_tree_probs[3+sum]) == 0)
312
                    {
313
314
                        mbmi->segment_id = pbi->segmentation_map[index];
                        mbmi->segment_flag = 0;
315
                    }
316
317
318
319
320
321
322
                    else
                    {
                        vp8_read_mb_features(bc, &mi->mbmi, &pbi->mb);
                        mbmi->segment_flag = 1;
                        pbi->segmentation_map[index] = mbmi->segment_id;
                    }

323
324
325
                }
                else
                {
326
327
                    vp8_read_mb_features(bc, &mi->mbmi, &pbi->mb);
                    pbi->segmentation_map[index] = mbmi->segment_id;
328
                }
329
                index++;
330
331
332
333
#else
                vp8_read_mb_features(bc, &mi->mbmi, &pbi->mb);
#endif
            }
John Koleszar's avatar
John Koleszar committed
334

335

336
    /* Read the macroblock coeff skip flag if this feature is in use, else default to 0 */
Scott LaVarnway's avatar
Scott LaVarnway committed
337
338
339
340
    if (pbi->common.mb_no_coeff_skip)
        mbmi->mb_skip_coeff = vp8_read(bc, pbi->prob_skip_false);
    else
        mbmi->mb_skip_coeff = 0;
John Koleszar's avatar
John Koleszar committed
341

Scott LaVarnway's avatar
Scott LaVarnway committed
342
    if ((mbmi->ref_frame = (MV_REFERENCE_FRAME) vp8_read(bc, pbi->prob_intra)))    /* inter MB */
John Koleszar's avatar
John Koleszar committed
343
    {
Scott LaVarnway's avatar
Scott LaVarnway committed
344
345
        int rct[4];
        vp8_prob mv_ref_p [VP8_MVREFS-1];
Scott LaVarnway's avatar
Scott LaVarnway committed
346
        int_mv nearest, nearby, best_mv;
John Koleszar's avatar
John Koleszar committed
347

Scott LaVarnway's avatar
Scott LaVarnway committed
348
        if (vp8_read(bc, pbi->prob_last))
John Koleszar's avatar
John Koleszar committed
349
        {
Scott LaVarnway's avatar
Scott LaVarnway committed
350
            mbmi->ref_frame = (MV_REFERENCE_FRAME)((int)mbmi->ref_frame + (int)(1 + vp8_read(bc, pbi->prob_gf)));
John Koleszar's avatar
John Koleszar committed
351
352
        }

Scott LaVarnway's avatar
Scott LaVarnway committed
353
        vp8_find_near_mvs(&pbi->mb, mi, &nearest, &nearby, &best_mv, rct, mbmi->ref_frame, pbi->common.ref_frame_sign_bias);
John Koleszar's avatar
John Koleszar committed
354

Scott LaVarnway's avatar
Scott LaVarnway committed
355
        vp8_mv_ref_probs(mv_ref_p, rct);
John Koleszar's avatar
John Koleszar committed
356

Scott LaVarnway's avatar
Scott LaVarnway committed
357
358
        mbmi->uv_mode = DC_PRED;
        switch (mbmi->mode = read_mv_ref(bc, mv_ref_p))
John Koleszar's avatar
John Koleszar committed
359
        {
Scott LaVarnway's avatar
Scott LaVarnway committed
360
361
362
363
364
365
        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
366

Scott LaVarnway's avatar
Scott LaVarnway committed
367
368
            do  /* for each subset j */
            {
Scott LaVarnway's avatar
Scott LaVarnway committed
369
                int_mv leftmv, abovemv;
Scott LaVarnway's avatar
Scott LaVarnway committed
370
                int_mv blockmv;
Scott LaVarnway's avatar
Scott LaVarnway committed
371
372
373
                int k;  /* first block in subset j */
                int mv_contz;
                k = vp8_mbsplit_offset[s][j];
John Koleszar's avatar
John Koleszar committed
374

Scott LaVarnway's avatar
Scott LaVarnway committed
375
376
                leftmv.as_int = left_block_mv(mi, k);
                abovemv.as_int = above_block_mv(mi, k, mis);
377
                mv_contz = vp8_mv_cont(&leftmv, &abovemv);
John Koleszar's avatar
John Koleszar committed
378

379
                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
380
                {
Scott LaVarnway's avatar
Scott LaVarnway committed
381
                case NEW4X4:
Scott LaVarnway's avatar
Scott LaVarnway committed
382
383
384
                    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
385
386
387
388
389
  #ifdef VPX_MODE_COUNT
                    vp8_mv_cont_count[mv_contz][3]++;
  #endif
                    break;
                case LEFT4X4:
Scott LaVarnway's avatar
Scott LaVarnway committed
390
                    blockmv.as_int = leftmv.as_int;
Scott LaVarnway's avatar
Scott LaVarnway committed
391
392
393
394
395
  #ifdef VPX_MODE_COUNT
                    vp8_mv_cont_count[mv_contz][0]++;
  #endif
                    break;
                case ABOVE4X4:
Scott LaVarnway's avatar
Scott LaVarnway committed
396
                    blockmv.as_int = abovemv.as_int;
Scott LaVarnway's avatar
Scott LaVarnway committed
397
398
399
400
401
  #ifdef VPX_MODE_COUNT
                    vp8_mv_cont_count[mv_contz][1]++;
  #endif
                    break;
                case ZERO4X4:
Scott LaVarnway's avatar
Scott LaVarnway committed
402
                    blockmv.as_int = 0;
Scott LaVarnway's avatar
Scott LaVarnway committed
403
404
405
406
407
408
  #ifdef VPX_MODE_COUNT
                    vp8_mv_cont_count[mv_contz][2]++;
  #endif
                    break;
                default:
                    break;
John Koleszar's avatar
John Koleszar committed
409
410
                }

Scott LaVarnway's avatar
Scott LaVarnway committed
411
                mbmi->need_to_clamp_mvs = vp8_check_mv_bounds(&blockmv,
Scott LaVarnway's avatar
Scott LaVarnway committed
412
413
414
415
                                                          mb_to_left_edge,
                                                          mb_to_right_edge,
                                                          mb_to_top_edge,
                                                          mb_to_bottom_edge);
John Koleszar's avatar
John Koleszar committed
416
417

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

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

Scott LaVarnway's avatar
Scott LaVarnway committed
426
                    do {
Scott LaVarnway's avatar
Scott LaVarnway committed
427
                        mi->bmi[ *fill_offset].mv.as_int = blockmv.as_int;
428
                        fill_offset++;
Scott LaVarnway's avatar
Scott LaVarnway committed
429
                    }while (--fill_count);
John Koleszar's avatar
John Koleszar committed
430
431
432
                }

            }
Scott LaVarnway's avatar
Scott LaVarnway committed
433
434
            while (++j < num_p);
        }
John Koleszar's avatar
John Koleszar committed
435

Scott LaVarnway's avatar
Scott LaVarnway committed
436
        mv->as_int = mi->bmi[15].mv.as_int;
Scott LaVarnway's avatar
Scott LaVarnway committed
437
438
439
440

        break;  /* done with SPLITMV */

        case NEARMV:
Scott LaVarnway's avatar
Scott LaVarnway committed
441
            mv->as_int = nearby.as_int;
442
            /* Clip "next_nearest" so that it does not extend to far out of image */
Scott LaVarnway's avatar
Scott LaVarnway committed
443
444
            vp8_clamp_mv(mv, mb_to_left_edge, mb_to_right_edge,
                         mb_to_top_edge, mb_to_bottom_edge);
445
            goto propagate_mv;
Scott LaVarnway's avatar
Scott LaVarnway committed
446
447

        case NEARESTMV:
Scott LaVarnway's avatar
Scott LaVarnway committed
448
            mv->as_int = nearest.as_int;
449
            /* Clip "next_nearest" so that it does not extend to far out of image */
Scott LaVarnway's avatar
Scott LaVarnway committed
450
451
            vp8_clamp_mv(mv, mb_to_left_edge, mb_to_right_edge,
                         mb_to_top_edge, mb_to_bottom_edge);
452
            goto propagate_mv;
Scott LaVarnway's avatar
Scott LaVarnway committed
453
454

        case ZEROMV:
Scott LaVarnway's avatar
Scott LaVarnway committed
455
            mv->as_int = 0;
456
            goto propagate_mv;
Scott LaVarnway's avatar
Scott LaVarnway committed
457
458

        case NEWMV:
Scott LaVarnway's avatar
Scott LaVarnway committed
459
460
461
            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
462
463
464
465
466
467

            /* 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
468
469
470
471
472
            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);
473

474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
        propagate_mv:  /* same MV throughout */
#if CONFIG_ERROR_CONCEALMENT
            if(pbi->ec_enabled)
            {
                mi->bmi[ 0].mv.as_int =
                mi->bmi[ 1].mv.as_int =
                mi->bmi[ 2].mv.as_int =
                mi->bmi[ 3].mv.as_int =
                mi->bmi[ 4].mv.as_int =
                mi->bmi[ 5].mv.as_int =
                mi->bmi[ 6].mv.as_int =
                mi->bmi[ 7].mv.as_int =
                mi->bmi[ 8].mv.as_int =
                mi->bmi[ 9].mv.as_int =
                mi->bmi[10].mv.as_int =
                mi->bmi[11].mv.as_int =
                mi->bmi[12].mv.as_int =
                mi->bmi[13].mv.as_int =
                mi->bmi[14].mv.as_int =
                mi->bmi[15].mv.as_int = mv->as_int;
            }
#endif
            break;
Scott LaVarnway's avatar
Scott LaVarnway committed
497
498
499
500
501
502
503
504
        default:;
  #if CONFIG_DEBUG
            assert(0);
  #endif
        }
    }
    else
    {
Scott LaVarnway's avatar
Scott LaVarnway committed
505
506
        /* required for left and above block mv */
        mbmi->mv.as_int = 0;
John Koleszar's avatar
John Koleszar committed
507

Scott LaVarnway's avatar
Scott LaVarnway committed
508
        /* MB is intra coded */
Scott LaVarnway's avatar
Scott LaVarnway committed
509
510
        if ((mbmi->mode = (MB_PREDICTION_MODE) vp8_read_ymode(bc, pbi->common.fc.ymode_prob)) == B_PRED)
        {
Scott LaVarnway's avatar
Scott LaVarnway committed
511
            int j = 0;
Scott LaVarnway's avatar
Scott LaVarnway committed
512
513
            do
            {
Scott LaVarnway's avatar
Scott LaVarnway committed
514
                mi->bmi[j].as_mode = (B_PREDICTION_MODE)vp8_read_bmode(bc, pbi->common.fc.bmode_prob);
Scott LaVarnway's avatar
Scott LaVarnway committed
515
516
517
            }
            while (++j < 16);
        }
John Koleszar's avatar
John Koleszar committed
518

Scott LaVarnway's avatar
Scott LaVarnway committed
519
520
        mbmi->uv_mode = (MB_PREDICTION_MODE)vp8_read_uv_mode(bc, pbi->common.fc.uv_mode_prob);
    }
John Koleszar's avatar
John Koleszar committed
521

Scott LaVarnway's avatar
Scott LaVarnway committed
522
}
John Koleszar's avatar
John Koleszar committed
523

Scott LaVarnway's avatar
Scott LaVarnway committed
524
525
526
527
void vp8_decode_mode_mvs(VP8D_COMP *pbi)
{
    MODE_INFO *mi = pbi->common.mi;
    int mb_row = -1;
John Koleszar's avatar
John Koleszar committed
528

529
    mb_mode_mv_init(pbi);
John Koleszar's avatar
John Koleszar committed
530

Scott LaVarnway's avatar
Scott LaVarnway committed
531
532
533
534
535
    while (++mb_row < pbi->common.mb_rows)
    {
        int mb_col = -1;
        int mb_to_top_edge;
        int mb_to_bottom_edge;
John Koleszar's avatar
John Koleszar committed
536

Scott LaVarnway's avatar
Scott LaVarnway committed
537
538
539
        pbi->mb.mb_to_top_edge =
        mb_to_top_edge = -((mb_row * 16)) << 3;
        mb_to_top_edge -= LEFT_TOP_MARGIN;
John Koleszar's avatar
John Koleszar committed
540

Scott LaVarnway's avatar
Scott LaVarnway committed
541
542
543
        pbi->mb.mb_to_bottom_edge =
        mb_to_bottom_edge = ((pbi->common.mb_rows - 1 - mb_row) * 16) << 3;
        mb_to_bottom_edge += RIGHT_BOTTOM_MARGIN;
John Koleszar's avatar
John Koleszar committed
544

Scott LaVarnway's avatar
Scott LaVarnway committed
545
546
        while (++mb_col < pbi->common.mb_cols)
        {
547
#if CONFIG_ERROR_CONCEALMENT
548
            int mb_num = mb_row * pbi->common.mb_cols + mb_col;
549
#endif
550
            /*read_mb_modes_mv(pbi, xd->mode_info_context, &xd->mode_info_context->mbmi, mb_row, mb_col);*/
Scott LaVarnway's avatar
Scott LaVarnway committed
551
552
            if(pbi->common.frame_type == KEY_FRAME)
                vp8_kfread_modes(pbi, mi, mb_row, mb_col);
John Koleszar's avatar
John Koleszar committed
553
            else
554
                read_mb_modes_mv(pbi, mi, &mi->mbmi, mb_row, mb_col);
John Koleszar's avatar
John Koleszar committed
555

556
557
558
559
560
561
562
563
564
565
566
567
568
#if CONFIG_ERROR_CONCEALMENT
            /* look for corruption. set mvs_corrupt_from_mb to the current
             * mb_num if the frame is corrupt from this macroblock. */
            if (vp8dx_bool_error(&pbi->bc) && mb_num < pbi->mvs_corrupt_from_mb)
            {
                pbi->mvs_corrupt_from_mb = mb_num;
                /* no need to continue since the partition is corrupt from
                 * here on.
                 */
                return;
            }
#endif

569
            mi++;       /* next macroblock */
John Koleszar's avatar
John Koleszar committed
570
571
        }

572
        mi++;           /* skip left predictor each row */
John Koleszar's avatar
John Koleszar committed
573
574
    }
}