vp8.c 101.9 KB
Newer Older
1
/*
P
Peter Ross 已提交
2
 * VP7/VP8 compatible video decoder
D
David Conrad 已提交
3 4 5
 *
 * Copyright (C) 2010 David Conrad
 * Copyright (C) 2010 Ronald S. Bultje
6
 * Copyright (C) 2010 Jason Garrett-Glaser
D
Daniel Kang 已提交
7
 * Copyright (C) 2012 Daniel Kang
P
Peter Ross 已提交
8
 * Copyright (C) 2014 Peter Ross
D
David Conrad 已提交
9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26
 *
 * This file is part of FFmpeg.
 *
 * FFmpeg is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * FFmpeg is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with FFmpeg; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

27
#include "libavutil/imgutils.h"
V
Vittorio Giovara 已提交
28

D
David Conrad 已提交
29
#include "avcodec.h"
30
#include "internal.h"
D
David Conrad 已提交
31
#include "rectangle.h"
R
Ronald S. Bultje 已提交
32
#include "thread.h"
V
Vittorio Giovara 已提交
33 34
#include "vp8.h"
#include "vp8data.h"
D
David Conrad 已提交
35

36 37 38 39
#if ARCH_ARM
#   include "arm/vp8.h"
#endif

P
Peter Ross 已提交
40 41 42 43 44 45 46 47
#if CONFIG_VP7_DECODER && CONFIG_VP8_DECODER
#define VPX(vp7, f) (vp7 ? vp7_ ## f : vp8_ ## f)
#elif CONFIG_VP7_DECODER
#define VPX(vp7, f) vp7_ ## f
#else // CONFIG_VP8_DECODER
#define VPX(vp7, f) vp8_ ## f
#endif

48 49
static void free_buffers(VP8Context *s)
{
D
Daniel Kang 已提交
50 51 52
    int i;
    if (s->thread_data)
        for (i = 0; i < MAX_THREADS; i++) {
53 54 55 56
#if HAVE_THREADS
            pthread_cond_destroy(&s->thread_data[i].cond);
            pthread_mutex_destroy(&s->thread_data[i].lock);
#endif
D
Daniel Kang 已提交
57 58 59
            av_freep(&s->thread_data[i].filter_strength);
        }
    av_freep(&s->thread_data);
60 61 62 63 64 65 66 67
    av_freep(&s->macroblocks_base);
    av_freep(&s->intra4x4_pred_mode_top);
    av_freep(&s->top_nnz);
    av_freep(&s->top_border);

    s->macroblocks = NULL;
}

68
static int vp8_alloc_frame(VP8Context *s, VP8Frame *f, int ref)
69 70
{
    int ret;
71 72
    if ((ret = ff_thread_get_buffer(s->avctx, &f->tf,
                                    ref ? AV_GET_BUFFER_FLAG_REF : 0)) < 0)
73
        return ret;
74 75
    if (!(f->seg_map = av_buffer_allocz(s->mb_width * s->mb_height))) {
        ff_thread_release_buffer(s->avctx, &f->tf);
76 77 78 79 80
        return AVERROR(ENOMEM);
    }
    return 0;
}

81
static void vp8_release_frame(VP8Context *s, VP8Frame *f)
82
{
83 84 85 86
    av_buffer_unref(&f->seg_map);
    ff_thread_release_buffer(s->avctx, &f->tf);
}

P
Peter Ross 已提交
87
#if CONFIG_VP8_DECODER
88 89 90 91 92 93 94 95 96 97 98 99
static int vp8_ref_frame(VP8Context *s, VP8Frame *dst, VP8Frame *src)
{
    int ret;

    vp8_release_frame(s, dst);

    if ((ret = ff_thread_ref_frame(&dst->tf, &src->tf)) < 0)
        return ret;
    if (src->seg_map &&
        !(dst->seg_map = av_buffer_ref(src->seg_map))) {
        vp8_release_frame(s, dst);
        return AVERROR(ENOMEM);
100
    }
101 102

    return 0;
103
}
P
Peter Ross 已提交
104
#endif /* CONFIG_VP8_DECODER */
105

106
static void vp8_decode_flush_impl(AVCodecContext *avctx, int free_mem)
D
David Conrad 已提交
107 108 109 110
{
    VP8Context *s = avctx->priv_data;
    int i;

111 112
    for (i = 0; i < FF_ARRAY_ELEMS(s->frames); i++)
        vp8_release_frame(s, &s->frames[i]);
D
David Conrad 已提交
113 114
    memset(s->framep, 0, sizeof(s->framep));

115
    if (free_mem)
116
        free_buffers(s);
117 118 119 120
}

static void vp8_decode_flush(AVCodecContext *avctx)
{
121
    vp8_decode_flush_impl(avctx, 0);
D
David Conrad 已提交
122 123
}

P
Peter Ross 已提交
124
static VP8Frame *vp8_find_free_buffer(VP8Context *s)
P
Peter Ross 已提交
125 126 127 128 129 130
{
    VP8Frame *frame = NULL;
    int i;

    // find a free buffer
    for (i = 0; i < 5; i++)
P
Peter Ross 已提交
131
        if (&s->frames[i] != s->framep[VP56_FRAME_CURRENT]  &&
P
Peter Ross 已提交
132
            &s->frames[i] != s->framep[VP56_FRAME_PREVIOUS] &&
P
Peter Ross 已提交
133
            &s->frames[i] != s->framep[VP56_FRAME_GOLDEN]   &&
P
Peter Ross 已提交
134 135 136 137 138 139 140 141 142 143 144 145 146 147
            &s->frames[i] != s->framep[VP56_FRAME_GOLDEN2]) {
            frame = &s->frames[i];
            break;
        }
    if (i == 5) {
        av_log(s->avctx, AV_LOG_FATAL, "Ran out of free frames!\n");
        abort();
    }
    if (frame->tf.f->data[0])
        vp8_release_frame(s, frame);

    return frame;
}

P
Peter Ross 已提交
148 149
static av_always_inline
int update_dimensions(VP8Context *s, int width, int height, int is_vp7)
D
David Conrad 已提交
150
{
D
Daniel Kang 已提交
151
    AVCodecContext *avctx = s->avctx;
152
    int i, ret;
D
Daniel Kang 已提交
153

154
    if (width  != s->avctx->width || ((width+15)/16 != s->mb_width || (height+15)/16 != s->mb_height) && s->macroblocks_base ||
R
Ronald S. Bultje 已提交
155
        height != s->avctx->height) {
156
        vp8_decode_flush_impl(s->avctx, 1);
D
David Conrad 已提交
157

158 159 160
        ret = ff_set_dimensions(s->avctx, width, height);
        if (ret < 0)
            return ret;
R
Ronald S. Bultje 已提交
161
    }
D
David Conrad 已提交
162

V
Vittorio Giovara 已提交
163 164
    s->mb_width  = (s->avctx->coded_width  + 15) / 16;
    s->mb_height = (s->avctx->coded_height + 15) / 16;
D
David Conrad 已提交
165

P
Peter Ross 已提交
166 167
    s->mb_layout = is_vp7 || avctx->active_thread_type == FF_THREAD_SLICE &&
                   FFMIN(s->num_coeff_partitions, avctx->thread_count) > 1;
D
Daniel Kang 已提交
168
    if (!s->mb_layout) { // Frame threading and one thread
V
Vittorio Giovara 已提交
169 170 171 172 173 174 175 176 177
        s->macroblocks_base       = av_mallocz((s->mb_width + s->mb_height * 2 + 1) *
                                               sizeof(*s->macroblocks));
        s->intra4x4_pred_mode_top = av_mallocz(s->mb_width * 4);
    } else // Sliced threading
        s->macroblocks_base = av_mallocz((s->mb_width + 2) * (s->mb_height + 2) *
                                         sizeof(*s->macroblocks));
    s->top_nnz     = av_mallocz(s->mb_width * sizeof(*s->top_nnz));
    s->top_border  = av_mallocz((s->mb_width + 1) * sizeof(*s->top_border));
    s->thread_data = av_mallocz(MAX_THREADS * sizeof(VP8ThreadData));
D
David Conrad 已提交
178

D
Daniel Kang 已提交
179
    for (i = 0; i < MAX_THREADS; i++) {
V
Vittorio Giovara 已提交
180 181
        s->thread_data[i].filter_strength =
            av_mallocz(s->mb_width * sizeof(*s->thread_data[0].filter_strength));
182
#if HAVE_THREADS
D
Daniel Kang 已提交
183 184
        pthread_mutex_init(&s->thread_data[i].lock, NULL);
        pthread_cond_init(&s->thread_data[i].cond, NULL);
185
#endif
D
Daniel Kang 已提交
186
    }
D
David Conrad 已提交
187

D
Daniel Kang 已提交
188 189
    if (!s->macroblocks_base || !s->top_nnz || !s->top_border ||
        (!s->intra4x4_pred_mode_top && !s->mb_layout))
D
David Conrad 已提交
190 191
        return AVERROR(ENOMEM);

V
Vittorio Giovara 已提交
192
    s->macroblocks = s->macroblocks_base + 1;
D
David Conrad 已提交
193 194 195 196

    return 0;
}

P
Peter Ross 已提交
197 198 199 200 201 202 203 204 205 206
static int vp7_update_dimensions(VP8Context *s, int width, int height)
{
    return update_dimensions(s, width, height, IS_VP7);
}

static int vp8_update_dimensions(VP8Context *s, int width, int height)
{
    return update_dimensions(s, width, height, IS_VP8);
}

P
Peter Ross 已提交
207

D
David Conrad 已提交
208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233
static void parse_segment_info(VP8Context *s)
{
    VP56RangeCoder *c = &s->c;
    int i;

    s->segmentation.update_map = vp8_rac_get(c);

    if (vp8_rac_get(c)) { // update segment feature data
        s->segmentation.absolute_vals = vp8_rac_get(c);

        for (i = 0; i < 4; i++)
            s->segmentation.base_quant[i]   = vp8_rac_get_sint(c, 7);

        for (i = 0; i < 4; i++)
            s->segmentation.filter_level[i] = vp8_rac_get_sint(c, 6);
    }
    if (s->segmentation.update_map)
        for (i = 0; i < 3; i++)
            s->prob->segmentid[i] = vp8_rac_get(c) ? vp8_rac_get_uint(c, 8) : 255;
}

static void update_lf_deltas(VP8Context *s)
{
    VP56RangeCoder *c = &s->c;
    int i;

234 235 236
    for (i = 0; i < 4; i++) {
        if (vp8_rac_get(c)) {
            s->lf_delta.ref[i] = vp8_rac_get_uint(c, 6);
D
David Conrad 已提交
237

238 239 240 241 242 243 244 245 246 247 248 249 250
            if (vp8_rac_get(c))
                s->lf_delta.ref[i] = -s->lf_delta.ref[i];
        }
    }

    for (i = MODE_I4x4; i <= VP8_MVMODE_SPLIT; i++) {
        if (vp8_rac_get(c)) {
            s->lf_delta.mode[i] = vp8_rac_get_uint(c, 6);

            if (vp8_rac_get(c))
                s->lf_delta.mode[i] = -s->lf_delta.mode[i];
        }
    }
D
David Conrad 已提交
251 252 253 254 255 256 257 258 259
}

static int setup_partitions(VP8Context *s, const uint8_t *buf, int buf_size)
{
    const uint8_t *sizes = buf;
    int i;

    s->num_coeff_partitions = 1 << vp8_rac_get_uint(&s->c, 2);

V
Vittorio Giovara 已提交
260 261
    buf      += 3 * (s->num_coeff_partitions - 1);
    buf_size -= 3 * (s->num_coeff_partitions - 1);
D
David Conrad 已提交
262 263 264
    if (buf_size < 0)
        return -1;

V
Vittorio Giovara 已提交
265 266
    for (i = 0; i < s->num_coeff_partitions - 1; i++) {
        int size = AV_RL24(sizes + 3 * i);
D
David Conrad 已提交
267 268 269
        if (buf_size - size < 0)
            return -1;

270
        ff_vp56_init_range_decoder(&s->coeff_partition[i], buf, size);
D
David Conrad 已提交
271 272 273
        buf      += size;
        buf_size -= size;
    }
274
    ff_vp56_init_range_decoder(&s->coeff_partition[i], buf, buf_size);
D
David Conrad 已提交
275 276 277

    return 0;
}
P
Peter Ross 已提交
278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296

static void vp7_get_quants(VP8Context *s)
{
    VP56RangeCoder *c = &s->c;

    int yac_qi  = vp8_rac_get_uint(c, 7);
    int ydc_qi  = vp8_rac_get(c) ? vp8_rac_get_uint(c, 7) : yac_qi;
    int y2dc_qi = vp8_rac_get(c) ? vp8_rac_get_uint(c, 7) : yac_qi;
    int y2ac_qi = vp8_rac_get(c) ? vp8_rac_get_uint(c, 7) : yac_qi;
    int uvdc_qi = vp8_rac_get(c) ? vp8_rac_get_uint(c, 7) : yac_qi;
    int uvac_qi = vp8_rac_get(c) ? vp8_rac_get_uint(c, 7) : yac_qi;

    s->qmat[0].luma_qmul[0]    =       vp7_ydc_qlookup[ydc_qi];
    s->qmat[0].luma_qmul[1]    =       vp7_yac_qlookup[yac_qi];
    s->qmat[0].luma_dc_qmul[0] =       vp7_y2dc_qlookup[y2dc_qi];
    s->qmat[0].luma_dc_qmul[1] =       vp7_y2ac_qlookup[y2ac_qi];
    s->qmat[0].chroma_qmul[0]  = FFMIN(vp7_ydc_qlookup[uvdc_qi], 132);
    s->qmat[0].chroma_qmul[1]  =       vp7_yac_qlookup[uvac_qi];
}
D
David Conrad 已提交
297

P
Peter Ross 已提交
298
static void vp8_get_quants(VP8Context *s)
D
David Conrad 已提交
299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317
{
    VP56RangeCoder *c = &s->c;
    int i, base_qi;

    int yac_qi     = vp8_rac_get_uint(c, 7);
    int ydc_delta  = vp8_rac_get_sint(c, 4);
    int y2dc_delta = vp8_rac_get_sint(c, 4);
    int y2ac_delta = vp8_rac_get_sint(c, 4);
    int uvdc_delta = vp8_rac_get_sint(c, 4);
    int uvac_delta = vp8_rac_get_sint(c, 4);

    for (i = 0; i < 4; i++) {
        if (s->segmentation.enabled) {
            base_qi = s->segmentation.base_quant[i];
            if (!s->segmentation.absolute_vals)
                base_qi += yac_qi;
        } else
            base_qi = yac_qi;

V
Vittorio Giovara 已提交
318 319 320
        s->qmat[i].luma_qmul[0]    = vp8_dc_qlookup[av_clip_uintp2(base_qi + ydc_delta,  7)];
        s->qmat[i].luma_qmul[1]    = vp8_ac_qlookup[av_clip_uintp2(base_qi,              7)];
        s->qmat[i].luma_dc_qmul[0] = vp8_dc_qlookup[av_clip_uintp2(base_qi + y2dc_delta, 7)] * 2;
321
        /* 101581>>16 is equivalent to 155/100 */
V
Vittorio Giovara 已提交
322 323 324
        s->qmat[i].luma_dc_qmul[1] = vp8_ac_qlookup[av_clip_uintp2(base_qi + y2ac_delta, 7)] * 101581 >> 16;
        s->qmat[i].chroma_qmul[0]  = vp8_dc_qlookup[av_clip_uintp2(base_qi + uvdc_delta, 7)];
        s->qmat[i].chroma_qmul[1]  = vp8_ac_qlookup[av_clip_uintp2(base_qi + uvac_delta, 7)];
325 326 327

        s->qmat[i].luma_dc_qmul[1] = FFMAX(s->qmat[i].luma_dc_qmul[1], 8);
        s->qmat[i].chroma_qmul[0]  = FFMIN(s->qmat[i].chroma_qmul[0], 132);
D
David Conrad 已提交
328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358
    }
}

/**
 * Determine which buffers golden and altref should be updated with after this frame.
 * The spec isn't clear here, so I'm going by my understanding of what libvpx does
 *
 * Intra frames update all 3 references
 * Inter frames update VP56_FRAME_PREVIOUS if the update_last flag is set
 * If the update (golden|altref) flag is set, it's updated with the current frame
 *      if update_last is set, and VP56_FRAME_PREVIOUS otherwise.
 * If the flag is not set, the number read means:
 *      0: no update
 *      1: VP56_FRAME_PREVIOUS
 *      2: update golden with altref, or update altref with golden
 */
static VP56Frame ref_to_update(VP8Context *s, int update, VP56Frame ref)
{
    VP56RangeCoder *c = &s->c;

    if (update)
        return VP56_FRAME_CURRENT;

    switch (vp8_rac_get_uint(c, 2)) {
    case 1:
        return VP56_FRAME_PREVIOUS;
    case 2:
        return (ref == VP56_FRAME_GOLDEN) ? VP56_FRAME_GOLDEN2 : VP56_FRAME_GOLDEN;
    }
    return VP56_FRAME_NONE;
}
P
Peter Ross 已提交
359 360 361 362 363 364

static void vp78_reset_probability_tables(VP8Context *s)
{
    int i, j;
    for (i = 0; i < 4; i++)
        for (j = 0; j < 16; j++)
P
Peter Ross 已提交
365
            memcpy(s->prob->token[i][j], vp8_token_default_probs[i][vp8_coeff_band[j]],
P
Peter Ross 已提交
366 367 368 369 370 371 372 373 374 375 376
                   sizeof(s->prob->token[i][j]));
}

static void vp78_update_probability_tables(VP8Context *s)
{
    VP56RangeCoder *c = &s->c;
    int i, j, k, l, m;

    for (i = 0; i < 4; i++)
        for (j = 0; j < 8; j++)
            for (k = 0; k < 3; k++)
P
Peter Ross 已提交
377
                for (l = 0; l < NUM_DCT_TOKENS-1; l++)
P
Peter Ross 已提交
378 379 380 381 382 383 384
                    if (vp56_rac_get_prob_branchy(c, vp8_token_update_probs[i][j][k][l])) {
                        int prob = vp8_rac_get_uint(c, 8);
                        for (m = 0; vp8_coeff_band_indexes[j][m] >= 0; m++)
                            s->prob->token[i][vp8_coeff_band_indexes[j][m]][k][l] = prob;
                    }
}

P
Peter Ross 已提交
385 386 387 388 389
#define VP7_MVC_SIZE 17
#define VP8_MVC_SIZE 19

static void vp78_update_pred16x16_pred8x8_mvc_probabilities(VP8Context *s,
                                                            int mvc_size)
P
Peter Ross 已提交
390 391 392 393 394 395 396 397 398 399 400 401 402
{
    VP56RangeCoder *c = &s->c;
    int i, j;

    if (vp8_rac_get(c))
        for (i = 0; i < 4; i++)
            s->prob->pred16x16[i] = vp8_rac_get_uint(c, 8);
    if (vp8_rac_get(c))
        for (i = 0; i < 3; i++)
            s->prob->pred8x8c[i]  = vp8_rac_get_uint(c, 8);

    // 17.2 MV probability update
    for (i = 0; i < 2; i++)
P
Peter Ross 已提交
403
        for (j = 0; j < mvc_size; j++)
P
Peter Ross 已提交
404 405 406
            if (vp56_rac_get_prob_branchy(c, vp8_mv_update_prob[i][j]))
                s->prob->mvc[i][j] = vp8_rac_get_nn(c);
}
D
David Conrad 已提交
407 408 409 410 411 412 413 414 415 416 417

static void update_refs(VP8Context *s)
{
    VP56RangeCoder *c = &s->c;

    int update_golden = vp8_rac_get(c);
    int update_altref = vp8_rac_get(c);

    s->update_golden = ref_to_update(s, update_golden, VP56_FRAME_GOLDEN);
    s->update_altref = ref_to_update(s, update_altref, VP56_FRAME_GOLDEN2);
}
P
Peter Ross 已提交
418

419
static void copy_chroma(AVFrame *dst, AVFrame *src, int width, int height)
P
Peter Ross 已提交
420 421 422 423 424 425 426 427 428 429
{
    int i, j;

    for (j = 1; j < 3; j++) {
        for (i = 0; i < height / 2; i++)
            memcpy(dst->data[j] + i * dst->linesize[j],
                   src->data[j] + i * src->linesize[j], width / 2);
    }
}

430 431 432
static void fade(uint8_t *dst, int dst_linesize,
                 const uint8_t *src, int src_linesize,
                 int width, int height,
P
Peter Ross 已提交
433
                 int alpha, int beta)
P
Peter Ross 已提交
434 435
{
    int i, j;
P
Peter Ross 已提交
436
    for (j = 0; j < height; j++) {
P
Peter Ross 已提交
437
        for (i = 0; i < width; i++) {
438 439
            uint8_t y = src[j * src_linesize + i];
            dst[j * dst_linesize + i] = av_clip_uint8(y + ((y * beta) >> 8) + alpha);
P
Peter Ross 已提交
440
        }
P
Peter Ross 已提交
441 442 443 444 445 446 447 448 449 450 451 452 453 454
    }
}

static int vp7_fade_frame(VP8Context *s, VP56RangeCoder *c)
{
    int alpha = (int8_t) vp8_rac_get_uint(c, 8);
    int beta  = (int8_t) vp8_rac_get_uint(c, 8);
    int ret;

    if (!s->keyframe && (alpha || beta)) {
        int width  = s->mb_width * 16;
        int height = s->mb_height * 16;
        AVFrame *src, *dst;

455 456 457
        if (!s->framep[VP56_FRAME_PREVIOUS] ||
            !s->framep[VP56_FRAME_GOLDEN]) {
            av_log(s->avctx, AV_LOG_WARNING, "Discarding interframe without a prior keyframe!\n");
P
Peter Ross 已提交
458
            return AVERROR_INVALIDDATA;
459
        }
P
Peter Ross 已提交
460 461 462 463 464 465 466 467

        dst =
        src = s->framep[VP56_FRAME_PREVIOUS]->tf.f;

        /* preserve the golden frame, write a new previous frame */
        if (s->framep[VP56_FRAME_GOLDEN] == s->framep[VP56_FRAME_PREVIOUS]) {
            s->framep[VP56_FRAME_PREVIOUS] = vp8_find_free_buffer(s);
            if ((ret = vp8_alloc_frame(s, s->framep[VP56_FRAME_PREVIOUS], 1)) < 0)
468
                return ret;
P
Peter Ross 已提交
469 470 471

            dst = s->framep[VP56_FRAME_PREVIOUS]->tf.f;

472
            copy_chroma(dst, src, width, height);
P
Peter Ross 已提交
473 474
        }

475 476 477
        fade(dst->data[0], dst->linesize[0],
             src->data[0], src->linesize[0],
             width, height, alpha, beta);
P
Peter Ross 已提交
478 479 480
    }

    return 0;
P
Peter Ross 已提交
481 482 483 484 485 486 487 488 489
}

static int vp7_decode_frame_header(VP8Context *s, const uint8_t *buf, int buf_size)
{
    VP56RangeCoder *c = &s->c;
    int part1_size, hscale, vscale, i, j, ret;
    int width  = s->avctx->width;
    int height = s->avctx->height;

P
Peter Ross 已提交
490
    s->profile = (buf[0] >> 1) & 7;
P
Peter Ross 已提交
491 492 493 494 495 496 497 498 499
    if (s->profile > 1) {
        avpriv_request_sample(s->avctx, "Unknown profile %d", s->profile);
        return AVERROR_INVALIDDATA;
    }

    s->keyframe  = !(buf[0] & 1);
    s->invisible = 0;
    part1_size   = AV_RL24(buf) >> 4;

500 501 502 503 504
    if (buf_size < 4 - s->profile + part1_size) {
        av_log(s->avctx, AV_LOG_ERROR, "Buffer size %d is too small, needed : %d\n", buf_size, 4 - s->profile + part1_size);
        return AVERROR_INVALIDDATA;
    }

P
Peter Ross 已提交
505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524
    buf      += 4 - s->profile;
    buf_size -= 4 - s->profile;

    memcpy(s->put_pixels_tab, s->vp8dsp.put_vp8_epel_pixels_tab, sizeof(s->put_pixels_tab));

    ff_vp56_init_range_decoder(c, buf, part1_size);
    buf      += part1_size;
    buf_size -= part1_size;

    /* A. Dimension information (keyframes only) */
    if (s->keyframe) {
        width  = vp8_rac_get_uint(c, 12);
        height = vp8_rac_get_uint(c, 12);
        hscale = vp8_rac_get_uint(c, 2);
        vscale = vp8_rac_get_uint(c, 2);
        if (hscale || vscale)
            avpriv_request_sample(s->avctx, "Upscaling");

        s->update_golden = s->update_altref = VP56_FRAME_CURRENT;
        vp78_reset_probability_tables(s);
P
Peter Ross 已提交
525 526 527 528
        memcpy(s->prob->pred16x16, vp8_pred16x16_prob_inter,
               sizeof(s->prob->pred16x16));
        memcpy(s->prob->pred8x8c, vp8_pred8x8c_prob_inter,
               sizeof(s->prob->pred8x8c));
P
Peter Ross 已提交
529
        for (i = 0; i < 2; i++)
P
Peter Ross 已提交
530 531
            memcpy(s->prob->mvc[i], vp7_mv_default_prob[i],
                   sizeof(vp7_mv_default_prob[i]));
P
Peter Ross 已提交
532 533 534 535 536 537 538 539 540 541 542 543 544 545 546
        memset(&s->segmentation, 0, sizeof(s->segmentation));
        memset(&s->lf_delta, 0, sizeof(s->lf_delta));
        memcpy(s->prob[0].scan, zigzag_scan, sizeof(s->prob[0].scan));
    }

    if (s->keyframe || s->profile > 0)
        memset(s->inter_dc_pred, 0 , sizeof(s->inter_dc_pred));

    /* B. Decoding information for all four macroblock-level features */
    for (i = 0; i < 4; i++) {
        s->feature_enabled[i] = vp8_rac_get(c);
        if (s->feature_enabled[i]) {
             s->feature_present_prob[i] = vp8_rac_get_uint(c, 8);

             for (j = 0; j < 3; j++)
P
Peter Ross 已提交
547 548
                 s->feature_index_prob[i][j] =
                     vp8_rac_get(c) ? vp8_rac_get_uint(c, 8) : 255;
P
Peter Ross 已提交
549

550
             if (vp7_feature_value_size[s->profile][i])
P
Peter Ross 已提交
551
                 for (j = 0; j < 4; j++)
P
Peter Ross 已提交
552
                     s->feature_value[i][j] =
553
                        vp8_rac_get(c) ? vp8_rac_get_uint(c, vp7_feature_value_size[s->profile][i]) : 0;
P
Peter Ross 已提交
554 555 556
        }
    }

P
Peter Ross 已提交
557
    s->segmentation.enabled    = 0;
P
Peter Ross 已提交
558
    s->segmentation.update_map = 0;
P
Peter Ross 已提交
559
    s->lf_delta.enabled        = 0;
P
Peter Ross 已提交
560 561 562 563 564

    s->num_coeff_partitions = 1;
    ff_vp56_init_range_decoder(&s->coeff_partition[0], buf, buf_size);

    if (!s->macroblocks_base || /* first frame */
P
Peter Ross 已提交
565 566 567
        width != s->avctx->width || height != s->avctx->height ||
        (width + 15) / 16 != s->mb_width || (height + 15) / 16 != s->mb_height) {
        if ((ret = vp7_update_dimensions(s, width, height)) < 0)
P
Peter Ross 已提交
568 569 570 571 572 573 574 575 576 577 578 579
            return ret;
    }

    /* C. Dequantization indices */
    vp7_get_quants(s);

    /* D. Golden frame update flag (a Flag) for interframes only */
    if (!s->keyframe) {
        s->update_golden = vp8_rac_get(c) ? VP56_FRAME_CURRENT : VP56_FRAME_NONE;
        s->sign_bias[VP56_FRAME_GOLDEN] = 0;
    }

P
Peter Ross 已提交
580
    s->update_last          = 1;
P
Peter Ross 已提交
581 582 583 584 585 586 587 588 589 590 591 592 593 594
    s->update_probabilities = 1;
    s->fade_present         = 1;

    if (s->profile > 0) {
        s->update_probabilities = vp8_rac_get(c);
        if (!s->update_probabilities)
            s->prob[1] = s->prob[0];

        if (!s->keyframe)
            s->fade_present = vp8_rac_get(c);
    }

    /* E. Fading information for previous frame */
    if (s->fade_present && vp8_rac_get(c)) {
P
Peter Ross 已提交
595 596
        if ((ret = vp7_fade_frame(s ,c)) < 0)
            return ret;
P
Peter Ross 已提交
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
    }

    /* F. Loop filter type */
    if (!s->profile)
        s->filter.simple = vp8_rac_get(c);

    /* G. DCT coefficient ordering specification */
    if (vp8_rac_get(c))
        for (i = 1; i < 16; i++)
            s->prob[0].scan[i] = zigzag_scan[vp8_rac_get_uint(c, 4)];

    /* H. Loop filter levels  */
    if (s->profile > 0)
        s->filter.simple = vp8_rac_get(c);
    s->filter.level     = vp8_rac_get_uint(c, 6);
    s->filter.sharpness = vp8_rac_get_uint(c, 3);

    /* I. DCT coefficient probability update; 13.3 Token Probability Updates */
    vp78_update_probability_tables(s);

    s->mbskip_enabled = 0;

    /* J. The remaining frame header data occurs ONLY FOR INTERFRAMES */
    if (!s->keyframe) {
        s->prob->intra  = vp8_rac_get_uint(c, 8);
        s->prob->last   = vp8_rac_get_uint(c, 8);
P
Peter Ross 已提交
623
        vp78_update_pred16x16_pred8x8_mvc_probabilities(s, VP7_MVC_SIZE);
P
Peter Ross 已提交
624 625 626 627
    }

    return 0;
}
D
David Conrad 已提交
628

P
Peter Ross 已提交
629
static int vp8_decode_frame_header(VP8Context *s, const uint8_t *buf, int buf_size)
D
David Conrad 已提交
630 631
{
    VP56RangeCoder *c = &s->c;
P
Peter Ross 已提交
632
    int header_size, hscale, vscale, ret;
D
David Conrad 已提交
633 634 635 636 637 638
    int width  = s->avctx->width;
    int height = s->avctx->height;

    s->keyframe  = !(buf[0] & 1);
    s->profile   =  (buf[0]>>1) & 7;
    s->invisible = !(buf[0] & 0x10);
639
    header_size  = AV_RL24(buf) >> 5;
D
David Conrad 已提交
640 641 642
    buf      += 3;
    buf_size -= 3;

D
David Conrad 已提交
643 644 645 646
    if (s->profile > 3)
        av_log(s->avctx, AV_LOG_WARNING, "Unknown profile %d\n", s->profile);

    if (!s->profile)
V
Vittorio Giovara 已提交
647 648
        memcpy(s->put_pixels_tab, s->vp8dsp.put_vp8_epel_pixels_tab,
               sizeof(s->put_pixels_tab));
D
David Conrad 已提交
649
    else    // profile 1-3 use bilinear, 4+ aren't defined so whatever
V
Vittorio Giovara 已提交
650 651
        memcpy(s->put_pixels_tab, s->vp8dsp.put_vp8_bilinear_pixels_tab,
               sizeof(s->put_pixels_tab));
D
David Conrad 已提交
652

V
Vittorio Giovara 已提交
653
    if (header_size > buf_size - 7 * s->keyframe) {
D
David Conrad 已提交
654 655 656 657 658
        av_log(s->avctx, AV_LOG_ERROR, "Header size larger than data provided\n");
        return AVERROR_INVALIDDATA;
    }

    if (s->keyframe) {
659
        if (AV_RL24(buf) != 0x2a019d) {
V
Vittorio Giovara 已提交
660 661
            av_log(s->avctx, AV_LOG_ERROR,
                   "Invalid start code 0x%x\n", AV_RL24(buf));
D
David Conrad 已提交
662 663
            return AVERROR_INVALIDDATA;
        }
V
Vittorio Giovara 已提交
664 665 666 667
        width     = AV_RL16(buf + 3) & 0x3fff;
        height    = AV_RL16(buf + 5) & 0x3fff;
        hscale    = buf[4] >> 6;
        vscale    = buf[6] >> 6;
D
David Conrad 已提交
668 669 670
        buf      += 7;
        buf_size -= 7;

671
        if (hscale || vscale)
672
            avpriv_request_sample(s->avctx, "Upscaling");
673

D
David Conrad 已提交
674
        s->update_golden = s->update_altref = VP56_FRAME_CURRENT;
P
Peter Ross 已提交
675
        vp78_reset_probability_tables(s);
V
Vittorio Giovara 已提交
676 677 678 679 680 681
        memcpy(s->prob->pred16x16, vp8_pred16x16_prob_inter,
               sizeof(s->prob->pred16x16));
        memcpy(s->prob->pred8x8c, vp8_pred8x8c_prob_inter,
               sizeof(s->prob->pred8x8c));
        memcpy(s->prob->mvc, vp8_mv_default_prob,
               sizeof(s->prob->mvc));
D
David Conrad 已提交
682
        memset(&s->segmentation, 0, sizeof(s->segmentation));
683
        memset(&s->lf_delta, 0, sizeof(s->lf_delta));
D
David Conrad 已提交
684 685
    }

686
    ff_vp56_init_range_decoder(c, buf, header_size);
D
David Conrad 已提交
687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713
    buf      += header_size;
    buf_size -= header_size;

    if (s->keyframe) {
        if (vp8_rac_get(c))
            av_log(s->avctx, AV_LOG_WARNING, "Unspecified colorspace\n");
        vp8_rac_get(c); // whether we can skip clamping in dsp functions
    }

    if ((s->segmentation.enabled = vp8_rac_get(c)))
        parse_segment_info(s);
    else
        s->segmentation.update_map = 0; // FIXME: move this to some init function?

    s->filter.simple    = vp8_rac_get(c);
    s->filter.level     = vp8_rac_get_uint(c, 6);
    s->filter.sharpness = vp8_rac_get_uint(c, 3);

    if ((s->lf_delta.enabled = vp8_rac_get(c)))
        if (vp8_rac_get(c))
            update_lf_deltas(s);

    if (setup_partitions(s, buf, buf_size)) {
        av_log(s->avctx, AV_LOG_ERROR, "Invalid partitions\n");
        return AVERROR_INVALIDDATA;
    }

D
Daniel Kang 已提交
714
    if (!s->macroblocks_base || /* first frame */
715 716
        width != s->avctx->width || height != s->avctx->height ||
        (width+15)/16 != s->mb_width || (height+15)/16 != s->mb_height)
P
Peter Ross 已提交
717
        if ((ret = vp8_update_dimensions(s, width, height)) < 0)
D
Daniel Kang 已提交
718 719
            return ret;

P
Peter Ross 已提交
720
    vp8_get_quants(s);
D
David Conrad 已提交
721 722 723 724 725 726 727 728 729 730 731 732 733 734

    if (!s->keyframe) {
        update_refs(s);
        s->sign_bias[VP56_FRAME_GOLDEN]               = vp8_rac_get(c);
        s->sign_bias[VP56_FRAME_GOLDEN2 /* altref */] = vp8_rac_get(c);
    }

    // if we aren't saving this frame's probabilities for future frames,
    // make a copy of the current probabilities
    if (!(s->update_probabilities = vp8_rac_get(c)))
        s->prob[1] = s->prob[0];

    s->update_last = s->keyframe || vp8_rac_get(c);

P
Peter Ross 已提交
735
    vp78_update_probability_tables(s);
D
David Conrad 已提交
736 737

    if ((s->mbskip_enabled = vp8_rac_get(c)))
738
        s->prob->mbskip = vp8_rac_get_uint(c, 8);
D
David Conrad 已提交
739 740

    if (!s->keyframe) {
741 742 743
        s->prob->intra  = vp8_rac_get_uint(c, 8);
        s->prob->last   = vp8_rac_get_uint(c, 8);
        s->prob->golden = vp8_rac_get_uint(c, 8);
P
Peter Ross 已提交
744
        vp78_update_pred16x16_pred8x8_mvc_probabilities(s, VP8_MVC_SIZE);
D
David Conrad 已提交
745 746 747 748 749
    }

    return 0;
}

V
Vittorio Giovara 已提交
750 751
static av_always_inline
void clamp_mv(VP8Context *s, VP56mv *dst, const VP56mv *src)
D
David Conrad 已提交
752
{
J
Jason Garrett-Glaser 已提交
753 754
    dst->x = av_clip(src->x, s->mv_min.x, s->mv_max.x);
    dst->y = av_clip(src->y, s->mv_min.y, s->mv_max.y);
D
David Conrad 已提交
755 756 757 758 759
}

/**
 * Motion vector coding, 17.1.
 */
P
Peter Ross 已提交
760
static av_always_inline int read_mv_component(VP56RangeCoder *c, const uint8_t *p, int vp7)
D
David Conrad 已提交
761
{
762
    int bit, x = 0;
D
David Conrad 已提交
763

764
    if (vp56_rac_get_prob_branchy(c, p[0])) {
D
David Conrad 已提交
765 766 767 768
        int i;

        for (i = 0; i < 3; i++)
            x += vp56_rac_get_prob(c, p[9 + i]) << i;
P
Peter Ross 已提交
769
        for (i = (vp7 ? 7 : 9); i > 3; i--)
D
David Conrad 已提交
770
            x += vp56_rac_get_prob(c, p[9 + i]) << i;
P
Peter Ross 已提交
771
        if (!(x & (vp7 ? 0xF0 : 0xFFF0)) || vp56_rac_get_prob(c, p[12]))
D
David Conrad 已提交
772
            x += 8;
773 774
    } else {
        // small_mvtree
V
Vittorio Giovara 已提交
775
        const uint8_t *ps = p + 2;
776
        bit = vp56_rac_get_prob(c, *ps);
V
Vittorio Giovara 已提交
777 778
        ps += 1 + 3 * bit;
        x  += 4 * bit;
779 780
        bit = vp56_rac_get_prob(c, *ps);
        ps += 1 + bit;
V
Vittorio Giovara 已提交
781
        x  += 2 * bit;
782 783
        x  += vp56_rac_get_prob(c, *ps);
    }
D
David Conrad 已提交
784 785 786 787

    return (x && vp56_rac_get_prob(c, p[1])) ? -x : x;
}

P
Peter Ross 已提交
788 789 790 791 792 793 794 795 796 797
static int vp7_read_mv_component(VP56RangeCoder *c, const uint8_t *p)
{
    return read_mv_component(c, p, 1);
}

static int vp8_read_mv_component(VP56RangeCoder *c, const uint8_t *p)
{
    return read_mv_component(c, p, 0);
}

798
static av_always_inline
P
Peter Ross 已提交
799
const uint8_t *get_submv_prob(uint32_t left, uint32_t top, int is_vp7)
D
David Conrad 已提交
800
{
P
Peter Ross 已提交
801 802 803
    if (is_vp7)
        return vp7_submv_prob;

804
    if (left == top)
V
Vittorio Giovara 已提交
805
        return vp8_submv_prob[4 - !!left];
806
    if (!top)
D
David Conrad 已提交
807
        return vp8_submv_prob[2];
V
Vittorio Giovara 已提交
808
    return vp8_submv_prob[1 - !!left];
D
David Conrad 已提交
809 810 811 812
}

/**
 * Split motion vector prediction, 16.4.
813
 * @returns the number of motion vectors parsed (2, 4 or 16)
D
David Conrad 已提交
814
 */
815
static av_always_inline
P
Peter Ross 已提交
816 817
int decode_splitmvs(VP8Context *s, VP56RangeCoder *c, VP8Macroblock *mb,
                    int layout, int is_vp7)
D
David Conrad 已提交
818
{
819 820
    int part_idx;
    int n, num;
D
Daniel Kang 已提交
821
    VP8Macroblock *top_mb;
822
    VP8Macroblock *left_mb = &mb[-1];
V
Vittorio Giovara 已提交
823 824
    const uint8_t *mbsplits_left = vp8_mbsplits[left_mb->partitioning];
    const uint8_t *mbsplits_top, *mbsplits_cur, *firstidx;
D
Daniel Kang 已提交
825
    VP56mv *top_mv;
826 827
    VP56mv *left_mv = left_mb->bmv;
    VP56mv *cur_mv  = mb->bmv;
D
David Conrad 已提交
828

D
Daniel Kang 已提交
829 830 831
    if (!layout) // layout is inlined, s->mb_layout is not
        top_mb = &mb[2];
    else
V
Vittorio Giovara 已提交
832
        top_mb = &mb[-s->mb_width - 1];
D
Daniel Kang 已提交
833
    mbsplits_top = vp8_mbsplits[top_mb->partitioning];
V
Vittorio Giovara 已提交
834
    top_mv       = top_mb->bmv;
D
Daniel Kang 已提交
835

836
    if (vp56_rac_get_prob_branchy(c, vp8_mbsplit_prob[0])) {
V
Vittorio Giovara 已提交
837
        if (vp56_rac_get_prob_branchy(c, vp8_mbsplit_prob[1]))
838
            part_idx = VP8_SPLITMVMODE_16x8 + vp56_rac_get_prob(c, vp8_mbsplit_prob[2]);
V
Vittorio Giovara 已提交
839
        else
840 841 842 843 844
            part_idx = VP8_SPLITMVMODE_8x8;
    } else {
        part_idx = VP8_SPLITMVMODE_4x4;
    }

V
Vittorio Giovara 已提交
845 846 847
    num              = vp8_mbsplit_count[part_idx];
    mbsplits_cur     = vp8_mbsplits[part_idx],
    firstidx         = vp8_mbfirstidx[part_idx];
848 849
    mb->partitioning = part_idx;

D
David Conrad 已提交
850
    for (n = 0; n < num; n++) {
851
        int k = firstidx[n];
852
        uint32_t left, above;
853 854
        const uint8_t *submv_prob;

855 856 857
        if (!(k & 3))
            left = AV_RN32A(&left_mv[mbsplits_left[k + 3]]);
        else
V
Vittorio Giovara 已提交
858
            left = AV_RN32A(&cur_mv[mbsplits_cur[k - 1]]);
859 860 861 862
        if (k <= 3)
            above = AV_RN32A(&top_mv[mbsplits_top[k + 12]]);
        else
            above = AV_RN32A(&cur_mv[mbsplits_cur[k - 4]]);
863

P
Peter Ross 已提交
864
        submv_prob = get_submv_prob(left, above, is_vp7);
D
David Conrad 已提交
865

866 867 868
        if (vp56_rac_get_prob_branchy(c, submv_prob[0])) {
            if (vp56_rac_get_prob_branchy(c, submv_prob[1])) {
                if (vp56_rac_get_prob_branchy(c, submv_prob[2])) {
P
Peter Ross 已提交
869 870 871 872
                    mb->bmv[n].y = mb->mv.y +
                                   read_mv_component(c, s->prob->mvc[0], is_vp7);
                    mb->bmv[n].x = mb->mv.x +
                                   read_mv_component(c, s->prob->mvc[1], is_vp7);
873 874 875 876 877 878 879
                } else {
                    AV_ZERO32(&mb->bmv[n]);
                }
            } else {
                AV_WN32A(&mb->bmv[n], above);
            }
        } else {
880
            AV_WN32A(&mb->bmv[n], left);
D
David Conrad 已提交
881 882
        }
    }
883 884

    return num;
D
David Conrad 已提交
885 886
}

P
Peter Ross 已提交
887
/**
P
Peter Ross 已提交
888 889 890 891 892
 * The vp7 reference decoder uses a padding macroblock column (added to right
 * edge of the frame) to guard against illegal macroblock offsets. The
 * algorithm has bugs that permit offsets to straddle the padding column.
 * This function replicates those bugs.
 *
P
Peter Ross 已提交
893 894
 * @param[out] edge_x macroblock x address
 * @param[out] edge_y macroblock y address
P
Peter Ross 已提交
895
 *
P
Peter Ross 已提交
896 897
 * @return macroblock offset legal (boolean)
 */
P
Peter Ross 已提交
898 899 900
static int vp7_calculate_mb_offset(int mb_x, int mb_y, int mb_width,
                                   int xoffset, int yoffset, int boundary,
                                   int *edge_x, int *edge_y)
P
Peter Ross 已提交
901 902 903 904 905 906 907 908 909 910
{
    int vwidth = mb_width + 1;
    int new = (mb_y + yoffset) * vwidth + mb_x + xoffset;
    if (new < boundary || new % vwidth == vwidth - 1)
        return 0;
    *edge_y = new / vwidth;
    *edge_x = new % vwidth;
    return 1;
}

P
Peter Ross 已提交
911
static const VP56mv *get_bmv_ptr(const VP8Macroblock *mb, int subblock)
P
Peter Ross 已提交
912 913 914 915
{
    return &mb->bmv[mb->mode == VP8_MVMODE_SPLIT ? vp8_mbsplits[mb->partitioning][subblock] : 0];
}

916
static av_always_inline
P
Peter Ross 已提交
917 918
void vp7_decode_mvs(VP8Context *s, VP8Macroblock *mb,
                    int mb_x, int mb_y, int layout)
P
Peter Ross 已提交
919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936
{
    VP8Macroblock *mb_edge[12];
    enum { CNT_ZERO, CNT_NEAREST, CNT_NEAR };
    enum { VP8_EDGE_TOP, VP8_EDGE_LEFT, VP8_EDGE_TOPLEFT };
    int idx = CNT_ZERO;
    VP56mv near_mv[3];
    uint8_t cnt[3] = { 0 };
    VP56RangeCoder *c = &s->c;
    int i;

    AV_ZERO32(&near_mv[0]);
    AV_ZERO32(&near_mv[1]);
    AV_ZERO32(&near_mv[2]);

    for (i = 0; i < VP7_MV_PRED_COUNT; i++) {
        const VP7MVPred * pred = &vp7_mv_pred[i];
        int edge_x, edge_y;

P
Peter Ross 已提交
937 938 939 940 941 942 943
        if (vp7_calculate_mb_offset(mb_x, mb_y, s->mb_width, pred->xoffset,
                                    pred->yoffset, !s->profile, &edge_x, &edge_y)) {
            VP8Macroblock *edge = mb_edge[i] = (s->mb_layout == 1)
                                             ? s->macroblocks_base + 1 + edge_x +
                                               (s->mb_width + 1) * (edge_y + 1)
                                             : s->macroblocks + edge_x +
                                               (s->mb_height - edge_y - 1) * 2;
P
Peter Ross 已提交
944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985
            uint32_t mv = AV_RN32A(get_bmv_ptr(edge, vp7_mv_pred[i].subblock));
            if (mv) {
                if (AV_RN32A(&near_mv[CNT_NEAREST])) {
                    if (mv == AV_RN32A(&near_mv[CNT_NEAREST])) {
                        idx = CNT_NEAREST;
                    } else if (AV_RN32A(&near_mv[CNT_NEAR])) {
                        if (mv != AV_RN32A(&near_mv[CNT_NEAR]))
                            continue;
                        idx = CNT_NEAR;
                    } else {
                        AV_WN32A(&near_mv[CNT_NEAR], mv);
                        idx = CNT_NEAR;
                    }
                } else {
                    AV_WN32A(&near_mv[CNT_NEAREST], mv);
                    idx = CNT_NEAREST;
                }
            } else {
                idx = CNT_ZERO;
            }
        } else {
            idx = CNT_ZERO;
        }
        cnt[idx] += vp7_mv_pred[i].score;
    }

    mb->partitioning = VP8_SPLITMVMODE_NONE;

    if (vp56_rac_get_prob_branchy(c, vp7_mode_contexts[cnt[CNT_ZERO]][0])) {
        mb->mode = VP8_MVMODE_MV;

        if (vp56_rac_get_prob_branchy(c, vp7_mode_contexts[cnt[CNT_NEAREST]][1])) {

            if (vp56_rac_get_prob_branchy(c, vp7_mode_contexts[cnt[CNT_NEAR]][2])) {

                if (cnt[CNT_NEAREST] > cnt[CNT_NEAR])
                    AV_WN32A(&mb->mv, cnt[CNT_ZERO] > cnt[CNT_NEAREST] ? 0 : AV_RN32A(&near_mv[CNT_NEAREST]));
                else
                    AV_WN32A(&mb->mv, cnt[CNT_ZERO] > cnt[CNT_NEAR]    ? 0 : AV_RN32A(&near_mv[CNT_NEAR]));

                if (vp56_rac_get_prob_branchy(c, vp7_mode_contexts[cnt[CNT_NEAR]][3])) {
                    mb->mode = VP8_MVMODE_SPLIT;
P
Peter Ross 已提交
986
                    mb->mv = mb->bmv[decode_splitmvs(s, c, mb, layout, IS_VP7) - 1];
P
Peter Ross 已提交
987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007
                } else {
                    mb->mv.y += vp7_read_mv_component(c, s->prob->mvc[0]);
                    mb->mv.x += vp7_read_mv_component(c, s->prob->mvc[1]);
                    mb->bmv[0] = mb->mv;
                }
            } else {
                mb->mv = near_mv[CNT_NEAR];
                mb->bmv[0] = mb->mv;
            }
        } else {
            mb->mv = near_mv[CNT_NEAREST];
            mb->bmv[0] = mb->mv;
        }
    } else {
        mb->mode = VP8_MVMODE_ZERO;
        AV_ZERO32(&mb->mv);
        mb->bmv[0] = mb->mv;
    }
}

static av_always_inline
1008 1009
void vp8_decode_mvs(VP8Context *s, VP8Macroblock *mb,
                    int mb_x, int mb_y, int layout)
1010
{
V
Vittorio Giovara 已提交
1011
    VP8Macroblock *mb_edge[3] = { 0      /* top */,
1012
                                  mb - 1 /* left */,
V
Vittorio Giovara 已提交
1013
                                  0      /* top-left */ };
1014
    enum { CNT_ZERO, CNT_NEAREST, CNT_NEAR, CNT_SPLITMV };
1015
    enum { VP8_EDGE_TOP, VP8_EDGE_LEFT, VP8_EDGE_TOPLEFT };
1016 1017
    int idx = CNT_ZERO;
    int cur_sign_bias = s->sign_bias[mb->ref_frame];
1018
    int8_t *sign_bias = s->sign_bias;
1019 1020 1021 1022
    VP56mv near_mv[4];
    uint8_t cnt[4] = { 0 };
    VP56RangeCoder *c = &s->c;

D
Daniel Kang 已提交
1023 1024 1025
    if (!layout) { // layout is inlined (s->mb_layout is not)
        mb_edge[0] = mb + 2;
        mb_edge[2] = mb + 1;
V
Vittorio Giovara 已提交
1026 1027 1028
    } else {
        mb_edge[0] = mb - s->mb_width - 1;
        mb_edge[2] = mb - s->mb_width - 2;
D
Daniel Kang 已提交
1029 1030
    }

1031 1032
    AV_ZERO32(&near_mv[0]);
    AV_ZERO32(&near_mv[1]);
1033
    AV_ZERO32(&near_mv[2]);
1034 1035

    /* Process MB on top, left and top-left */
V
Vittorio Giovara 已提交
1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054
#define MV_EDGE_CHECK(n)                                                      \
    {                                                                         \
        VP8Macroblock *edge = mb_edge[n];                                     \
        int edge_ref = edge->ref_frame;                                       \
        if (edge_ref != VP56_FRAME_CURRENT) {                                 \
            uint32_t mv = AV_RN32A(&edge->mv);                                \
            if (mv) {                                                         \
                if (cur_sign_bias != sign_bias[edge_ref]) {                   \
                    /* SWAR negate of the values in mv. */                    \
                    mv = ~mv;                                                 \
                    mv = ((mv & 0x7fff7fff) +                                 \
                          0x00010001) ^ (mv & 0x80008000);                    \
                }                                                             \
                if (!n || mv != AV_RN32A(&near_mv[idx]))                      \
                    AV_WN32A(&near_mv[++idx], mv);                            \
                cnt[idx] += 1 + (n != 2);                                     \
            } else                                                            \
                cnt[CNT_ZERO] += 1 + (n != 2);                                \
        }                                                                     \
1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065
    }

    MV_EDGE_CHECK(0)
    MV_EDGE_CHECK(1)
    MV_EDGE_CHECK(2)

    mb->partitioning = VP8_SPLITMVMODE_NONE;
    if (vp56_rac_get_prob_branchy(c, vp8_mode_contexts[cnt[CNT_ZERO]][0])) {
        mb->mode = VP8_MVMODE_MV;

        /* If we have three distinct MVs, merge first and last if they're the same */
V
Vittorio Giovara 已提交
1066 1067
        if (cnt[CNT_SPLITMV] &&
            AV_RN32A(&near_mv[1 + VP8_EDGE_TOP]) == AV_RN32A(&near_mv[1 + VP8_EDGE_TOPLEFT]))
1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078
            cnt[CNT_NEAREST] += 1;

        /* Swap near and nearest if necessary */
        if (cnt[CNT_NEAR] > cnt[CNT_NEAREST]) {
            FFSWAP(uint8_t,     cnt[CNT_NEAREST],     cnt[CNT_NEAR]);
            FFSWAP( VP56mv, near_mv[CNT_NEAREST], near_mv[CNT_NEAR]);
        }

        if (vp56_rac_get_prob_branchy(c, vp8_mode_contexts[cnt[CNT_NEAREST]][1])) {
            if (vp56_rac_get_prob_branchy(c, vp8_mode_contexts[cnt[CNT_NEAR]][2])) {
                /* Choose the best mv out of 0,0 and the nearest mv */
J
Jason Garrett-Glaser 已提交
1079
                clamp_mv(s, &mb->mv, &near_mv[CNT_ZERO + (cnt[CNT_NEAREST] >= cnt[CNT_ZERO])]);
1080 1081 1082
                cnt[CNT_SPLITMV] = ((mb_edge[VP8_EDGE_LEFT]->mode    == VP8_MVMODE_SPLIT) +
                                    (mb_edge[VP8_EDGE_TOP]->mode     == VP8_MVMODE_SPLIT)) * 2 +
                                    (mb_edge[VP8_EDGE_TOPLEFT]->mode == VP8_MVMODE_SPLIT);
1083 1084 1085

                if (vp56_rac_get_prob_branchy(c, vp8_mode_contexts[cnt[CNT_SPLITMV]][3])) {
                    mb->mode = VP8_MVMODE_SPLIT;
P
Peter Ross 已提交
1086
                    mb->mv = mb->bmv[decode_splitmvs(s, c, mb, layout, IS_VP8) - 1];
1087
                } else {
1088 1089
                    mb->mv.y  += vp8_read_mv_component(c, s->prob->mvc[0]);
                    mb->mv.x  += vp8_read_mv_component(c, s->prob->mvc[1]);
1090 1091 1092
                    mb->bmv[0] = mb->mv;
                }
            } else {
J
Jason Garrett-Glaser 已提交
1093
                clamp_mv(s, &mb->mv, &near_mv[CNT_NEAR]);
1094 1095 1096
                mb->bmv[0] = mb->mv;
            }
        } else {
J
Jason Garrett-Glaser 已提交
1097
            clamp_mv(s, &mb->mv, &near_mv[CNT_NEAREST]);
1098 1099 1100 1101 1102 1103 1104 1105 1106
            mb->bmv[0] = mb->mv;
        }
    } else {
        mb->mode = VP8_MVMODE_ZERO;
        AV_ZERO32(&mb->mv);
        mb->bmv[0] = mb->mv;
    }
}

1107
static av_always_inline
1108
void decode_intra4x4_modes(VP8Context *s, VP56RangeCoder *c, VP8Macroblock *mb,
D
Daniel Kang 已提交
1109
                           int mb_x, int keyframe, int layout)
D
David Conrad 已提交
1110
{
1111 1112
    uint8_t *intra4x4 = mb->intra4x4_pred_mode_mb;

1113
    if (layout) {
D
Daniel Kang 已提交
1114 1115 1116
        VP8Macroblock *mb_top = mb - s->mb_width - 1;
        memcpy(mb->intra4x4_pred_mode_top, mb_top->intra4x4_pred_mode_top, 4);
    }
1117
    if (keyframe) {
1118
        int x, y;
V
Vittorio Giovara 已提交
1119 1120
        uint8_t *top;
        uint8_t *const left = s->intra4x4_pred_mode_left;
1121
        if (layout)
D
Daniel Kang 已提交
1122 1123 1124
            top = mb->intra4x4_pred_mode_top;
        else
            top = s->intra4x4_pred_mode_top + 4 * mb_x;
1125 1126
        for (y = 0; y < 4; y++) {
            for (x = 0; x < 4; x++) {
1127
                const uint8_t *ctx;
V
Vittorio Giovara 已提交
1128
                ctx       = vp8_pred4x4_prob_intra[top[x]][left[y]];
1129
                *intra4x4 = vp8_rac_get_tree(c, vp8_pred4x4_tree, ctx);
V
Vittorio Giovara 已提交
1130
                left[y]   = top[x] = *intra4x4;
1131
                intra4x4++;
D
David Conrad 已提交
1132 1133
            }
        }
1134
    } else {
1135
        int i;
1136
        for (i = 0; i < 16; i++)
V
Vittorio Giovara 已提交
1137 1138
            intra4x4[i] = vp8_rac_get_tree(c, vp8_pred4x4_tree,
                                           vp8_pred4x4_prob_inter);
D
David Conrad 已提交
1139 1140 1141
    }
}

1142
static av_always_inline
D
Daniel Kang 已提交
1143
void decode_mb_mode(VP8Context *s, VP8Macroblock *mb, int mb_x, int mb_y,
P
Peter Ross 已提交
1144
                    uint8_t *segment, uint8_t *ref, int layout, int is_vp7)
D
David Conrad 已提交
1145 1146
{
    VP56RangeCoder *c = &s->c;
P
Peter Ross 已提交
1147 1148 1149 1150 1151
    const char *vp7_feature_name[] = { "q-index",
                                       "lf-delta",
                                       "partial-golden-update",
                                       "blit-pitch" };
    if (is_vp7) {
P
Peter Ross 已提交
1152 1153 1154 1155 1156
        int i;
        *segment = 0;
        for (i = 0; i < 4; i++) {
            if (s->feature_enabled[i]) {
                if (vp56_rac_get_prob(c, s->feature_present_prob[i])) {
P
Peter Ross 已提交
1157 1158 1159 1160 1161
                      int index = vp8_rac_get_tree(c, vp7_feature_index_tree,
                                                   s->feature_index_prob[i]);
                      av_log(s->avctx, AV_LOG_WARNING,
                             "Feature %s present in macroblock (value 0x%x)\n",
                             vp7_feature_name[i], s->feature_value[i][index]);
P
Peter Ross 已提交
1162
                }
P
Peter Ross 已提交
1163
           }
P
Peter Ross 已提交
1164
        }
1165 1166 1167 1168
    } else if (s->segmentation.update_map) {
        int bit  = vp56_rac_get_prob(c, s->prob->segmentid[0]);
        *segment = vp56_rac_get_prob(c, s->prob->segmentid[1+bit]) + 2*bit;
    } else if (s->segmentation.enabled)
R
Ronald S. Bultje 已提交
1169
        *segment = ref ? *ref : *segment;
1170
    mb->segment = *segment;
D
David Conrad 已提交
1171

1172
    mb->skip = s->mbskip_enabled ? vp56_rac_get_prob(c, s->prob->mbskip) : 0;
D
David Conrad 已提交
1173 1174

    if (s->keyframe) {
V
Vittorio Giovara 已提交
1175 1176
        mb->mode = vp8_rac_get_tree(c, vp8_pred16x16_tree_intra,
                                    vp8_pred16x16_prob_intra);
D
David Conrad 已提交
1177 1178

        if (mb->mode == MODE_I4x4) {
D
Daniel Kang 已提交
1179
            decode_intra4x4_modes(s, c, mb, mb_x, 1, layout);
1180
        } else {
P
Peter Ross 已提交
1181 1182
            const uint32_t modes = (is_vp7 ? vp7_pred4x4_mode
                                           : vp8_pred4x4_mode)[mb->mode] * 0x01010101u;
1183
            if (s->mb_layout)
D
Daniel Kang 已提交
1184 1185 1186
                AV_WN32A(mb->intra4x4_pred_mode_top, modes);
            else
                AV_WN32A(s->intra4x4_pred_mode_top + 4 * mb_x, modes);
V
Vittorio Giovara 已提交
1187
            AV_WN32A(s->intra4x4_pred_mode_left, modes);
1188
        }
D
David Conrad 已提交
1189

V
Vittorio Giovara 已提交
1190 1191 1192
        mb->chroma_pred_mode = vp8_rac_get_tree(c, vp8_pred8x8c_tree,
                                                vp8_pred8x8c_prob_intra);
        mb->ref_frame        = VP56_FRAME_CURRENT;
1193
    } else if (vp56_rac_get_prob_branchy(c, s->prob->intra)) {
D
David Conrad 已提交
1194
        // inter MB, 16.2
1195
        if (vp56_rac_get_prob_branchy(c, s->prob->last))
V
Vittorio Giovara 已提交
1196
            mb->ref_frame =
P
Peter Ross 已提交
1197 1198
                (!is_vp7 && vp56_rac_get_prob(c, s->prob->golden)) ? VP56_FRAME_GOLDEN2 /* altref */
                                                                   : VP56_FRAME_GOLDEN;
D
David Conrad 已提交
1199 1200
        else
            mb->ref_frame = VP56_FRAME_PREVIOUS;
V
Vittorio Giovara 已提交
1201
        s->ref_count[mb->ref_frame - 1]++;
D
David Conrad 已提交
1202 1203

        // motion vectors, 16.3
P
Peter Ross 已提交
1204
        if (is_vp7)
P
Peter Ross 已提交
1205 1206 1207
            vp7_decode_mvs(s, mb, mb_x, mb_y, layout);
        else
            vp8_decode_mvs(s, mb, mb_x, mb_y, layout);
D
David Conrad 已提交
1208 1209 1210 1211
    } else {
        // intra MB, 16.1
        mb->mode = vp8_rac_get_tree(c, vp8_pred16x16_tree_inter, s->prob->pred16x16);

1212
        if (mb->mode == MODE_I4x4)
D
Daniel Kang 已提交
1213
            decode_intra4x4_modes(s, c, mb, mb_x, 0, layout);
D
David Conrad 已提交
1214

V
Vittorio Giovara 已提交
1215 1216 1217 1218
        mb->chroma_pred_mode = vp8_rac_get_tree(c, vp8_pred8x8c_tree,
                                                s->prob->pred8x8c);
        mb->ref_frame        = VP56_FRAME_CURRENT;
        mb->partitioning     = VP8_SPLITMVMODE_NONE;
1219
        AV_ZERO32(&mb->bmv[0]);
D
David Conrad 已提交
1220 1221 1222 1223
    }
}

/**
V
Vittorio Giovara 已提交
1224
 * @param r     arithmetic bitstream reader context
1225 1226
 * @param block destination for block coefficients
 * @param probs probabilities to use when reading trees from the bitstream
V
Vittorio Giovara 已提交
1227 1228 1229
 * @param i     initial coeff index, 0 unless a separate DC block is coded
 * @param qmul  array holding the dc/ac dequant factor at position 0/1
 *
D
David Conrad 已提交
1230 1231 1232
 * @return 0 if no coeffs were decoded
 *         otherwise, the index of the last coeff decoded plus one
 */
P
Peter Ross 已提交
1233 1234
static av_always_inline
int decode_block_coeffs_internal(VP56RangeCoder *r, int16_t block[16],
P
Peter Ross 已提交
1235 1236 1237
                                 uint8_t probs[16][3][NUM_DCT_TOKENS - 1],
                                 int i, uint8_t *token_prob, int16_t qmul[2],
                                 const uint8_t scan[16], int vp7)
D
David Conrad 已提交
1238
{
1239
    VP56RangeCoder c = *r;
1240
    goto skip_eob;
1241
    do {
1242
        int coeff;
P
Peter Ross 已提交
1243
restart:
1244 1245
        if (!vp56_rac_get_prob_branchy(&c, token_prob[0]))   // DCT_EOB
            break;
D
David Conrad 已提交
1246

1247
skip_eob:
1248
        if (!vp56_rac_get_prob_branchy(&c, token_prob[1])) { // DCT_0
1249
            if (++i == 16)
1250
                break; // invalid input; blocks should end with EOB
1251
            token_prob = probs[i][0];
P
Peter Ross 已提交
1252 1253
            if (vp7)
                goto restart;
1254
            goto skip_eob;
1255 1256
        }

1257
        if (!vp56_rac_get_prob_branchy(&c, token_prob[2])) { // DCT_1
1258
            coeff = 1;
V
Vittorio Giovara 已提交
1259
            token_prob = probs[i + 1][1];
1260
        } else {
1261 1262
            if (!vp56_rac_get_prob_branchy(&c, token_prob[3])) { // DCT 2,3,4
                coeff = vp56_rac_get_prob_branchy(&c, token_prob[4]);
1263
                if (coeff)
1264
                    coeff += vp56_rac_get_prob(&c, token_prob[5]);
1265 1266 1267
                coeff += 2;
            } else {
                // DCT_CAT*
1268 1269
                if (!vp56_rac_get_prob_branchy(&c, token_prob[6])) {
                    if (!vp56_rac_get_prob_branchy(&c, token_prob[7])) { // DCT_CAT1
V
Vittorio Giovara 已提交
1270
                        coeff = 5 + vp56_rac_get_prob(&c, vp8_dct_cat1_prob[0]);
1271 1272
                    } else {                                    // DCT_CAT2
                        coeff  = 7;
1273 1274
                        coeff += vp56_rac_get_prob(&c, vp8_dct_cat2_prob[0]) << 1;
                        coeff += vp56_rac_get_prob(&c, vp8_dct_cat2_prob[1]);
1275 1276
                    }
                } else {    // DCT_CAT3 and up
V
Vittorio Giovara 已提交
1277 1278 1279 1280
                    int a   = vp56_rac_get_prob(&c, token_prob[8]);
                    int b   = vp56_rac_get_prob(&c, token_prob[9 + a]);
                    int cat = (a << 1) + b;
                    coeff  = 3 + (8 << cat);
1281
                    coeff += vp8_rac_get_coeff(&c, ff_vp8_dct_cat_prob[cat]);
1282 1283
                }
            }
V
Vittorio Giovara 已提交
1284
            token_prob = probs[i + 1][2];
1285
        }
P
Peter Ross 已提交
1286
        block[scan[i]] = (vp8_rac_get(&c) ? -coeff : coeff) * qmul[!!i];
1287
    } while (++i < 16);
1288

1289
    *r = c;
1290
    return i;
D
David Conrad 已提交
1291
}
P
Peter Ross 已提交
1292

P
Peter Ross 已提交
1293 1294
static av_always_inline
int inter_predict_dc(int16_t block[16], int16_t pred[2])
P
Peter Ross 已提交
1295
{
P
Peter Ross 已提交
1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324
    int16_t dc = block[0];
    int ret = 0;

    if (pred[1] > 3) {
        dc += pred[0];
        ret = 1;
    }

    if (!pred[0] | !dc | ((int32_t)pred[0] ^ (int32_t)dc) >> 31) {
        block[0] = pred[0] = dc;
        pred[1] = 0;
    } else {
        if (pred[0] == dc)
            pred[1]++;
        block[0] = pred[0] = dc;
    }

    return ret;
}

static int vp7_decode_block_coeffs_internal(VP56RangeCoder *r,
                                            int16_t block[16],
                                            uint8_t probs[16][3][NUM_DCT_TOKENS - 1],
                                            int i, uint8_t *token_prob,
                                            int16_t qmul[2],
                                            const uint8_t scan[16])
{
    return decode_block_coeffs_internal(r, block, probs, i,
                                        token_prob, qmul, scan, IS_VP7);
P
Peter Ross 已提交
1325 1326 1327
}

#ifndef vp8_decode_block_coeffs_internal
P
Peter Ross 已提交
1328 1329 1330 1331 1332
static int vp8_decode_block_coeffs_internal(VP56RangeCoder *r,
                                            int16_t block[16],
                                            uint8_t probs[16][3][NUM_DCT_TOKENS - 1],
                                            int i, uint8_t *token_prob,
                                            int16_t qmul[2])
P
Peter Ross 已提交
1333
{
P
Peter Ross 已提交
1334 1335
    return decode_block_coeffs_internal(r, block, probs, i,
                                        token_prob, qmul, zigzag_scan, IS_VP8);
P
Peter Ross 已提交
1336
}
1337
#endif
D
David Conrad 已提交
1338

1339
/**
V
Vittorio Giovara 已提交
1340 1341 1342 1343
 * @param c          arithmetic bitstream reader context
 * @param block      destination for block coefficients
 * @param probs      probabilities to use when reading trees from the bitstream
 * @param i          initial coeff index, 0 unless a separate DC block is coded
1344 1345
 * @param zero_nhood the initial prediction context for number of surrounding
 *                   all-zero blocks (only left/top, so 0-2)
V
Vittorio Giovara 已提交
1346
 * @param qmul       array holding the dc/ac dequant factor at position 0/1
1347
 * @param scan       scan pattern (VP7 only)
V
Vittorio Giovara 已提交
1348
 *
1349 1350 1351
 * @return 0 if no coeffs were decoded
 *         otherwise, the index of the last coeff decoded plus one
 */
1352
static av_always_inline
D
Diego Biurrun 已提交
1353
int decode_block_coeffs(VP56RangeCoder *c, int16_t block[16],
V
Vittorio Giovara 已提交
1354
                        uint8_t probs[16][3][NUM_DCT_TOKENS - 1],
P
Peter Ross 已提交
1355 1356
                        int i, int zero_nhood, int16_t qmul[2],
                        const uint8_t scan[16], int vp7)
1357 1358 1359 1360
{
    uint8_t *token_prob = probs[i][zero_nhood];
    if (!vp56_rac_get_prob_branchy(c, token_prob[0]))   // DCT_EOB
        return 0;
P
Peter Ross 已提交
1361 1362 1363 1364
    return vp7 ? vp7_decode_block_coeffs_internal(c, block, probs, i,
                                                  token_prob, qmul, scan)
               : vp8_decode_block_coeffs_internal(c, block, probs, i,
                                                  token_prob, qmul);
1365 1366
}

1367
static av_always_inline
V
Vittorio Giovara 已提交
1368
void decode_mb_coeffs(VP8Context *s, VP8ThreadData *td, VP56RangeCoder *c,
1369
                      VP8Macroblock *mb, uint8_t t_nnz[9], uint8_t l_nnz[9],
P
Peter Ross 已提交
1370
                      int is_vp7)
D
David Conrad 已提交
1371 1372 1373
{
    int i, x, y, luma_start = 0, luma_ctx = 3;
    int nnz_pred, nnz, nnz_total = 0;
1374
    int segment = mb->segment;
1375
    int block_dc = 0;
D
David Conrad 已提交
1376

P
Peter Ross 已提交
1377
    if (mb->mode != MODE_I4x4 && (is_vp7 || mb->mode != VP8_MVMODE_SPLIT)) {
D
David Conrad 已提交
1378 1379 1380
        nnz_pred = t_nnz[8] + l_nnz[8];

        // decode DC values and do hadamard
V
Vittorio Giovara 已提交
1381
        nnz = decode_block_coeffs(c, td->block_dc, s->prob->token[1], 0,
1382
                                  nnz_pred, s->qmat[segment].luma_dc_qmul,
P
Peter Ross 已提交
1383
                                  zigzag_scan, is_vp7);
D
David Conrad 已提交
1384
        l_nnz[8] = t_nnz[8] = !!nnz;
P
Peter Ross 已提交
1385

P
Peter Ross 已提交
1386 1387 1388 1389
        if (is_vp7 && mb->mode > MODE_I4x4) {
            nnz |=  inter_predict_dc(td->block_dc,
                                     s->inter_dc_pred[mb->ref_frame - 1]);
        }
P
Peter Ross 已提交
1390

1391 1392
        if (nnz) {
            nnz_total += nnz;
V
Vittorio Giovara 已提交
1393
            block_dc   = 1;
1394
            if (nnz == 1)
D
Daniel Kang 已提交
1395
                s->vp8dsp.vp8_luma_dc_wht_dc(td->block, td->block_dc);
1396
            else
D
Daniel Kang 已提交
1397
                s->vp8dsp.vp8_luma_dc_wht(td->block, td->block_dc);
1398
        }
D
David Conrad 已提交
1399
        luma_start = 1;
V
Vittorio Giovara 已提交
1400
        luma_ctx   = 0;
D
David Conrad 已提交
1401 1402 1403 1404 1405
    }

    // luma blocks
    for (y = 0; y < 4; y++)
        for (x = 0; x < 4; x++) {
J
Jason Garrett-Glaser 已提交
1406
            nnz_pred = l_nnz[y] + t_nnz[x];
V
Vittorio Giovara 已提交
1407 1408 1409
            nnz = decode_block_coeffs(c, td->block[y][x],
                                      s->prob->token[luma_ctx],
                                      luma_start, nnz_pred,
1410
                                      s->qmat[segment].luma_qmul,
P
Peter Ross 已提交
1411
                                      s->prob[0].scan, is_vp7);
V
Vittorio Giovara 已提交
1412 1413
            /* nnz+block_dc may be one more than the actual last index,
             * but we don't care */
D
Daniel Kang 已提交
1414
            td->non_zero_count_cache[y][x] = nnz + block_dc;
D
David Conrad 已提交
1415 1416 1417 1418 1419 1420 1421 1422 1423 1424
            t_nnz[x] = l_nnz[y] = !!nnz;
            nnz_total += nnz;
        }

    // chroma blocks
    // TODO: what to do about dimensions? 2nd dim for luma is x,
    // but for chroma it's (y<<1)|x
    for (i = 4; i < 6; i++)
        for (y = 0; y < 2; y++)
            for (x = 0; x < 2; x++) {
V
Vittorio Giovara 已提交
1425
                nnz_pred = l_nnz[i + 2 * y] + t_nnz[i + 2 * x];
P
Peter Ross 已提交
1426 1427 1428 1429
                nnz = decode_block_coeffs(c, td->block[i][(y << 1) + x],
                                          s->prob->token[2], 0, nnz_pred,
                                          s->qmat[segment].chroma_qmul,
                                          s->prob[0].scan, is_vp7);
V
Vittorio Giovara 已提交
1430 1431
                td->non_zero_count_cache[i][(y << 1) + x] = nnz;
                t_nnz[i + 2 * x] = l_nnz[i + 2 * y] = !!nnz;
P
Peter Ross 已提交
1432
                nnz_total += nnz;
D
David Conrad 已提交
1433 1434 1435 1436 1437 1438 1439 1440 1441
            }

    // if there were no coded coeffs despite the macroblock not being marked skip,
    // we MUST not do the inner loop filter and should not do IDCT
    // Since skip isn't used for bitstream prediction, just manually set it.
    if (!nnz_total)
        mb->skip = 1;
}

1442
static av_always_inline
V
Vittorio Giovara 已提交
1443 1444
void backup_mb_border(uint8_t *top_border, uint8_t *src_y,
                      uint8_t *src_cb, uint8_t *src_cr,
1445 1446
                      int linesize, int uvlinesize, int simple)
{
V
Vittorio Giovara 已提交
1447
    AV_COPY128(top_border, src_y + 15 * linesize);
1448
    if (!simple) {
V
Vittorio Giovara 已提交
1449 1450
        AV_COPY64(top_border + 16, src_cb + 7 * uvlinesize);
        AV_COPY64(top_border + 24, src_cr + 7 * uvlinesize);
1451 1452 1453 1454
    }
}

static av_always_inline
V
Vittorio Giovara 已提交
1455 1456 1457
void xchg_mb_border(uint8_t *top_border, uint8_t *src_y, uint8_t *src_cb,
                    uint8_t *src_cr, int linesize, int uvlinesize, int mb_x,
                    int mb_y, int mb_width, int simple, int xchg)
1458
{
V
Vittorio Giovara 已提交
1459 1460
    uint8_t *top_border_m1 = top_border - 32;     // for TL prediction
    src_y  -= linesize;
1461 1462 1463
    src_cb -= uvlinesize;
    src_cr -= uvlinesize;

V
Vittorio Giovara 已提交
1464 1465 1466 1467 1468 1469
#define XCHG(a, b, xchg)                                                      \
    do {                                                                      \
        if (xchg)                                                             \
            AV_SWAP64(b, a);                                                  \
        else                                                                  \
            AV_COPY64(b, a);                                                  \
M
Måns Rullgård 已提交
1470
    } while (0)
1471

V
Vittorio Giovara 已提交
1472 1473 1474 1475 1476
    XCHG(top_border_m1 + 8, src_y - 8, xchg);
    XCHG(top_border, src_y, xchg);
    XCHG(top_border + 8, src_y + 8, 1);
    if (mb_x < mb_width - 1)
        XCHG(top_border + 32, src_y + 16, 1);
1477

1478 1479 1480
    // only copy chroma for normal loop filter
    // or to initialize the top row to 127
    if (!simple || !mb_y) {
V
Vittorio Giovara 已提交
1481 1482 1483 1484
        XCHG(top_border_m1 + 16, src_cb - 8, xchg);
        XCHG(top_border_m1 + 24, src_cr - 8, xchg);
        XCHG(top_border + 16, src_cb, 1);
        XCHG(top_border + 24, src_cr, 1);
1485 1486 1487
    }
}

1488
static av_always_inline
1489 1490
int check_dc_pred8x8_mode(int mode, int mb_x, int mb_y)
{
V
Vittorio Giovara 已提交
1491
    if (!mb_x)
1492
        return mb_y ? TOP_DC_PRED8x8 : DC_128_PRED8x8;
V
Vittorio Giovara 已提交
1493
    else
1494 1495 1496 1497
        return mb_y ? mode : LEFT_DC_PRED8x8;
}

static av_always_inline
P
Peter Ross 已提交
1498
int check_tm_pred8x8_mode(int mode, int mb_x, int mb_y, int vp7)
1499
{
V
Vittorio Giovara 已提交
1500
    if (!mb_x)
P
Peter Ross 已提交
1501
        return mb_y ? VERT_PRED8x8 : (vp7 ? DC_128_PRED8x8 : DC_129_PRED8x8);
V
Vittorio Giovara 已提交
1502
    else
1503 1504 1505 1506
        return mb_y ? mode : HOR_PRED8x8;
}

static av_always_inline
P
Peter Ross 已提交
1507
int check_intra_pred8x8_mode_emuedge(int mode, int mb_x, int mb_y, int vp7)
1508 1509 1510 1511 1512
{
    switch (mode) {
    case DC_PRED8x8:
        return check_dc_pred8x8_mode(mode, mb_x, mb_y);
    case VERT_PRED8x8:
P
Peter Ross 已提交
1513
        return !mb_y ? (vp7 ? DC_128_PRED8x8 : DC_127_PRED8x8) : mode;
1514
    case HOR_PRED8x8:
P
Peter Ross 已提交
1515
        return !mb_x ? (vp7 ? DC_128_PRED8x8 : DC_129_PRED8x8) : mode;
V
Vittorio Giovara 已提交
1516
    case PLANE_PRED8x8: /* TM */
P
Peter Ross 已提交
1517
        return check_tm_pred8x8_mode(mode, mb_x, mb_y, vp7);
1518 1519 1520 1521 1522
    }
    return mode;
}

static av_always_inline
P
Peter Ross 已提交
1523
int check_tm_pred4x4_mode(int mode, int mb_x, int mb_y, int vp7)
1524 1525
{
    if (!mb_x) {
P
Peter Ross 已提交
1526
        return mb_y ? VERT_VP8_PRED : (vp7 ? DC_128_PRED : DC_129_PRED);
1527 1528 1529 1530 1531 1532
    } else {
        return mb_y ? mode : HOR_VP8_PRED;
    }
}

static av_always_inline
P
Peter Ross 已提交
1533 1534
int check_intra_pred4x4_mode_emuedge(int mode, int mb_x, int mb_y,
                                     int *copy_buf, int vp7)
1535 1536 1537 1538 1539 1540 1541 1542 1543 1544
{
    switch (mode) {
    case VERT_PRED:
        if (!mb_x && mb_y) {
            *copy_buf = 1;
            return mode;
        }
        /* fall-through */
    case DIAG_DOWN_LEFT_PRED:
    case VERT_LEFT_PRED:
P
Peter Ross 已提交
1545
        return !mb_y ? (vp7 ? DC_128_PRED : DC_127_PRED) : mode;
1546 1547 1548 1549
    case HOR_PRED:
        if (!mb_y) {
            *copy_buf = 1;
            return mode;
1550
        }
1551 1552
        /* fall-through */
    case HOR_UP_PRED:
P
Peter Ross 已提交
1553
        return !mb_x ? (vp7 ? DC_128_PRED : DC_129_PRED) : mode;
1554
    case TM_VP8_PRED:
P
Peter Ross 已提交
1555
        return check_tm_pred4x4_mode(mode, mb_x, mb_y, vp7);
V
Vittorio Giovara 已提交
1556 1557
    case DC_PRED: /* 4x4 DC doesn't use the same "H.264-style" exceptions
                   * as 16x16/8x8 DC */
1558 1559 1560 1561 1562 1563
    case DIAG_DOWN_RIGHT_PRED:
    case VERT_RIGHT_PRED:
    case HOR_DOWN_PRED:
        if (!mb_y || !mb_x)
            *copy_buf = 1;
        return mode;
D
David Conrad 已提交
1564 1565 1566 1567
    }
    return mode;
}

1568
static av_always_inline
D
Daniel Kang 已提交
1569
void intra_predict(VP8Context *s, VP8ThreadData *td, uint8_t *dst[3],
P
Peter Ross 已提交
1570
                   VP8Macroblock *mb, int mb_x, int mb_y, int is_vp7)
D
David Conrad 已提交
1571
{
M
Mans Rullgard 已提交
1572 1573
    int x, y, mode, nnz;
    uint32_t tr;
D
David Conrad 已提交
1574

V
Vittorio Giovara 已提交
1575 1576
    /* for the first row, we need to run xchg_mb_border to init the top edge
     * to 127 otherwise, skip it if we aren't going to deblock */
1577
    if (mb_y && (s->deblock_filter || !mb_y) && td->thread_nr == 0)
V
Vittorio Giovara 已提交
1578
        xchg_mb_border(s->top_border[mb_x + 1], dst[0], dst[1], dst[2],
1579 1580 1581
                       s->linesize, s->uvlinesize, mb_x, mb_y, s->mb_width,
                       s->filter.simple, 1);

D
David Conrad 已提交
1582
    if (mb->mode < MODE_I4x4) {
P
Peter Ross 已提交
1583
        mode = check_intra_pred8x8_mode_emuedge(mb->mode, mb_x, mb_y, is_vp7);
D
David Conrad 已提交
1584 1585 1586
        s->hpc.pred16x16[mode](dst[0], s->linesize);
    } else {
        uint8_t *ptr = dst[0];
1587
        uint8_t *intra4x4 = mb->intra4x4_pred_mode_mb;
P
Peter Ross 已提交
1588 1589
        const uint8_t lo = is_vp7 ? 128 : 127;
        const uint8_t hi = is_vp7 ? 128 : 129;
P
Peter Ross 已提交
1590
        uint8_t tr_top[4] = { lo, lo, lo, lo };
D
David Conrad 已提交
1591 1592 1593 1594 1595 1596 1597

        // all blocks on the right edge of the macroblock use bottom edge
        // the top macroblock for their topright edge
        uint8_t *tr_right = ptr - s->linesize + 16;

        // if we're on the right edge of the frame, said edge is extended
        // from the top macroblock
V
Vittorio Giovara 已提交
1598 1599 1600
        if (mb_y && mb_x == s->mb_width - 1) {
            tr       = tr_right[-1] * 0x01010101u;
            tr_right = (uint8_t *) &tr;
D
David Conrad 已提交
1601 1602
        }

1603
        if (mb->skip)
D
Daniel Kang 已提交
1604
            AV_ZERO128(td->non_zero_count_cache);
1605

D
David Conrad 已提交
1606 1607 1608
        for (y = 0; y < 4; y++) {
            uint8_t *topright = ptr + 4 - s->linesize;
            for (x = 0; x < 4; x++) {
1609
                int copy = 0, linesize = s->linesize;
V
Vittorio Giovara 已提交
1610 1611
                uint8_t *dst = ptr + 4 * x;
                DECLARE_ALIGNED(4, uint8_t, copy_dst)[5 * 8];
1612

1613
                if ((y == 0 || x == 3) && mb_y == 0) {
1614 1615
                    topright = tr_top;
                } else if (x == 3)
D
David Conrad 已提交
1616 1617
                    topright = tr_right;

P
Peter Ross 已提交
1618 1619
                mode = check_intra_pred4x4_mode_emuedge(intra4x4[x], mb_x + x,
                                                        mb_y + y, &copy, is_vp7);
1620
                if (copy) {
V
Vittorio Giovara 已提交
1621
                    dst      = copy_dst + 12;
1622 1623
                    linesize = 8;
                    if (!(mb_y + y)) {
P
Peter Ross 已提交
1624
                        copy_dst[3] = lo;
1625
                        AV_WN32A(copy_dst + 4, lo * 0x01010101U);
1626
                    } else {
V
Vittorio Giovara 已提交
1627
                        AV_COPY32(copy_dst + 4, ptr + 4 * x - s->linesize);
1628
                        if (!(mb_x + x)) {
P
Peter Ross 已提交
1629
                            copy_dst[3] = hi;
1630
                        } else {
V
Vittorio Giovara 已提交
1631
                            copy_dst[3] = ptr[4 * x - s->linesize - 1];
1632 1633
                        }
                    }
1634 1635 1636 1637
                    if (!(mb_x + x)) {
                        copy_dst[11] =
                        copy_dst[19] =
                        copy_dst[27] =
P
Peter Ross 已提交
1638
                        copy_dst[35] = hi;
1639
                    } else {
V
Vittorio Giovara 已提交
1640 1641 1642 1643
                        copy_dst[11] = ptr[4 * x                   - 1];
                        copy_dst[19] = ptr[4 * x + s->linesize     - 1];
                        copy_dst[27] = ptr[4 * x + s->linesize * 2 - 1];
                        copy_dst[35] = ptr[4 * x + s->linesize * 3 - 1];
1644
                    }
1645 1646 1647
                }
                s->hpc.pred4x4[mode](dst, topright, linesize);
                if (copy) {
V
Vittorio Giovara 已提交
1648 1649 1650 1651
                    AV_COPY32(ptr + 4 * x,                   copy_dst + 12);
                    AV_COPY32(ptr + 4 * x + s->linesize,     copy_dst + 20);
                    AV_COPY32(ptr + 4 * x + s->linesize * 2, copy_dst + 28);
                    AV_COPY32(ptr + 4 * x + s->linesize * 3, copy_dst + 36);
1652
                }
D
David Conrad 已提交
1653

D
Daniel Kang 已提交
1654
                nnz = td->non_zero_count_cache[y][x];
D
David Conrad 已提交
1655 1656
                if (nnz) {
                    if (nnz == 1)
V
Vittorio Giovara 已提交
1657 1658
                        s->vp8dsp.vp8_idct_dc_add(ptr + 4 * x,
                                                  td->block[y][x], s->linesize);
D
David Conrad 已提交
1659
                    else
V
Vittorio Giovara 已提交
1660 1661
                        s->vp8dsp.vp8_idct_add(ptr + 4 * x,
                                               td->block[y][x], s->linesize);
D
David Conrad 已提交
1662 1663 1664 1665
                }
                topright += 4;
            }

V
Vittorio Giovara 已提交
1666
            ptr      += 4 * s->linesize;
1667
            intra4x4 += 4;
D
David Conrad 已提交
1668 1669 1670
        }
    }

P
Peter Ross 已提交
1671 1672
    mode = check_intra_pred8x8_mode_emuedge(mb->chroma_pred_mode,
                                            mb_x, mb_y, is_vp7);
D
David Conrad 已提交
1673 1674
    s->hpc.pred8x8[mode](dst[1], s->uvlinesize);
    s->hpc.pred8x8[mode](dst[2], s->uvlinesize);
1675

1676
    if (mb_y && (s->deblock_filter || !mb_y) && td->thread_nr == 0)
V
Vittorio Giovara 已提交
1677
        xchg_mb_border(s->top_border[mb_x + 1], dst[0], dst[1], dst[2],
1678 1679
                       s->linesize, s->uvlinesize, mb_x, mb_y, s->mb_width,
                       s->filter.simple, 0);
D
David Conrad 已提交
1680 1681
}

1682 1683 1684 1685 1686 1687 1688
static const uint8_t subpel_idx[3][8] = {
    { 0, 1, 2, 1, 2, 1, 2, 1 }, // nr. of left extra pixels,
                                // also function pointer index
    { 0, 3, 5, 3, 5, 3, 5, 3 }, // nr. of extra pixels required
    { 0, 2, 3, 2, 3, 2, 3, 2 }, // nr. of right extra pixels
};

D
David Conrad 已提交
1689
/**
1690
 * luma MC function
D
David Conrad 已提交
1691
 *
V
Vittorio Giovara 已提交
1692 1693 1694 1695 1696 1697 1698 1699 1700 1701
 * @param s        VP8 decoding context
 * @param dst      target buffer for block data at block position
 * @param ref      reference picture buffer at origin (0, 0)
 * @param mv       motion vector (relative to block position) to get pixel data from
 * @param x_off    horizontal position of block from origin (0, 0)
 * @param y_off    vertical position of block from origin (0, 0)
 * @param block_w  width of block (16, 8 or 4)
 * @param block_h  height of block (always same as block_w)
 * @param width    width of src/dst plane data
 * @param height   height of src/dst plane data
D
David Conrad 已提交
1702
 * @param linesize size of a single line of plane data, including padding
V
Vittorio Giovara 已提交
1703
 * @param mc_func  motion compensation function pointers (bilinear or sixtap MC)
D
David Conrad 已提交
1704
 */
1705
static av_always_inline
D
Daniel Kang 已提交
1706
void vp8_mc_luma(VP8Context *s, VP8ThreadData *td, uint8_t *dst,
1707
                 ThreadFrame *ref, const VP56mv *mv,
1708
                 int x_off, int y_off, int block_w, int block_h,
1709
                 int width, int height, ptrdiff_t linesize,
1710
                 vp8_mc_func mc_func[3][3])
D
David Conrad 已提交
1711
{
1712
    uint8_t *src = ref->f->data[0];
R
Ronald S. Bultje 已提交
1713

1714
    if (AV_RN32A(mv)) {
1715
        int src_linesize = linesize;
1716

V
Vittorio Giovara 已提交
1717 1718
        int mx = (mv->x << 1) & 7, mx_idx = subpel_idx[0][mx];
        int my = (mv->y << 1) & 7, my_idx = subpel_idx[0][my];
1719 1720 1721

        x_off += mv->x >> 2;
        y_off += mv->y >> 2;
1722 1723

        // edge emulation
R
Ronald S. Bultje 已提交
1724
        ff_thread_await_progress(ref, (3 + y_off + block_h + subpel_idx[2][my]) >> 4, 0);
1725
        src += y_off * linesize + x_off;
1726 1727
        if (x_off < mx_idx || x_off >= width  - block_w - subpel_idx[2][mx] ||
            y_off < my_idx || y_off >= height - block_h - subpel_idx[2][my]) {
1728 1729
            s->vdsp.emulated_edge_mc(td->edge_emu_buffer,
                                     src - my_idx * linesize - mx_idx,
1730
                                     EDGE_EMU_LINESIZE, linesize,
1731 1732
                                     block_w + subpel_idx[1][mx],
                                     block_h + subpel_idx[1][my],
V
Vittorio Giovara 已提交
1733 1734
                                     x_off - mx_idx, y_off - my_idx,
                                     width, height);
1735 1736
            src = td->edge_emu_buffer + mx_idx + EDGE_EMU_LINESIZE * my_idx;
            src_linesize = EDGE_EMU_LINESIZE;
1737
        }
1738
        mc_func[my_idx][mx_idx](dst, linesize, src, src_linesize, block_h, mx, my);
R
Ronald S. Bultje 已提交
1739 1740
    } else {
        ff_thread_await_progress(ref, (3 + y_off + block_h) >> 4, 0);
V
Vittorio Giovara 已提交
1741 1742
        mc_func[0][0](dst, linesize, src + y_off * linesize + x_off,
                      linesize, block_h, 0, 0);
R
Ronald S. Bultje 已提交
1743
    }
D
David Conrad 已提交
1744 1745
}

1746 1747 1748
/**
 * chroma MC function
 *
V
Vittorio Giovara 已提交
1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759
 * @param s        VP8 decoding context
 * @param dst1     target buffer for block data at block position (U plane)
 * @param dst2     target buffer for block data at block position (V plane)
 * @param ref      reference picture buffer at origin (0, 0)
 * @param mv       motion vector (relative to block position) to get pixel data from
 * @param x_off    horizontal position of block from origin (0, 0)
 * @param y_off    vertical position of block from origin (0, 0)
 * @param block_w  width of block (16, 8 or 4)
 * @param block_h  height of block (always same as block_w)
 * @param width    width of src/dst plane data
 * @param height   height of src/dst plane data
1760
 * @param linesize size of a single line of plane data, including padding
V
Vittorio Giovara 已提交
1761
 * @param mc_func  motion compensation function pointers (bilinear or sixtap MC)
1762
 */
1763
static av_always_inline
V
Vittorio Giovara 已提交
1764 1765 1766 1767
void vp8_mc_chroma(VP8Context *s, VP8ThreadData *td, uint8_t *dst1,
                   uint8_t *dst2, ThreadFrame *ref, const VP56mv *mv,
                   int x_off, int y_off, int block_w, int block_h,
                   int width, int height, ptrdiff_t linesize,
1768 1769
                   vp8_mc_func mc_func[3][3])
{
1770
    uint8_t *src1 = ref->f->data[1], *src2 = ref->f->data[2];
R
Ronald S. Bultje 已提交
1771

1772
    if (AV_RN32A(mv)) {
V
Vittorio Giovara 已提交
1773 1774
        int mx = mv->x & 7, mx_idx = subpel_idx[0][mx];
        int my = mv->y & 7, my_idx = subpel_idx[0][my];
1775 1776 1777 1778 1779 1780 1781

        x_off += mv->x >> 3;
        y_off += mv->y >> 3;

        // edge emulation
        src1 += y_off * linesize + x_off;
        src2 += y_off * linesize + x_off;
R
Ronald S. Bultje 已提交
1782
        ff_thread_await_progress(ref, (3 + y_off + block_h + subpel_idx[2][my]) >> 3, 0);
1783 1784
        if (x_off < mx_idx || x_off >= width  - block_w - subpel_idx[2][mx] ||
            y_off < my_idx || y_off >= height - block_h - subpel_idx[2][my]) {
1785 1786
            s->vdsp.emulated_edge_mc(td->edge_emu_buffer,
                                     src1 - my_idx * linesize - mx_idx,
1787
                                     EDGE_EMU_LINESIZE, linesize,
1788 1789
                                     block_w + subpel_idx[1][mx],
                                     block_h + subpel_idx[1][my],
R
Ronald S. Bultje 已提交
1790
                                     x_off - mx_idx, y_off - my_idx, width, height);
1791 1792
            src1 = td->edge_emu_buffer + mx_idx + EDGE_EMU_LINESIZE * my_idx;
            mc_func[my_idx][mx_idx](dst1, linesize, src1, EDGE_EMU_LINESIZE, block_h, mx, my);
1793

1794 1795
            s->vdsp.emulated_edge_mc(td->edge_emu_buffer,
                                     src2 - my_idx * linesize - mx_idx,
1796
                                     EDGE_EMU_LINESIZE, linesize,
1797 1798
                                     block_w + subpel_idx[1][mx],
                                     block_h + subpel_idx[1][my],
R
Ronald S. Bultje 已提交
1799
                                     x_off - mx_idx, y_off - my_idx, width, height);
1800
            src2 = td->edge_emu_buffer + mx_idx + EDGE_EMU_LINESIZE * my_idx;
1801
            mc_func[my_idx][mx_idx](dst2, linesize, src2, EDGE_EMU_LINESIZE, block_h, mx, my);
1802 1803 1804 1805 1806
        } else {
            mc_func[my_idx][mx_idx](dst1, linesize, src1, linesize, block_h, mx, my);
            mc_func[my_idx][mx_idx](dst2, linesize, src2, linesize, block_h, mx, my);
        }
    } else {
R
Ronald S. Bultje 已提交
1807
        ff_thread_await_progress(ref, (3 + y_off + block_h) >> 3, 0);
1808 1809 1810 1811 1812
        mc_func[0][0](dst1, linesize, src1 + y_off * linesize + x_off, linesize, block_h, 0, 0);
        mc_func[0][0](dst2, linesize, src2 + y_off * linesize + x_off, linesize, block_h, 0, 0);
    }
}

1813
static av_always_inline
D
Daniel Kang 已提交
1814
void vp8_mc_part(VP8Context *s, VP8ThreadData *td, uint8_t *dst[3],
1815
                 ThreadFrame *ref_frame, int x_off, int y_off,
V
Vittorio Giovara 已提交
1816
                 int bx_off, int by_off, int block_w, int block_h,
1817
                 int width, int height, VP56mv *mv)
1818 1819 1820 1821
{
    VP56mv uvmv = *mv;

    /* Y */
D
Daniel Kang 已提交
1822
    vp8_mc_luma(s, td, dst[0] + by_off * s->linesize + bx_off,
R
Ronald S. Bultje 已提交
1823
                ref_frame, mv, x_off + bx_off, y_off + by_off,
1824 1825
                block_w, block_h, width, height, s->linesize,
                s->put_pixels_tab[block_w == 8]);
1826 1827 1828

    /* U/V */
    if (s->profile == 3) {
P
Peter Ross 已提交
1829 1830
        /* this block only applies VP8; it is safe to check
         * only the profile, as VP7 profile <= 1 */
1831 1832 1833
        uvmv.x &= ~7;
        uvmv.y &= ~7;
    }
V
Vittorio Giovara 已提交
1834 1835 1836 1837 1838 1839 1840 1841
    x_off   >>= 1;
    y_off   >>= 1;
    bx_off  >>= 1;
    by_off  >>= 1;
    width   >>= 1;
    height  >>= 1;
    block_w >>= 1;
    block_h >>= 1;
D
Daniel Kang 已提交
1842
    vp8_mc_chroma(s, td, dst[1] + by_off * s->uvlinesize + bx_off,
R
Ronald S. Bultje 已提交
1843 1844
                  dst[2] + by_off * s->uvlinesize + bx_off, ref_frame,
                  &uvmv, x_off + bx_off, y_off + by_off,
1845 1846
                  block_w, block_h, width, height, s->uvlinesize,
                  s->put_pixels_tab[1 + (block_w == 4)]);
1847 1848
}

1849
/* Fetch pixels for estimated mv 4 macroblocks ahead.
V
Vittorio Giovara 已提交
1850 1851 1852 1853
 * Optimized for 64-byte cache lines. Inspired by ffh264 prefetch_motion. */
static av_always_inline
void prefetch_motion(VP8Context *s, VP8Macroblock *mb, int mb_x, int mb_y,
                     int mb_xy, int ref)
1854
{
J
Jason Garrett-Glaser 已提交
1855
    /* Don't prefetch refs that haven't been used very often this frame. */
V
Vittorio Giovara 已提交
1856
    if (s->ref_count[ref - 1] > (mb_xy >> 5)) {
J
Jason Garrett-Glaser 已提交
1857
        int x_off = mb_x << 4, y_off = mb_y << 4;
V
Vittorio Giovara 已提交
1858 1859 1860 1861
        int mx = (mb->mv.x >> 2) + x_off + 8;
        int my = (mb->mv.y >> 2) + y_off;
        uint8_t **src = s->framep[ref]->tf.f->data;
        int off = mx + (my + (mb_x & 3) * 4) * s->linesize + 64;
R
Ronald S. Bultje 已提交
1862 1863 1864
        /* For threading, a ff_thread_await_progress here might be useful, but
         * it actually slows down the decoder. Since a bad prefetch doesn't
         * generate bad decoder output, we don't run it here. */
V
Vittorio Giovara 已提交
1865 1866 1867
        s->vdsp.prefetch(src[0] + off, s->linesize, 4);
        off = (mx >> 1) + ((my >> 1) + (mb_x & 7)) * s->uvlinesize + 64;
        s->vdsp.prefetch(src[1] + off, src[2] - src[1], 2);
J
Jason Garrett-Glaser 已提交
1868
    }
1869 1870
}

D
David Conrad 已提交
1871 1872 1873
/**
 * Apply motion vectors to prediction buffer, chapter 18.
 */
1874
static av_always_inline
D
Daniel Kang 已提交
1875 1876
void inter_predict(VP8Context *s, VP8ThreadData *td, uint8_t *dst[3],
                   VP8Macroblock *mb, int mb_x, int mb_y)
D
David Conrad 已提交
1877 1878
{
    int x_off = mb_x << 4, y_off = mb_y << 4;
V
Vittorio Giovara 已提交
1879
    int width = 16 * s->mb_width, height = 16 * s->mb_height;
1880
    ThreadFrame *ref = &s->framep[mb->ref_frame]->tf;
1881
    VP56mv *bmv = mb->bmv;
D
David Conrad 已提交
1882

1883 1884
    switch (mb->partitioning) {
    case VP8_SPLITMVMODE_NONE:
D
Daniel Kang 已提交
1885
        vp8_mc_part(s, td, dst, ref, x_off, y_off,
1886
                    0, 0, 16, 16, width, height, &mb->mv);
1887
        break;
1888
    case VP8_SPLITMVMODE_4x4: {
D
David Conrad 已提交
1889
        int x, y;
1890
        VP56mv uvmv;
D
David Conrad 已提交
1891 1892 1893 1894

        /* Y */
        for (y = 0; y < 4; y++) {
            for (x = 0; x < 4; x++) {
V
Vittorio Giovara 已提交
1895 1896 1897
                vp8_mc_luma(s, td, dst[0] + 4 * y * s->linesize + x * 4,
                            ref, &bmv[4 * y + x],
                            4 * x + x_off, 4 * y + y_off, 4, 4,
1898 1899
                            width, height, s->linesize,
                            s->put_pixels_tab[2]);
D
David Conrad 已提交
1900 1901 1902 1903
            }
        }

        /* U/V */
V
Vittorio Giovara 已提交
1904 1905 1906 1907
        x_off  >>= 1;
        y_off  >>= 1;
        width  >>= 1;
        height >>= 1;
D
David Conrad 已提交
1908 1909
        for (y = 0; y < 2; y++) {
            for (x = 0; x < 2; x++) {
V
Vittorio Giovara 已提交
1910 1911 1912 1913 1914 1915 1916 1917 1918 1919
                uvmv.x = mb->bmv[2 * y       * 4 + 2 * x    ].x +
                         mb->bmv[2 * y       * 4 + 2 * x + 1].x +
                         mb->bmv[(2 * y + 1) * 4 + 2 * x    ].x +
                         mb->bmv[(2 * y + 1) * 4 + 2 * x + 1].x;
                uvmv.y = mb->bmv[2 * y       * 4 + 2 * x    ].y +
                         mb->bmv[2 * y       * 4 + 2 * x + 1].y +
                         mb->bmv[(2 * y + 1) * 4 + 2 * x    ].y +
                         mb->bmv[(2 * y + 1) * 4 + 2 * x + 1].y;
                uvmv.x = (uvmv.x + 2 + (uvmv.x >> (INT_BIT - 1))) >> 2;
                uvmv.y = (uvmv.y + 2 + (uvmv.y >> (INT_BIT - 1))) >> 2;
D
David Conrad 已提交
1920 1921 1922 1923
                if (s->profile == 3) {
                    uvmv.x &= ~7;
                    uvmv.y &= ~7;
                }
V
Vittorio Giovara 已提交
1924 1925 1926
                vp8_mc_chroma(s, td, dst[1] + 4 * y * s->uvlinesize + x * 4,
                              dst[2] + 4 * y * s->uvlinesize + x * 4, ref,
                              &uvmv, 4 * x + x_off, 4 * y + y_off, 4, 4,
1927 1928
                              width, height, s->uvlinesize,
                              s->put_pixels_tab[2]);
D
David Conrad 已提交
1929 1930
            }
        }
1931 1932 1933
        break;
    }
    case VP8_SPLITMVMODE_16x8:
D
Daniel Kang 已提交
1934
        vp8_mc_part(s, td, dst, ref, x_off, y_off,
1935
                    0, 0, 16, 8, width, height, &bmv[0]);
D
Daniel Kang 已提交
1936
        vp8_mc_part(s, td, dst, ref, x_off, y_off,
1937
                    0, 8, 16, 8, width, height, &bmv[1]);
1938 1939
        break;
    case VP8_SPLITMVMODE_8x16:
D
Daniel Kang 已提交
1940
        vp8_mc_part(s, td, dst, ref, x_off, y_off,
1941
                    0, 0, 8, 16, width, height, &bmv[0]);
D
Daniel Kang 已提交
1942
        vp8_mc_part(s, td, dst, ref, x_off, y_off,
1943
                    8, 0, 8, 16, width, height, &bmv[1]);
1944 1945
        break;
    case VP8_SPLITMVMODE_8x8:
D
Daniel Kang 已提交
1946
        vp8_mc_part(s, td, dst, ref, x_off, y_off,
1947
                    0, 0, 8, 8, width, height, &bmv[0]);
D
Daniel Kang 已提交
1948
        vp8_mc_part(s, td, dst, ref, x_off, y_off,
1949
                    8, 0, 8, 8, width, height, &bmv[1]);
D
Daniel Kang 已提交
1950
        vp8_mc_part(s, td, dst, ref, x_off, y_off,
1951
                    0, 8, 8, 8, width, height, &bmv[2]);
D
Daniel Kang 已提交
1952
        vp8_mc_part(s, td, dst, ref, x_off, y_off,
1953
                    8, 8, 8, 8, width, height, &bmv[3]);
1954
        break;
D
David Conrad 已提交
1955 1956 1957
    }
}

V
Vittorio Giovara 已提交
1958 1959
static av_always_inline
void idct_mb(VP8Context *s, VP8ThreadData *td, uint8_t *dst[3], VP8Macroblock *mb)
D
David Conrad 已提交
1960
{
1961
    int x, y, ch;
D
David Conrad 已提交
1962

J
Jason Garrett-Glaser 已提交
1963 1964
    if (mb->mode != MODE_I4x4) {
        uint8_t *y_dst = dst[0];
D
David Conrad 已提交
1965
        for (y = 0; y < 4; y++) {
D
Daniel Kang 已提交
1966
            uint32_t nnz4 = AV_RL32(td->non_zero_count_cache[y]);
1967
            if (nnz4) {
V
Vittorio Giovara 已提交
1968
                if (nnz4 & ~0x01010101) {
J
Jason Garrett-Glaser 已提交
1969
                    for (x = 0; x < 4; x++) {
V
Vittorio Giovara 已提交
1970 1971 1972 1973 1974 1975 1976 1977
                        if ((uint8_t) nnz4 == 1)
                            s->vp8dsp.vp8_idct_dc_add(y_dst + 4 * x,
                                                      td->block[y][x],
                                                      s->linesize);
                        else if ((uint8_t) nnz4 > 1)
                            s->vp8dsp.vp8_idct_add(y_dst + 4 * x,
                                                   td->block[y][x],
                                                   s->linesize);
1978 1979 1980
                        nnz4 >>= 8;
                        if (!nnz4)
                            break;
J
Jason Garrett-Glaser 已提交
1981 1982
                    }
                } else {
D
Daniel Kang 已提交
1983
                    s->vp8dsp.vp8_idct_dc_add4y(y_dst, td->block[y], s->linesize);
D
David Conrad 已提交
1984 1985
                }
            }
V
Vittorio Giovara 已提交
1986
            y_dst += 4 * s->linesize;
D
David Conrad 已提交
1987
        }
J
Jason Garrett-Glaser 已提交
1988
    }
D
David Conrad 已提交
1989

J
Jason Garrett-Glaser 已提交
1990
    for (ch = 0; ch < 2; ch++) {
V
Vittorio Giovara 已提交
1991
        uint32_t nnz4 = AV_RL32(td->non_zero_count_cache[4 + ch]);
1992
        if (nnz4) {
V
Vittorio Giovara 已提交
1993 1994
            uint8_t *ch_dst = dst[1 + ch];
            if (nnz4 & ~0x01010101) {
1995 1996
                for (y = 0; y < 2; y++) {
                    for (x = 0; x < 2; x++) {
V
Vittorio Giovara 已提交
1997 1998 1999 2000 2001 2002 2003 2004
                        if ((uint8_t) nnz4 == 1)
                            s->vp8dsp.vp8_idct_dc_add(ch_dst + 4 * x,
                                                      td->block[4 + ch][(y << 1) + x],
                                                      s->uvlinesize);
                        else if ((uint8_t) nnz4 > 1)
                            s->vp8dsp.vp8_idct_add(ch_dst + 4 * x,
                                                   td->block[4 + ch][(y << 1) + x],
                                                   s->uvlinesize);
2005 2006
                        nnz4 >>= 8;
                        if (!nnz4)
2007
                            goto chroma_idct_end;
J
Jason Garrett-Glaser 已提交
2008
                    }
V
Vittorio Giovara 已提交
2009
                    ch_dst += 4 * s->uvlinesize;
J
Jason Garrett-Glaser 已提交
2010
                }
2011
            } else {
V
Vittorio Giovara 已提交
2012
                s->vp8dsp.vp8_idct_dc_add4uv(ch_dst, td->block[4 + ch], s->uvlinesize);
D
David Conrad 已提交
2013 2014
            }
        }
V
Vittorio Giovara 已提交
2015 2016
chroma_idct_end:
        ;
D
David Conrad 已提交
2017 2018 2019
    }
}

V
Vittorio Giovara 已提交
2020
static av_always_inline
P
Peter Ross 已提交
2021 2022
void filter_level_for_mb(VP8Context *s, VP8Macroblock *mb,
                         VP8FilterStrength *f, int is_vp7)
D
David Conrad 已提交
2023 2024 2025 2026
{
    int interior_limit, filter_level;

    if (s->segmentation.enabled) {
2027
        filter_level = s->segmentation.filter_level[mb->segment];
D
David Conrad 已提交
2028 2029 2030 2031 2032 2033 2034
        if (!s->segmentation.absolute_vals)
            filter_level += s->filter.level;
    } else
        filter_level = s->filter.level;

    if (s->lf_delta.enabled) {
        filter_level += s->lf_delta.ref[mb->ref_frame];
2035
        filter_level += s->lf_delta.mode[mb->mode];
D
David Conrad 已提交
2036
    }
2037

M
Mans Rullgard 已提交
2038
    filter_level = av_clip_uintp2(filter_level, 6);
D
David Conrad 已提交
2039 2040 2041

    interior_limit = filter_level;
    if (s->filter.sharpness) {
2042
        interior_limit >>= (s->filter.sharpness + 3) >> 2;
D
David Conrad 已提交
2043 2044 2045 2046
        interior_limit = FFMIN(interior_limit, 9 - s->filter.sharpness);
    }
    interior_limit = FFMAX(interior_limit, 1);

2047 2048
    f->filter_level = filter_level;
    f->inner_limit = interior_limit;
P
Peter Ross 已提交
2049
    f->inner_filter = is_vp7 || !mb->skip || mb->mode == MODE_I4x4 ||
V
Vittorio Giovara 已提交
2050
                      mb->mode == VP8_MVMODE_SPLIT;
D
David Conrad 已提交
2051 2052
}

V
Vittorio Giovara 已提交
2053 2054
static av_always_inline
void filter_mb(VP8Context *s, uint8_t *dst[3], VP8FilterStrength *f,
P
Peter Ross 已提交
2055
               int mb_x, int mb_y, int is_vp7)
D
David Conrad 已提交
2056
{
P
Peter Ross 已提交
2057
    int mbedge_lim, bedge_lim_y, bedge_lim_uv, hev_thresh;
2058 2059
    int filter_level = f->filter_level;
    int inner_limit = f->inner_limit;
2060
    int inner_filter = f->inner_filter;
2061 2062
    int linesize = s->linesize;
    int uvlinesize = s->uvlinesize;
2063 2064 2065 2066 2067 2068 2069 2070 2071 2072
    static const uint8_t hev_thresh_lut[2][64] = {
        { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1,
          2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
          3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
          3, 3, 3, 3 },
        { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1,
          1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
          2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
          2, 2, 2, 2 }
    };
D
David Conrad 已提交
2073 2074 2075 2076

    if (!filter_level)
        return;

P
Peter Ross 已提交
2077 2078 2079 2080
    if (is_vp7) {
        bedge_lim_y  = filter_level;
        bedge_lim_uv = filter_level * 2;
        mbedge_lim   = filter_level + 2;
P
Peter Ross 已提交
2081 2082
    } else {
        bedge_lim_y  =
P
Peter Ross 已提交
2083 2084
        bedge_lim_uv = filter_level * 2 + inner_limit;
        mbedge_lim   = bedge_lim_y + 4;
P
Peter Ross 已提交
2085
    }
2086

2087
    hev_thresh = hev_thresh_lut[s->keyframe][filter_level];
2088

D
David Conrad 已提交
2089
    if (mb_x) {
V
Vittorio Giovara 已提交
2090
        s->vp8dsp.vp8_h_loop_filter16y(dst[0], linesize,
2091
                                       mbedge_lim, inner_limit, hev_thresh);
V
Vittorio Giovara 已提交
2092
        s->vp8dsp.vp8_h_loop_filter8uv(dst[1], dst[2], uvlinesize,
2093
                                       mbedge_lim, inner_limit, hev_thresh);
D
David Conrad 已提交
2094 2095
    }

P
Peter Ross 已提交
2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109
#define H_LOOP_FILTER_16Y_INNER(cond)                                         \
    if (cond && inner_filter) {                                               \
        s->vp8dsp.vp8_h_loop_filter16y_inner(dst[0] +  4, linesize,           \
                                             bedge_lim_y, inner_limit,        \
                                             hev_thresh);                     \
        s->vp8dsp.vp8_h_loop_filter16y_inner(dst[0] +  8, linesize,           \
                                             bedge_lim_y, inner_limit,        \
                                             hev_thresh);                     \
        s->vp8dsp.vp8_h_loop_filter16y_inner(dst[0] + 12, linesize,           \
                                             bedge_lim_y, inner_limit,        \
                                             hev_thresh);                     \
        s->vp8dsp.vp8_h_loop_filter8uv_inner(dst[1] +  4, dst[2] + 4,         \
                                             uvlinesize,  bedge_lim_uv,       \
                                             inner_limit, hev_thresh);        \
D
David Conrad 已提交
2110 2111
    }

P
Peter Ross 已提交
2112
    H_LOOP_FILTER_16Y_INNER(!is_vp7)
P
Peter Ross 已提交
2113

D
David Conrad 已提交
2114
    if (mb_y) {
V
Vittorio Giovara 已提交
2115
        s->vp8dsp.vp8_v_loop_filter16y(dst[0], linesize,
2116
                                       mbedge_lim, inner_limit, hev_thresh);
V
Vittorio Giovara 已提交
2117
        s->vp8dsp.vp8_v_loop_filter8uv(dst[1], dst[2], uvlinesize,
2118
                                       mbedge_lim, inner_limit, hev_thresh);
D
David Conrad 已提交
2119 2120
    }

2121
    if (inner_filter) {
V
Vittorio Giovara 已提交
2122
        s->vp8dsp.vp8_v_loop_filter16y_inner(dst[0] +  4 * linesize,
2123
                                             linesize, bedge_lim_y,
2124
                                             inner_limit, hev_thresh);
V
Vittorio Giovara 已提交
2125
        s->vp8dsp.vp8_v_loop_filter16y_inner(dst[0] +  8 * linesize,
2126
                                             linesize, bedge_lim_y,
2127
                                             inner_limit, hev_thresh);
V
Vittorio Giovara 已提交
2128
        s->vp8dsp.vp8_v_loop_filter16y_inner(dst[0] + 12 * linesize,
2129
                                             linesize, bedge_lim_y,
2130
                                             inner_limit, hev_thresh);
V
Vittorio Giovara 已提交
2131 2132
        s->vp8dsp.vp8_v_loop_filter8uv_inner(dst[1] +  4 * uvlinesize,
                                             dst[2] +  4 * uvlinesize,
2133
                                             uvlinesize, bedge_lim_uv,
2134
                                             inner_limit, hev_thresh);
D
David Conrad 已提交
2135
    }
P
Peter Ross 已提交
2136

P
Peter Ross 已提交
2137
    H_LOOP_FILTER_16Y_INNER(is_vp7)
D
David Conrad 已提交
2138 2139
}

V
Vittorio Giovara 已提交
2140 2141 2142
static av_always_inline
void filter_mb_simple(VP8Context *s, uint8_t *dst, VP8FilterStrength *f,
                      int mb_x, int mb_y)
D
David Conrad 已提交
2143
{
2144 2145
    int mbedge_lim, bedge_lim;
    int filter_level = f->filter_level;
V
Vittorio Giovara 已提交
2146
    int inner_limit  = f->inner_limit;
2147
    int inner_filter = f->inner_filter;
V
Vittorio Giovara 已提交
2148
    int linesize     = s->linesize;
D
David Conrad 已提交
2149 2150 2151 2152

    if (!filter_level)
        return;

V
Vittorio Giovara 已提交
2153
    bedge_lim  = 2 * filter_level + inner_limit;
2154
    mbedge_lim = bedge_lim + 4;
D
David Conrad 已提交
2155 2156

    if (mb_x)
2157
        s->vp8dsp.vp8_h_loop_filter_simple(dst, linesize, mbedge_lim);
2158
    if (inner_filter) {
V
Vittorio Giovara 已提交
2159 2160 2161
        s->vp8dsp.vp8_h_loop_filter_simple(dst +  4, linesize, bedge_lim);
        s->vp8dsp.vp8_h_loop_filter_simple(dst +  8, linesize, bedge_lim);
        s->vp8dsp.vp8_h_loop_filter_simple(dst + 12, linesize, bedge_lim);
D
David Conrad 已提交
2162 2163 2164
    }

    if (mb_y)
2165
        s->vp8dsp.vp8_v_loop_filter_simple(dst, linesize, mbedge_lim);
2166
    if (inner_filter) {
V
Vittorio Giovara 已提交
2167 2168 2169
        s->vp8dsp.vp8_v_loop_filter_simple(dst +  4 * linesize, linesize, bedge_lim);
        s->vp8dsp.vp8_v_loop_filter_simple(dst +  8 * linesize, linesize, bedge_lim);
        s->vp8dsp.vp8_v_loop_filter_simple(dst + 12 * linesize, linesize, bedge_lim);
D
David Conrad 已提交
2170 2171 2172
    }
}

2173
#define MARGIN (16 << 2)
P
Peter Ross 已提交
2174
static av_always_inline
P
Peter Ross 已提交
2175 2176
void vp78_decode_mv_mb_modes(AVCodecContext *avctx, VP8Frame *curframe,
                                    VP8Frame *prev_frame, int is_vp7)
2177 2178
{
    VP8Context *s = avctx->priv_data;
D
Daniel Kang 已提交
2179 2180 2181 2182 2183
    int mb_x, mb_y;

    s->mv_min.y = -MARGIN;
    s->mv_max.y = ((s->mb_height - 1) << 6) + MARGIN;
    for (mb_y = 0; mb_y < s->mb_height; mb_y++) {
V
Vittorio Giovara 已提交
2184 2185 2186
        VP8Macroblock *mb = s->macroblocks_base +
                            ((s->mb_width + 1) * (mb_y + 1) + 1);
        int mb_xy = mb_y * s->mb_width;
D
Daniel Kang 已提交
2187

V
Vittorio Giovara 已提交
2188
        AV_WN32A(s->intra4x4_pred_mode_left, DC_PRED * 0x01010101);
D
Daniel Kang 已提交
2189 2190 2191 2192 2193

        s->mv_min.x = -MARGIN;
        s->mv_max.x = ((s->mb_width - 1) << 6) + MARGIN;
        for (mb_x = 0; mb_x < s->mb_width; mb_x++, mb_xy++, mb++) {
            if (mb_y == 0)
V
Vittorio Giovara 已提交
2194 2195
                AV_WN32A((mb - s->mb_width - 1)->intra4x4_pred_mode_top,
                         DC_PRED * 0x01010101);
2196 2197
            decode_mb_mode(s, mb, mb_x, mb_y, curframe->seg_map->data + mb_xy,
                           prev_frame && prev_frame->seg_map ?
P
Peter Ross 已提交
2198
                           prev_frame->seg_map->data + mb_xy : NULL, 1, is_vp7);
D
Daniel Kang 已提交
2199 2200 2201 2202 2203 2204 2205 2206
            s->mv_min.x -= 64;
            s->mv_max.x -= 64;
        }
        s->mv_min.y -= 64;
        s->mv_max.y -= 64;
    }
}

P
Peter Ross 已提交
2207
static void vp7_decode_mv_mb_modes(AVCodecContext *avctx, VP8Frame *cur_frame,
P
Peter Ross 已提交
2208 2209
                                   VP8Frame *prev_frame)
{
P
Peter Ross 已提交
2210
    vp78_decode_mv_mb_modes(avctx, cur_frame, prev_frame, IS_VP7);
P
Peter Ross 已提交
2211 2212
}

P
Peter Ross 已提交
2213
static void vp8_decode_mv_mb_modes(AVCodecContext *avctx, VP8Frame *cur_frame,
P
Peter Ross 已提交
2214 2215
                                   VP8Frame *prev_frame)
{
P
Peter Ross 已提交
2216
    vp78_decode_mv_mb_modes(avctx, cur_frame, prev_frame, IS_VP8);
P
Peter Ross 已提交
2217 2218
}

2219
#if HAVE_THREADS
V
Vittorio Giovara 已提交
2220 2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253
#define check_thread_pos(td, otd, mb_x_check, mb_y_check)                     \
    do {                                                                      \
        int tmp = (mb_y_check << 16) | (mb_x_check & 0xFFFF);                 \
        if (otd->thread_mb_pos < tmp) {                                       \
            pthread_mutex_lock(&otd->lock);                                   \
            td->wait_mb_pos = tmp;                                            \
            do {                                                              \
                if (otd->thread_mb_pos >= tmp)                                \
                    break;                                                    \
                pthread_cond_wait(&otd->cond, &otd->lock);                    \
            } while (1);                                                      \
            td->wait_mb_pos = INT_MAX;                                        \
            pthread_mutex_unlock(&otd->lock);                                 \
        }                                                                     \
    } while (0);

#define update_pos(td, mb_y, mb_x)                                            \
    do {                                                                      \
        int pos              = (mb_y << 16) | (mb_x & 0xFFFF);                \
        int sliced_threading = (avctx->active_thread_type == FF_THREAD_SLICE) && \
                               (num_jobs > 1);                                \
        int is_null          = (next_td == NULL) || (prev_td == NULL);        \
        int pos_check        = (is_null) ? 1                                  \
                                         : (next_td != td &&                  \
                                            pos >= next_td->wait_mb_pos) ||   \
                                           (prev_td != td &&                  \
                                            pos >= prev_td->wait_mb_pos);     \
        td->thread_mb_pos = pos;                                              \
        if (sliced_threading && pos_check) {                                  \
            pthread_mutex_lock(&td->lock);                                    \
            pthread_cond_broadcast(&td->cond);                                \
            pthread_mutex_unlock(&td->lock);                                  \
        }                                                                     \
    } while (0);
2254 2255 2256 2257
#else
#define check_thread_pos(td, otd, mb_x_check, mb_y_check)
#define update_pos(td, mb_y, mb_x)
#endif
D
Daniel Kang 已提交
2258

P
Peter Ross 已提交
2259
static av_always_inline void decode_mb_row_no_filter(AVCodecContext *avctx, void *tdata,
P
Peter Ross 已提交
2260
                                        int jobnr, int threadnr, int is_vp7)
D
Daniel Kang 已提交
2261 2262 2263
{
    VP8Context *s = avctx->priv_data;
    VP8ThreadData *prev_td, *next_td, *td = &s->thread_data[threadnr];
V
Vittorio Giovara 已提交
2264 2265
    int mb_y = td->thread_mb_pos >> 16;
    int mb_x, mb_xy = mb_y * s->mb_width;
D
Daniel Kang 已提交
2266
    int num_jobs = s->num_jobs;
2267
    VP8Frame *curframe = s->curframe, *prev_frame = s->prev_frame;
V
Vittorio Giovara 已提交
2268
    VP56RangeCoder *c  = &s->coeff_partition[mb_y & (s->num_coeff_partitions - 1)];
D
Daniel Kang 已提交
2269
    VP8Macroblock *mb;
D
David Conrad 已提交
2270
    uint8_t *dst[3] = {
V
Vittorio Giovara 已提交
2271 2272 2273
        curframe->tf.f->data[0] + 16 * mb_y * s->linesize,
        curframe->tf.f->data[1] +  8 * mb_y * s->uvlinesize,
        curframe->tf.f->data[2] +  8 * mb_y * s->uvlinesize
D
David Conrad 已提交
2274
    };
V
Vittorio Giovara 已提交
2275 2276 2277 2278 2279 2280 2281 2282
    if (mb_y == 0)
        prev_td = td;
    else
        prev_td = &s->thread_data[(jobnr + num_jobs - 1) % num_jobs];
    if (mb_y == s->mb_height - 1)
        next_td = td;
    else
        next_td = &s->thread_data[(jobnr + 1) % num_jobs];
D
Daniel Kang 已提交
2283
    if (s->mb_layout == 1)
V
Vittorio Giovara 已提交
2284
        mb = s->macroblocks_base + ((s->mb_width + 1) * (mb_y + 1) + 1);
D
Daniel Kang 已提交
2285
    else {
2286 2287 2288 2289 2290
        // Make sure the previous frame has read its segmentation map,
        // if we re-use the same map.
        if (prev_frame && s->segmentation.enabled &&
            !s->segmentation.update_map)
            ff_thread_await_progress(&prev_frame->tf, mb_y, 0);
V
Vittorio Giovara 已提交
2291
        mb = s->macroblocks + (s->mb_height - mb_y - 1) * 2;
D
Daniel Kang 已提交
2292
        memset(mb - 1, 0, sizeof(*mb)); // zero left macroblock
V
Vittorio Giovara 已提交
2293
        AV_WN32A(s->intra4x4_pred_mode_left, DC_PRED * 0x01010101);
D
Daniel Kang 已提交
2294 2295
    }

P
Peter Ross 已提交
2296
    if (!is_vp7 || mb_y == 0)
P
Peter Ross 已提交
2297
        memset(td->left_nnz, 0, sizeof(td->left_nnz));
2298 2299

    s->mv_min.x = -MARGIN;
V
Vittorio Giovara 已提交
2300
    s->mv_max.x = ((s->mb_width - 1) << 6) + MARGIN;
2301 2302

    for (mb_x = 0; mb_x < s->mb_width; mb_x++, mb_xy++, mb++) {
D
Daniel Kang 已提交
2303 2304 2305
        // Wait for previous thread to read mb_x+2, and reach mb_y-1.
        if (prev_td != td) {
            if (threadnr != 0) {
P
Peter Ross 已提交
2306 2307 2308
                check_thread_pos(td, prev_td,
                                 mb_x + (is_vp7 ? 2 : 1),
                                 mb_y - (is_vp7 ? 2 : 1));
D
Daniel Kang 已提交
2309
            } else {
V
Vittorio Giovara 已提交
2310
                check_thread_pos(td, prev_td,
P
Peter Ross 已提交
2311 2312
                                 mb_x + (is_vp7 ? 2 : 1) + s->mb_width + 3,
                                 mb_y - (is_vp7 ? 2 : 1));
D
Daniel Kang 已提交
2313 2314 2315
            }
        }

V
Vittorio Giovara 已提交
2316 2317 2318 2319
        s->vdsp.prefetch(dst[0] + (mb_x & 3) * 4 * s->linesize + 64,
                         s->linesize, 4);
        s->vdsp.prefetch(dst[1] + (mb_x & 7) * s->uvlinesize + 64,
                         dst[2] - dst[1], 2);
2320

D
Daniel Kang 已提交
2321
        if (!s->mb_layout)
2322 2323
            decode_mb_mode(s, mb, mb_x, mb_y, curframe->seg_map->data + mb_xy,
                           prev_frame && prev_frame->seg_map ?
P
Peter Ross 已提交
2324
                           prev_frame->seg_map->data + mb_xy : NULL, 0, is_vp7);
2325 2326 2327 2328

        prefetch_motion(s, mb, mb_x, mb_y, mb_xy, VP56_FRAME_PREVIOUS);

        if (!mb->skip)
P
Peter Ross 已提交
2329
            decode_mb_coeffs(s, td, c, mb, s->top_nnz[mb_x], td->left_nnz, is_vp7);
2330 2331

        if (mb->mode <= MODE_I4x4)
P
Peter Ross 已提交
2332
            intra_predict(s, td, dst, mb, mb_x, mb_y, is_vp7);
2333
        else
D
Daniel Kang 已提交
2334
            inter_predict(s, td, dst, mb, mb_x, mb_y);
2335 2336 2337 2338

        prefetch_motion(s, mb, mb_x, mb_y, mb_xy, VP56_FRAME_GOLDEN);

        if (!mb->skip) {
D
Daniel Kang 已提交
2339
            idct_mb(s, td, dst, mb);
2340
        } else {
D
Daniel Kang 已提交
2341
            AV_ZERO64(td->left_nnz);
2342 2343
            AV_WN64(s->top_nnz[mb_x], 0);   // array of 9, so unaligned

V
Vittorio Giovara 已提交
2344 2345
            /* Reset DC block predictors if they would exist
             * if the mb had coefficients */
2346
            if (mb->mode != MODE_I4x4 && mb->mode != VP8_MVMODE_SPLIT) {
D
Daniel Kang 已提交
2347
                td->left_nnz[8]     = 0;
2348 2349 2350 2351 2352
                s->top_nnz[mb_x][8] = 0;
            }
        }

        if (s->deblock_filter)
P
Peter Ross 已提交
2353
            filter_level_for_mb(s, mb, &td->filter_strength[mb_x], is_vp7);
D
Daniel Kang 已提交
2354

V
Vittorio Giovara 已提交
2355
        if (s->deblock_filter && num_jobs != 1 && threadnr == num_jobs - 1) {
D
Daniel Kang 已提交
2356
            if (s->filter.simple)
V
Vittorio Giovara 已提交
2357 2358
                backup_mb_border(s->top_border[mb_x + 1], dst[0],
                                 NULL, NULL, s->linesize, 0, 1);
D
Daniel Kang 已提交
2359
            else
V
Vittorio Giovara 已提交
2360 2361
                backup_mb_border(s->top_border[mb_x + 1], dst[0],
                                 dst[1], dst[2], s->linesize, s->uvlinesize, 0);
D
Daniel Kang 已提交
2362
        }
2363 2364

        prefetch_motion(s, mb, mb_x, mb_y, mb_xy, VP56_FRAME_GOLDEN2);
D
David Conrad 已提交
2365

V
Vittorio Giovara 已提交
2366 2367 2368
        dst[0]      += 16;
        dst[1]      += 8;
        dst[2]      += 8;
2369 2370
        s->mv_min.x -= 64;
        s->mv_max.x -= 64;
D
Daniel Kang 已提交
2371

V
Vittorio Giovara 已提交
2372 2373
        if (mb_x == s->mb_width + 1) {
            update_pos(td, mb_y, s->mb_width + 3);
D
Daniel Kang 已提交
2374 2375 2376
        } else {
            update_pos(td, mb_y, mb_x);
        }
D
David Conrad 已提交
2377 2378 2379
    }
}

P
Peter Ross 已提交
2380 2381 2382 2383 2384 2385 2386 2387 2388 2389 2390 2391 2392
static void vp7_decode_mb_row_no_filter(AVCodecContext *avctx, void *tdata,
                                        int jobnr, int threadnr)
{
    decode_mb_row_no_filter(avctx, tdata, jobnr, threadnr, 1);
}

static void vp8_decode_mb_row_no_filter(AVCodecContext *avctx, void *tdata,
                                        int jobnr, int threadnr)
{
    decode_mb_row_no_filter(avctx, tdata, jobnr, threadnr, 0);
}

static av_always_inline void filter_mb_row(AVCodecContext *avctx, void *tdata,
P
Peter Ross 已提交
2393
                              int jobnr, int threadnr, int is_vp7)
D
David Conrad 已提交
2394
{
D
Daniel Kang 已提交
2395 2396
    VP8Context *s = avctx->priv_data;
    VP8ThreadData *td = &s->thread_data[threadnr];
V
Vittorio Giovara 已提交
2397
    int mb_x, mb_y = td->thread_mb_pos >> 16, num_jobs = s->num_jobs;
2398
    AVFrame *curframe = s->curframe->tf.f;
D
Daniel Kang 已提交
2399 2400 2401
    VP8Macroblock *mb;
    VP8ThreadData *prev_td, *next_td;
    uint8_t *dst[3] = {
V
Vittorio Giovara 已提交
2402 2403 2404
        curframe->data[0] + 16 * mb_y * s->linesize,
        curframe->data[1] +  8 * mb_y * s->uvlinesize,
        curframe->data[2] +  8 * mb_y * s->uvlinesize
D
Daniel Kang 已提交
2405
    };
D
David Conrad 已提交
2406

D
Daniel Kang 已提交
2407
    if (s->mb_layout == 1)
V
Vittorio Giovara 已提交
2408
        mb = s->macroblocks_base + ((s->mb_width + 1) * (mb_y + 1) + 1);
D
Daniel Kang 已提交
2409
    else
V
Vittorio Giovara 已提交
2410
        mb = s->macroblocks + (s->mb_height - mb_y - 1) * 2;
D
Daniel Kang 已提交
2411

V
Vittorio Giovara 已提交
2412 2413 2414 2415 2416 2417 2418 2419
    if (mb_y == 0)
        prev_td = td;
    else
        prev_td = &s->thread_data[(jobnr + num_jobs - 1) % num_jobs];
    if (mb_y == s->mb_height - 1)
        next_td = td;
    else
        next_td = &s->thread_data[(jobnr + 1) % num_jobs];
D
Daniel Kang 已提交
2420 2421 2422

    for (mb_x = 0; mb_x < s->mb_width; mb_x++, mb++) {
        VP8FilterStrength *f = &td->filter_strength[mb_x];
V
Vittorio Giovara 已提交
2423 2424 2425
        if (prev_td != td)
            check_thread_pos(td, prev_td,
                             (mb_x + 1) + (s->mb_width + 3), mb_y - 1);
D
Daniel Kang 已提交
2426
        if (next_td != td)
V
Vittorio Giovara 已提交
2427 2428
            if (next_td != &s->thread_data[0])
                check_thread_pos(td, next_td, mb_x + 1, mb_y + 1);
D
Daniel Kang 已提交
2429 2430 2431

        if (num_jobs == 1) {
            if (s->filter.simple)
V
Vittorio Giovara 已提交
2432 2433
                backup_mb_border(s->top_border[mb_x + 1], dst[0],
                                 NULL, NULL, s->linesize, 0, 1);
D
Daniel Kang 已提交
2434
            else
V
Vittorio Giovara 已提交
2435 2436
                backup_mb_border(s->top_border[mb_x + 1], dst[0],
                                 dst[1], dst[2], s->linesize, s->uvlinesize, 0);
D
Daniel Kang 已提交
2437 2438
        }

2439
        if (s->filter.simple)
D
Daniel Kang 已提交
2440
            filter_mb_simple(s, dst[0], f, mb_x, mb_y);
2441
        else
P
Peter Ross 已提交
2442
            filter_mb(s, dst, f, mb_x, mb_y, is_vp7);
D
Daniel Kang 已提交
2443 2444 2445 2446
        dst[0] += 16;
        dst[1] += 8;
        dst[2] += 8;

V
Vittorio Giovara 已提交
2447
        update_pos(td, mb_y, (s->mb_width + 3) + mb_x);
D
David Conrad 已提交
2448 2449 2450
    }
}

P
Peter Ross 已提交
2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462
static void vp7_filter_mb_row(AVCodecContext *avctx, void *tdata,
                              int jobnr, int threadnr)
{
    filter_mb_row(avctx, tdata, jobnr, threadnr, 1);
}

static void vp8_filter_mb_row(AVCodecContext *avctx, void *tdata,
                              int jobnr, int threadnr)
{
    filter_mb_row(avctx, tdata, jobnr, threadnr, 0);
}

P
Peter Ross 已提交
2463 2464 2465
static av_always_inline
int vp78_decode_mb_row_sliced(AVCodecContext *avctx, void *tdata, int jobnr,
                              int threadnr, int is_vp7)
2466
{
D
Daniel Kang 已提交
2467 2468 2469
    VP8Context *s = avctx->priv_data;
    VP8ThreadData *td = &s->thread_data[jobnr];
    VP8ThreadData *next_td = NULL, *prev_td = NULL;
2470
    VP8Frame *curframe = s->curframe;
D
Daniel Kang 已提交
2471
    int mb_y, num_jobs = s->num_jobs;
V
Vittorio Giovara 已提交
2472

D
Daniel Kang 已提交
2473 2474
    td->thread_nr = threadnr;
    for (mb_y = jobnr; mb_y < s->mb_height; mb_y += num_jobs) {
V
Vittorio Giovara 已提交
2475 2476 2477
        if (mb_y >= s->mb_height)
            break;
        td->thread_mb_pos = mb_y << 16;
P
Peter Ross 已提交
2478
        s->decode_mb_row_no_filter(avctx, tdata, jobnr, threadnr);
D
Daniel Kang 已提交
2479
        if (s->deblock_filter)
P
Peter Ross 已提交
2480
            s->filter_mb_row(avctx, tdata, jobnr, threadnr);
D
Daniel Kang 已提交
2481 2482 2483 2484 2485 2486
        update_pos(td, mb_y, INT_MAX & 0xFFFF);

        s->mv_min.y -= 64;
        s->mv_max.y -= 64;

        if (avctx->active_thread_type == FF_THREAD_FRAME)
2487
            ff_thread_report_progress(&curframe->tf, mb_y, 0);
2488
    }
D
Daniel Kang 已提交
2489 2490

    return 0;
2491 2492
}

P
Peter Ross 已提交
2493 2494 2495 2496 2497 2498 2499 2500 2501 2502 2503 2504 2505 2506 2507 2508
static int vp7_decode_mb_row_sliced(AVCodecContext *avctx, void *tdata,
                                    int jobnr, int threadnr)
{
    return vp78_decode_mb_row_sliced(avctx, tdata, jobnr, threadnr, IS_VP7);
}

static int vp8_decode_mb_row_sliced(AVCodecContext *avctx, void *tdata,
                                    int jobnr, int threadnr)
{
    return vp78_decode_mb_row_sliced(avctx, tdata, jobnr, threadnr, IS_VP8);
}


static av_always_inline
int vp78_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
                      AVPacket *avpkt, int is_vp7)
D
David Conrad 已提交
2509 2510
{
    VP8Context *s = avctx->priv_data;
D
Daniel Kang 已提交
2511
    int ret, i, referenced, num_jobs;
D
David Conrad 已提交
2512
    enum AVDiscard skip_thresh;
2513
    VP8Frame *av_uninit(curframe), *prev_frame;
2514

P
Peter Ross 已提交
2515 2516 2517 2518 2519 2520
    if (is_vp7)
        ret = vp7_decode_frame_header(s, avpkt->data, avpkt->size);
    else
        ret = vp8_decode_frame_header(s, avpkt->data, avpkt->size);

    if (ret < 0)
2521
        goto err;
D
David Conrad 已提交
2522

2523 2524
    prev_frame = s->framep[VP56_FRAME_CURRENT];

V
Vittorio Giovara 已提交
2525 2526
    referenced = s->update_last || s->update_golden == VP56_FRAME_CURRENT ||
                 s->update_altref == VP56_FRAME_CURRENT;
D
David Conrad 已提交
2527

V
Vittorio Giovara 已提交
2528 2529 2530
    skip_thresh = !referenced ? AVDISCARD_NONREF
                              : !s->keyframe ? AVDISCARD_NONKEY
                                             : AVDISCARD_ALL;
D
David Conrad 已提交
2531 2532 2533

    if (avctx->skip_frame >= skip_thresh) {
        s->invisible = 1;
2534
        memcpy(&s->next_framep[0], &s->framep[0], sizeof(s->framep[0]) * 4);
D
David Conrad 已提交
2535 2536
        goto skip_decode;
    }
2537
    s->deblock_filter = s->filter.level && avctx->skip_loop_filter < skip_thresh;
D
David Conrad 已提交
2538

R
Ronald S. Bultje 已提交
2539 2540
    // release no longer referenced frames
    for (i = 0; i < 5; i++)
2541
        if (s->frames[i].tf.f->data[0] &&
R
Ronald S. Bultje 已提交
2542 2543
            &s->frames[i] != prev_frame &&
            &s->frames[i] != s->framep[VP56_FRAME_PREVIOUS] &&
V
Vittorio Giovara 已提交
2544
            &s->frames[i] != s->framep[VP56_FRAME_GOLDEN]   &&
R
Ronald S. Bultje 已提交
2545
            &s->frames[i] != s->framep[VP56_FRAME_GOLDEN2])
2546
            vp8_release_frame(s, &s->frames[i]);
R
Ronald S. Bultje 已提交
2547

P
Peter Ross 已提交
2548
    curframe = s->framep[VP56_FRAME_CURRENT] = vp8_find_free_buffer(s);
D
David Conrad 已提交
2549

V
Vittorio Giovara 已提交
2550 2551 2552 2553
    /* Given that arithmetic probabilities are updated every frame, it's quite
     * likely that the values we have on a random interframe are complete
     * junk if we didn't start decode on a keyframe. So just don't display
     * anything rather than junk. */
2554
    if (!s->keyframe && (!s->framep[VP56_FRAME_PREVIOUS] ||
V
Vittorio Giovara 已提交
2555
                         !s->framep[VP56_FRAME_GOLDEN]   ||
2556
                         !s->framep[VP56_FRAME_GOLDEN2])) {
V
Vittorio Giovara 已提交
2557 2558
        av_log(avctx, AV_LOG_WARNING,
               "Discarding interframe without a prior keyframe!\n");
2559 2560 2561 2562
        ret = AVERROR_INVALIDDATA;
        goto err;
    }

2563
    curframe->tf.f->key_frame = s->keyframe;
V
Vittorio Giovara 已提交
2564 2565
    curframe->tf.f->pict_type = s->keyframe ? AV_PICTURE_TYPE_I
                                            : AV_PICTURE_TYPE_P;
2566
    if ((ret = vp8_alloc_frame(s, curframe, referenced)) < 0)
2567
        goto err;
D
David Conrad 已提交
2568

R
Ronald S. Bultje 已提交
2569
    // check if golden and altref are swapped
V
Vittorio Giovara 已提交
2570 2571 2572 2573 2574 2575 2576 2577 2578 2579 2580
    if (s->update_altref != VP56_FRAME_NONE)
        s->next_framep[VP56_FRAME_GOLDEN2] = s->framep[s->update_altref];
    else
        s->next_framep[VP56_FRAME_GOLDEN2] = s->framep[VP56_FRAME_GOLDEN2];

    if (s->update_golden != VP56_FRAME_NONE)
        s->next_framep[VP56_FRAME_GOLDEN] = s->framep[s->update_golden];
    else
        s->next_framep[VP56_FRAME_GOLDEN] = s->framep[VP56_FRAME_GOLDEN];

    if (s->update_last)
R
Ronald S. Bultje 已提交
2581
        s->next_framep[VP56_FRAME_PREVIOUS] = curframe;
V
Vittorio Giovara 已提交
2582
    else
R
Ronald S. Bultje 已提交
2583
        s->next_framep[VP56_FRAME_PREVIOUS] = s->framep[VP56_FRAME_PREVIOUS];
V
Vittorio Giovara 已提交
2584 2585

    s->next_framep[VP56_FRAME_CURRENT] = curframe;
R
Ronald S. Bultje 已提交
2586

2587 2588
    ff_thread_finish_setup(avctx);

2589 2590
    s->linesize   = curframe->tf.f->linesize[0];
    s->uvlinesize = curframe->tf.f->linesize[1];
D
David Conrad 已提交
2591

V
Vittorio Giovara 已提交
2592 2593 2594
    memset(s->top_nnz, 0, s->mb_width * sizeof(*s->top_nnz));
    /* Zero macroblock structures for top/top-left prediction
     * from outside the frame. */
D
Daniel Kang 已提交
2595
    if (!s->mb_layout)
V
Vittorio Giovara 已提交
2596 2597
        memset(s->macroblocks + s->mb_height * 2 - 1, 0,
               (s->mb_width + 1) * sizeof(*s->macroblocks));
D
Daniel Kang 已提交
2598
    if (!s->mb_layout && s->keyframe)
V
Vittorio Giovara 已提交
2599
        memset(s->intra4x4_pred_mode_top, DC_PRED, s->mb_width * 4);
2600

J
Jason Garrett-Glaser 已提交
2601
    memset(s->ref_count, 0, sizeof(s->ref_count));
D
David Conrad 已提交
2602

2603 2604 2605 2606 2607 2608
    if (s->mb_layout == 1) {
        // Make sure the previous frame has read its segmentation map,
        // if we re-use the same map.
        if (prev_frame && s->segmentation.enabled &&
            !s->segmentation.update_map)
            ff_thread_await_progress(&prev_frame->tf, 1, 0);
P
Peter Ross 已提交
2609 2610 2611 2612
        if (is_vp7)
            vp7_decode_mv_mb_modes(avctx, curframe, prev_frame);
        else
            vp8_decode_mv_mb_modes(avctx, curframe, prev_frame);
2613
    }
D
David Conrad 已提交
2614

D
Daniel Kang 已提交
2615 2616 2617 2618 2619 2620 2621 2622 2623 2624 2625
    if (avctx->active_thread_type == FF_THREAD_FRAME)
        num_jobs = 1;
    else
        num_jobs = FFMIN(s->num_coeff_partitions, avctx->thread_count);
    s->num_jobs   = num_jobs;
    s->curframe   = curframe;
    s->prev_frame = prev_frame;
    s->mv_min.y   = -MARGIN;
    s->mv_max.y   = ((s->mb_height - 1) << 6) + MARGIN;
    for (i = 0; i < MAX_THREADS; i++) {
        s->thread_data[i].thread_mb_pos = 0;
V
Vittorio Giovara 已提交
2626
        s->thread_data[i].wait_mb_pos   = INT_MAX;
D
Daniel Kang 已提交
2627
    }
P
Peter Ross 已提交
2628 2629 2630 2631 2632 2633
    if (is_vp7)
        avctx->execute2(avctx, vp7_decode_mb_row_sliced, s->thread_data, NULL,
                        num_jobs);
    else
        avctx->execute2(avctx, vp8_decode_mb_row_sliced, s->thread_data, NULL,
                        num_jobs);
D
David Conrad 已提交
2634

2635
    ff_thread_report_progress(&curframe->tf, INT_MAX, 0);
2636 2637
    memcpy(&s->framep[0], &s->next_framep[0], sizeof(s->framep[0]) * 4);

D
David Conrad 已提交
2638 2639 2640 2641 2642 2643 2644
skip_decode:
    // if future frames don't use the updated probabilities,
    // reset them to the values we saved
    if (!s->update_probabilities)
        s->prob[0] = s->prob[1];

    if (!s->invisible) {
2645 2646
        if ((ret = av_frame_ref(data, curframe->tf.f)) < 0)
            return ret;
V
Vittorio Giovara 已提交
2647
        *got_frame = 1;
D
David Conrad 已提交
2648 2649 2650
    }

    return avpkt->size;
2651 2652
err:
    memcpy(&s->next_framep[0], &s->framep[0], sizeof(s->framep[0]) * 4);
2653
    return ret;
D
David Conrad 已提交
2654 2655
}

P
Peter Ross 已提交
2656 2657 2658 2659 2660 2661 2662 2663 2664 2665 2666 2667 2668 2669
int ff_vp8_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
                        AVPacket *avpkt)
{
    return vp78_decode_frame(avctx, data, got_frame, avpkt, IS_VP8);
}

#if CONFIG_VP7_DECODER
static int vp7_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
                            AVPacket *avpkt)
{
    return vp78_decode_frame(avctx, data, got_frame, avpkt, IS_VP7);
}
#endif /* CONFIG_VP7_DECODER */

J
Justin Ruggles 已提交
2670
av_cold int ff_vp8_decode_free(AVCodecContext *avctx)
2671 2672 2673 2674 2675 2676 2677 2678 2679 2680 2681 2682 2683 2684 2685 2686 2687 2688 2689 2690 2691 2692
{
    VP8Context *s = avctx->priv_data;
    int i;

    vp8_decode_flush_impl(avctx, 1);
    for (i = 0; i < FF_ARRAY_ELEMS(s->frames); i++)
        av_frame_free(&s->frames[i].tf.f);

    return 0;
}

static av_cold int vp8_init_frames(VP8Context *s)
{
    int i;
    for (i = 0; i < FF_ARRAY_ELEMS(s->frames); i++) {
        s->frames[i].tf.f = av_frame_alloc();
        if (!s->frames[i].tf.f)
            return AVERROR(ENOMEM);
    }
    return 0;
}

P
Peter Ross 已提交
2693 2694
static av_always_inline
int vp78_decode_init(AVCodecContext *avctx, int is_vp7)
D
David Conrad 已提交
2695 2696
{
    VP8Context *s = avctx->priv_data;
2697
    int ret;
D
David Conrad 已提交
2698 2699

    s->avctx = avctx;
P
Peter Ross 已提交
2700
    s->vp7   = avctx->codec->id == AV_CODEC_ID_VP7;
2701
    avctx->pix_fmt = AV_PIX_FMT_YUV420P;
2702
    avctx->internal->allocate_progress = 1;
D
David Conrad 已提交
2703

R
Ronald S. Bultje 已提交
2704
    ff_videodsp_init(&s->vdsp, 8);
P
Peter Ross 已提交
2705

P
Peter Ross 已提交
2706 2707 2708 2709
    ff_vp78dsp_init(&s->vp8dsp);
    if (CONFIG_VP7_DECODER && is_vp7) {
        ff_h264_pred_init(&s->hpc, AV_CODEC_ID_VP7, 8, 1);
        ff_vp7dsp_init(&s->vp8dsp);
2710 2711
        s->decode_mb_row_no_filter = vp7_decode_mb_row_no_filter;
        s->filter_mb_row           = vp7_filter_mb_row;
P
Peter Ross 已提交
2712 2713 2714
    } else if (CONFIG_VP8_DECODER && !is_vp7) {
        ff_h264_pred_init(&s->hpc, AV_CODEC_ID_VP8, 8, 1);
        ff_vp8dsp_init(&s->vp8dsp);
2715 2716
        s->decode_mb_row_no_filter = vp8_decode_mb_row_no_filter;
        s->filter_mb_row           = vp8_filter_mb_row;
P
Peter Ross 已提交
2717 2718 2719 2720
    }

    /* does not change for VP8 */
    memcpy(s->prob[0].scan, zigzag_scan, sizeof(s->prob[0].scan));
D
David Conrad 已提交
2721

2722
    if ((ret = vp8_init_frames(s)) < 0) {
J
Justin Ruggles 已提交
2723
        ff_vp8_decode_free(avctx);
2724 2725
        return ret;
    }
D
David Conrad 已提交
2726 2727 2728 2729

    return 0;
}

P
Peter Ross 已提交
2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 2741
#if CONFIG_VP7_DECODER
static int vp7_decode_init(AVCodecContext *avctx)
{
    return vp78_decode_init(avctx, IS_VP7);
}
#endif /* CONFIG_VP7_DECODER */

av_cold int ff_vp8_decode_init(AVCodecContext *avctx)
{
    return vp78_decode_init(avctx, IS_VP8);
}

P
Peter Ross 已提交
2742
#if CONFIG_VP8_DECODER
R
Ronald S. Bultje 已提交
2743 2744 2745
static av_cold int vp8_decode_init_thread_copy(AVCodecContext *avctx)
{
    VP8Context *s = avctx->priv_data;
2746
    int ret;
R
Ronald S. Bultje 已提交
2747 2748 2749

    s->avctx = avctx;

2750
    if ((ret = vp8_init_frames(s)) < 0) {
J
Justin Ruggles 已提交
2751
        ff_vp8_decode_free(avctx);
2752 2753 2754
        return ret;
    }

R
Ronald S. Bultje 已提交
2755 2756 2757
    return 0;
}

V
Vittorio Giovara 已提交
2758
#define REBASE(pic) pic ? pic - &s_src->frames[0] + &s->frames[0] : NULL
R
Ronald S. Bultje 已提交
2759

V
Vittorio Giovara 已提交
2760 2761
static int vp8_decode_update_thread_context(AVCodecContext *dst,
                                            const AVCodecContext *src)
R
Ronald S. Bultje 已提交
2762 2763
{
    VP8Context *s = dst->priv_data, *s_src = src->priv_data;
2764
    int i;
R
Ronald S. Bultje 已提交
2765

2766 2767 2768
    if (s->macroblocks_base &&
        (s_src->mb_width != s->mb_width || s_src->mb_height != s->mb_height)) {
        free_buffers(s);
2769 2770
        s->mb_width  = s_src->mb_width;
        s->mb_height = s_src->mb_height;
2771 2772
    }

V
Vittorio Giovara 已提交
2773
    s->prob[0]      = s_src->prob[!s_src->update_probabilities];
R
Ronald S. Bultje 已提交
2774
    s->segmentation = s_src->segmentation;
V
Vittorio Giovara 已提交
2775
    s->lf_delta     = s_src->lf_delta;
R
Ronald S. Bultje 已提交
2776 2777
    memcpy(s->sign_bias, s_src->sign_bias, sizeof(s->sign_bias));

2778 2779 2780 2781 2782 2783 2784 2785
    for (i = 0; i < FF_ARRAY_ELEMS(s_src->frames); i++) {
        if (s_src->frames[i].tf.f->data[0]) {
            int ret = vp8_ref_frame(s, &s->frames[i], &s_src->frames[i]);
            if (ret < 0)
                return ret;
        }
    }

R
Ronald S. Bultje 已提交
2786 2787 2788 2789 2790 2791 2792
    s->framep[0] = REBASE(s_src->next_framep[0]);
    s->framep[1] = REBASE(s_src->next_framep[1]);
    s->framep[2] = REBASE(s_src->next_framep[2]);
    s->framep[3] = REBASE(s_src->next_framep[3]);

    return 0;
}
P
Peter Ross 已提交
2793
#endif /* CONFIG_VP8_DECODER */
R
Ronald S. Bultje 已提交
2794

P
Peter Ross 已提交
2795 2796 2797 2798 2799 2800 2801
#if CONFIG_VP7_DECODER
AVCodec ff_vp7_decoder = {
    .name                  = "vp7",
    .long_name             = NULL_IF_CONFIG_SMALL("On2 VP7"),
    .type                  = AVMEDIA_TYPE_VIDEO,
    .id                    = AV_CODEC_ID_VP7,
    .priv_data_size        = sizeof(VP8Context),
P
Peter Ross 已提交
2802
    .init                  = vp7_decode_init,
P
Peter Ross 已提交
2803
    .close                 = ff_vp8_decode_free,
P
Peter Ross 已提交
2804
    .decode                = vp7_decode_frame,
P
Peter Ross 已提交
2805 2806 2807
    .capabilities          = CODEC_CAP_DR1,
    .flush                 = vp8_decode_flush,
};
P
Peter Ross 已提交
2808
#endif /* CONFIG_VP7_DECODER */
P
Peter Ross 已提交
2809 2810

#if CONFIG_VP8_DECODER
2811
AVCodec ff_vp8_decoder = {
2812
    .name                  = "vp8",
2813
    .long_name             = NULL_IF_CONFIG_SMALL("On2 VP8"),
2814
    .type                  = AVMEDIA_TYPE_VIDEO,
2815
    .id                    = AV_CODEC_ID_VP8,
2816
    .priv_data_size        = sizeof(VP8Context),
J
Justin Ruggles 已提交
2817 2818 2819
    .init                  = ff_vp8_decode_init,
    .close                 = ff_vp8_decode_free,
    .decode                = ff_vp8_decode_frame,
D
Daniel Kang 已提交
2820
    .capabilities          = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS | CODEC_CAP_SLICE_THREADS,
2821
    .flush                 = vp8_decode_flush,
R
Ronald S. Bultje 已提交
2822 2823
    .init_thread_copy      = ONLY_IF_THREADS_ENABLED(vp8_decode_init_thread_copy),
    .update_thread_context = ONLY_IF_THREADS_ENABLED(vp8_decode_update_thread_context),
D
David Conrad 已提交
2824
};
P
Peter Ross 已提交
2825
#endif /* CONFIG_VP7_DECODER */