vp3.c 82.3 KB
Newer Older
1
/*
2
 * Copyright (C) 2003-2004 the ffmpeg project
3
 *
4 5 6
 * This file is part of FFmpeg.
 *
 * FFmpeg is free software; you can redistribute it and/or
7 8
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
9
 * version 2.1 of the License, or (at your option) any later version.
10
 *
11
 * FFmpeg is distributed in the hope that it will be useful,
12 13 14 15 16
 * 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
17
 * License along with FFmpeg; if not, write to the Free Software
18
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19 20 21 22 23
 */

/**
 * @file vp3.c
 * On2 VP3 Video Decoder
24 25 26
 *
 * VP3 Video Decoder by Mike Melanson (mike at multimedia.cx)
 * For more information about the VP3 coding process, visit:
27
 *   http://wiki.multimedia.cx/index.php?title=On2_VP3
28 29
 *
 * Theora decoder by Alex Beregszaszi
30 31 32 33 34 35 36 37 38
 */

#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>

#include "avcodec.h"
#include "dsputil.h"
39
#include "bitstream.h"
40 41

#include "vp3data.h"
42
#include "xiph.h"
43 44 45

#define FRAGMENT_PIXELS 8

46 47 48 49 50 51 52
typedef struct Coeff {
    struct Coeff *next;
    DCTELEM coeff;
    uint8_t index;
} Coeff;

//FIXME split things out into their own arrays
53
typedef struct Vp3Fragment {
54
    Coeff *next_coeff;
55 56 57 58
    /* address of first pixel taking into account which plane the fragment
     * lives on as well as the plane stride */
    int first_pixel;
    /* this is the macroblock that the fragment belongs to */
59 60 61 62
    uint16_t macroblock;
    uint8_t coding_method;
    int8_t motion_x;
    int8_t motion_y;
63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82
} Vp3Fragment;

#define SB_NOT_CODED        0
#define SB_PARTIALLY_CODED  1
#define SB_FULLY_CODED      2

#define MODE_INTER_NO_MV      0
#define MODE_INTRA            1
#define MODE_INTER_PLUS_MV    2
#define MODE_INTER_LAST_MV    3
#define MODE_INTER_PRIOR_LAST 4
#define MODE_USING_GOLDEN     5
#define MODE_GOLDEN_MV        6
#define MODE_INTER_FOURMV     7
#define CODING_MODE_COUNT     8

/* special internal mode */
#define MODE_COPY             8

/* There are 6 preset schemes, plus a free-form scheme */
83
static const int ModeAlphabet[6][CODING_MODE_COUNT] =
84 85
{
    /* scheme 1: Last motion vector dominates */
86
    {    MODE_INTER_LAST_MV,    MODE_INTER_PRIOR_LAST,
87
         MODE_INTER_PLUS_MV,    MODE_INTER_NO_MV,
88
         MODE_INTRA,            MODE_USING_GOLDEN,
89 90 91
         MODE_GOLDEN_MV,        MODE_INTER_FOURMV },

    /* scheme 2 */
92
    {    MODE_INTER_LAST_MV,    MODE_INTER_PRIOR_LAST,
93
         MODE_INTER_NO_MV,      MODE_INTER_PLUS_MV,
94
         MODE_INTRA,            MODE_USING_GOLDEN,
95 96 97
         MODE_GOLDEN_MV,        MODE_INTER_FOURMV },

    /* scheme 3 */
98
    {    MODE_INTER_LAST_MV,    MODE_INTER_PLUS_MV,
99
         MODE_INTER_PRIOR_LAST, MODE_INTER_NO_MV,
100
         MODE_INTRA,            MODE_USING_GOLDEN,
101 102 103
         MODE_GOLDEN_MV,        MODE_INTER_FOURMV },

    /* scheme 4 */
104
    {    MODE_INTER_LAST_MV,    MODE_INTER_PLUS_MV,
105
         MODE_INTER_NO_MV,      MODE_INTER_PRIOR_LAST,
106
         MODE_INTRA,            MODE_USING_GOLDEN,
107 108 109
         MODE_GOLDEN_MV,        MODE_INTER_FOURMV },

    /* scheme 5: No motion vector dominates */
110
    {    MODE_INTER_NO_MV,      MODE_INTER_LAST_MV,
111
         MODE_INTER_PRIOR_LAST, MODE_INTER_PLUS_MV,
112
         MODE_INTRA,            MODE_USING_GOLDEN,
113 114 115
         MODE_GOLDEN_MV,        MODE_INTER_FOURMV },

    /* scheme 6 */
116
    {    MODE_INTER_NO_MV,      MODE_USING_GOLDEN,
117
         MODE_INTER_LAST_MV,    MODE_INTER_PRIOR_LAST,
118
         MODE_INTER_PLUS_MV,    MODE_INTRA,
119 120 121 122 123 124 125 126
         MODE_GOLDEN_MV,        MODE_INTER_FOURMV },

};

#define MIN_DEQUANT_VAL 2

typedef struct Vp3DecodeContext {
    AVCodecContext *avctx;
127
    int theora, theora_tables;
A
Alex Beregszaszi 已提交
128
    int version;
129 130 131 132 133 134
    int width, height;
    AVFrame golden_frame;
    AVFrame last_frame;
    AVFrame current_frame;
    int keyframe;
    DSPContext dsp;
135
    int flipped_image;
136

137 138
    int qis[3];
    int nqis;
139 140 141 142 143 144
    int quality_index;
    int last_quality_index;

    int superblock_count;
    int superblock_width;
    int superblock_height;
145 146 147 148
    int y_superblock_width;
    int y_superblock_height;
    int c_superblock_width;
    int c_superblock_height;
149 150 151 152 153 154 155 156 157 158 159 160 161
    int u_superblock_start;
    int v_superblock_start;
    unsigned char *superblock_coding;

    int macroblock_count;
    int macroblock_width;
    int macroblock_height;

    int fragment_count;
    int fragment_width;
    int fragment_height;

    Vp3Fragment *all_fragments;
162
    uint8_t *coeff_counts;
163 164
    Coeff *coeffs;
    Coeff *next_coeff;
M
Michael Niedermayer 已提交
165
    int fragment_start[3];
166

M
Michael Niedermayer 已提交
167
    ScanTable scantable;
168

169 170
    /* tables */
    uint16_t coded_dc_scale_factor[64];
171
    uint32_t coded_ac_scale_factor[64];
172 173 174 175
    uint8_t base_matrix[384][64];
    uint8_t qr_count[2][3];
    uint8_t qr_size [2][3][64];
    uint16_t qr_base[2][3][64];
176

177
    /* this is a list of indexes into the all_fragments array indicating
178 179 180
     * which of the fragments are coded */
    int *coded_fragment_list;
    int coded_fragment_list_index;
D
Diego Biurrun 已提交
181
    int pixel_addresses_initialized;
182 183 184 185 186 187 188

    VLC dc_vlc[16];
    VLC ac_vlc_1[16];
    VLC ac_vlc_2[16];
    VLC ac_vlc_3[16];
    VLC ac_vlc_4[16];

189 190 191 192 193
    VLC superblock_run_length_vlc;
    VLC fragment_run_length_vlc;
    VLC mode_code_vlc;
    VLC motion_vector_vlc;

194 195
    /* these arrays need to be on 16-byte boundaries since SSE2 operations
     * index into them */
196
    DECLARE_ALIGNED_16(int16_t, qmat[2][4][64]);        //<qmat[is_inter][plane]
197 198

    /* This table contains superblock_count * 16 entries. Each set of 16
199
     * numbers corresponds to the fragment indexes 0..15 of the superblock.
200 201 202 203 204
     * An entry will be -1 to indicate that no entry corresponds to that
     * index. */
    int *superblock_fragments;

    /* This table contains superblock_count * 4 entries. Each set of 4
205
     * numbers corresponds to the macroblock indexes 0..3 of the superblock.
206 207 208 209 210
     * An entry will be -1 to indicate that no entry corresponds to that
     * index. */
    int *superblock_macroblocks;

    /* This table contains macroblock_count * 6 entries. Each set of 6
211
     * numbers corresponds to the fragment indexes 0..5 which comprise
212 213
     * the macroblock (4 Y fragments and 2 C fragments). */
    int *macroblock_fragments;
214
    /* This is an array that indicates how a particular macroblock
215
     * is coded. */
216
    unsigned char *macroblock_coding;
217

218 219 220 221 222
    int first_coded_y_fragment;
    int first_coded_c_fragment;
    int last_coded_y_fragment;
    int last_coded_c_fragment;

M
Michael Niedermayer 已提交
223
    uint8_t edge_emu_buffer[9*2048]; //FIXME dynamic alloc
M
Måns Rullgård 已提交
224
    int8_t qscale_table[2048]; //FIXME dynamic alloc (width+15)/16
225

226 227 228 229 230 231 232
    /* Huffman decode */
    int hti;
    unsigned int hbits;
    int entries;
    int huff_code_size;
    uint16_t huffman_table[80][32][2];

233
    uint8_t filter_limit_values[64];
234
    int bounding_values_array[256];
235 236 237 238 239 240 241 242 243 244
} Vp3DecodeContext;

/************************************************************************
 * VP3 specific functions
 ************************************************************************/

/*
 * This function sets up all of the various blocks mappings:
 * superblocks <-> fragments, macroblocks <-> fragments,
 * superblocks <-> macroblocks
245 246
 *
 * Returns 0 is successful; returns 1 if *anything* went wrong.
247
 */
248
static int init_block_mapping(Vp3DecodeContext *s)
249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265
{
    int i, j;
    signed int hilbert_walk_mb[4];

    int current_fragment = 0;
    int current_width = 0;
    int current_height = 0;
    int right_edge = 0;
    int bottom_edge = 0;
    int superblock_row_inc = 0;
    int *hilbert = NULL;
    int mapping_index = 0;

    int current_macroblock;
    int c_fragment;

    signed char travel_width[16] = {
266
         1,  1,  0, -1,
267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299
         0,  0,  1,  0,
         1,  0,  1,  0,
         0, -1,  0,  1
    };

    signed char travel_height[16] = {
         0,  0,  1,  0,
         1,  1,  0, -1,
         0,  1,  0, -1,
        -1,  0, -1,  0
    };

    signed char travel_width_mb[4] = {
         1,  0,  1,  0
    };

    signed char travel_height_mb[4] = {
         0,  1,  0, -1
    };

    hilbert_walk_mb[0] = 1;
    hilbert_walk_mb[1] = s->macroblock_width;
    hilbert_walk_mb[2] = 1;
    hilbert_walk_mb[3] = -s->macroblock_width;

    /* iterate through each superblock (all planes) and map the fragments */
    for (i = 0; i < s->superblock_count; i++) {
        /* time to re-assign the limits? */
        if (i == 0) {

            /* start of Y superblocks */
            right_edge = s->fragment_width;
            bottom_edge = s->fragment_height;
300
            current_width = -1;
301
            current_height = 0;
302
            superblock_row_inc = 3 * s->fragment_width -
303
                (s->y_superblock_width * 4 - s->fragment_width);
304 305 306 307 308 309 310 311 312

            /* the first operation for this variable is to advance by 1 */
            current_fragment = -1;

        } else if (i == s->u_superblock_start) {

            /* start of U superblocks */
            right_edge = s->fragment_width / 2;
            bottom_edge = s->fragment_height / 2;
313
            current_width = -1;
314
            current_height = 0;
315
            superblock_row_inc = 3 * (s->fragment_width / 2) -
316
                (s->c_superblock_width * 4 - s->fragment_width / 2);
317 318

            /* the first operation for this variable is to advance by 1 */
M
Michael Niedermayer 已提交
319
            current_fragment = s->fragment_start[1] - 1;
320 321 322 323 324 325

        } else if (i == s->v_superblock_start) {

            /* start of V superblocks */
            right_edge = s->fragment_width / 2;
            bottom_edge = s->fragment_height / 2;
326
            current_width = -1;
327
            current_height = 0;
328
            superblock_row_inc = 3 * (s->fragment_width / 2) -
329
                (s->c_superblock_width * 4 - s->fragment_width / 2);
330 331

            /* the first operation for this variable is to advance by 1 */
M
Michael Niedermayer 已提交
332
            current_fragment = s->fragment_start[2] - 1;
333 334 335

        }

336
        if (current_width >= right_edge - 1) {
337
            /* reset width and move to next superblock row */
338
            current_width = -1;
339 340 341 342 343 344 345 346
            current_height += 4;

            /* fragment is now at the start of a new superblock row */
            current_fragment += superblock_row_inc;
        }

        /* iterate through all 16 fragments in a superblock */
        for (j = 0; j < 16; j++) {
M
Michael Niedermayer 已提交
347
            current_fragment += travel_width[j] + right_edge * travel_height[j];
348
            current_width += travel_width[j];
349 350 351
            current_height += travel_height[j];

            /* check if the fragment is in bounds */
352
            if ((current_width < right_edge) &&
353 354 355 356 357 358 359 360 361 362 363 364 365 366
                (current_height < bottom_edge)) {
                s->superblock_fragments[mapping_index] = current_fragment;
            } else {
                s->superblock_fragments[mapping_index] = -1;
            }

            mapping_index++;
        }
    }

    /* initialize the superblock <-> macroblock mapping; iterate through
     * all of the Y plane superblocks to build this mapping */
    right_edge = s->macroblock_width;
    bottom_edge = s->macroblock_height;
367
    current_width = -1;
368
    current_height = 0;
369
    superblock_row_inc = s->macroblock_width -
M
Fix ;;  
Michael Niedermayer 已提交
370
        (s->y_superblock_width * 2 - s->macroblock_width);
371 372 373 374 375
    hilbert = hilbert_walk_mb;
    mapping_index = 0;
    current_macroblock = -1;
    for (i = 0; i < s->u_superblock_start; i++) {

376
        if (current_width >= right_edge - 1) {
377
            /* reset width and move to next superblock row */
378
            current_width = -1;
379 380 381 382 383 384 385 386 387
            current_height += 2;

            /* macroblock is now at the start of a new superblock row */
            current_macroblock += superblock_row_inc;
        }

        /* iterate through each potential macroblock in the superblock */
        for (j = 0; j < 4; j++) {
            current_macroblock += hilbert_walk_mb[j];
388
            current_width += travel_width_mb[j];
389 390 391
            current_height += travel_height_mb[j];

            /* check if the macroblock is in bounds */
392
            if ((current_width < right_edge) &&
393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420
                (current_height < bottom_edge)) {
                s->superblock_macroblocks[mapping_index] = current_macroblock;
            } else {
                s->superblock_macroblocks[mapping_index] = -1;
            }

            mapping_index++;
        }
    }

    /* initialize the macroblock <-> fragment mapping */
    current_fragment = 0;
    current_macroblock = 0;
    mapping_index = 0;
    for (i = 0; i < s->fragment_height; i += 2) {

        for (j = 0; j < s->fragment_width; j += 2) {

            s->all_fragments[current_fragment].macroblock = current_macroblock;
            s->macroblock_fragments[mapping_index++] = current_fragment;

            if (j + 1 < s->fragment_width) {
                s->all_fragments[current_fragment + 1].macroblock = current_macroblock;
                s->macroblock_fragments[mapping_index++] = current_fragment + 1;
            } else
                s->macroblock_fragments[mapping_index++] = -1;

            if (i + 1 < s->fragment_height) {
421
                s->all_fragments[current_fragment + s->fragment_width].macroblock =
422
                    current_macroblock;
423
                s->macroblock_fragments[mapping_index++] =
424 425 426 427 428
                    current_fragment + s->fragment_width;
            } else
                s->macroblock_fragments[mapping_index++] = -1;

            if ((j + 1 < s->fragment_width) && (i + 1 < s->fragment_height)) {
429
                s->all_fragments[current_fragment + s->fragment_width + 1].macroblock =
430
                    current_macroblock;
431
                s->macroblock_fragments[mapping_index++] =
432 433 434 435 436
                    current_fragment + s->fragment_width + 1;
            } else
                s->macroblock_fragments[mapping_index++] = -1;

            /* C planes */
M
Michael Niedermayer 已提交
437
            c_fragment = s->fragment_start[1] +
438
                (i * s->fragment_width / 4) + (j / 2);
439
            s->all_fragments[c_fragment].macroblock = s->macroblock_count;
440 441
            s->macroblock_fragments[mapping_index++] = c_fragment;

M
Michael Niedermayer 已提交
442
            c_fragment = s->fragment_start[2] +
443
                (i * s->fragment_width / 4) + (j / 2);
444
            s->all_fragments[c_fragment].macroblock = s->macroblock_count;
445 446 447 448
            s->macroblock_fragments[mapping_index++] = c_fragment;

            if (j + 2 <= s->fragment_width)
                current_fragment += 2;
449
            else
450 451 452 453 454 455
                current_fragment++;
            current_macroblock++;
        }

        current_fragment += s->fragment_width;
    }
456 457

    return 0;  /* successful path out */
458 459 460 461 462 463 464 465 466 467 468 469
}

/*
 * This function wipes out all of the fragment data.
 */
static void init_frame(Vp3DecodeContext *s, GetBitContext *gb)
{
    int i;

    /* zero out all of the fragment information */
    s->coded_fragment_list_index = 0;
    for (i = 0; i < s->fragment_count; i++) {
470
        s->coeff_counts[i] = 0;
471 472 473
        s->all_fragments[i].motion_x = 127;
        s->all_fragments[i].motion_y = 127;
        s->all_fragments[i].next_coeff= NULL;
474 475 476
        s->coeffs[i].index=
        s->coeffs[i].coeff=0;
        s->coeffs[i].next= NULL;
477 478 479 480
    }
}

/*
481
 * This function sets up the dequantization tables used for a particular
482 483 484 485
 * frame.
 */
static void init_dequantizer(Vp3DecodeContext *s)
{
486
    int ac_scale_factor = s->coded_ac_scale_factor[s->quality_index];
487
    int dc_scale_factor = s->coded_dc_scale_factor[s->quality_index];
488
    int i, plane, inter, qri, bmi, bmj, qistart;
489

490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506
    for(inter=0; inter<2; inter++){
        for(plane=0; plane<3; plane++){
            int sum=0;
            for(qri=0; qri<s->qr_count[inter][plane]; qri++){
                sum+= s->qr_size[inter][plane][qri];
                if(s->quality_index <= sum)
                    break;
            }
            qistart= sum - s->qr_size[inter][plane][qri];
            bmi= s->qr_base[inter][plane][qri  ];
            bmj= s->qr_base[inter][plane][qri+1];
            for(i=0; i<64; i++){
                int coeff= (  2*(sum    -s->quality_index)*s->base_matrix[bmi][i]
                            - 2*(qistart-s->quality_index)*s->base_matrix[bmj][i]
                            + s->qr_size[inter][plane][qri])
                           / (2*s->qr_size[inter][plane][qri]);

M
Michael Niedermayer 已提交
507
                int qmin= 8<<(inter + !i);
508 509
                int qscale= i ? ac_scale_factor : dc_scale_factor;

510
                s->qmat[inter][plane][s->dsp.idct_permutation[i]]= av_clip((qscale * coeff)/100 * 4, qmin, 4096);
511 512
            }
        }
513
    }
514

515
    memset(s->qscale_table, (FFMAX(s->qmat[0][0][1], s->qmat[0][1][1])+8)/16, 512); //FIXME finetune
516 517
}

518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539
/*
 * This function initializes the loop filter boundary limits if the frame's
 * quality index is different from the previous frame's.
 */
static void init_loop_filter(Vp3DecodeContext *s)
{
    int *bounding_values= s->bounding_values_array+127;
    int filter_limit;
    int x;

    filter_limit = s->filter_limit_values[s->quality_index];

    /* set up the bounding values */
    memset(s->bounding_values_array, 0, 256 * sizeof(int));
    for (x = 0; x < filter_limit; x++) {
        bounding_values[-x - filter_limit] = -filter_limit + x;
        bounding_values[-x] = -x;
        bounding_values[x] = x;
        bounding_values[x + filter_limit] = filter_limit - x;
    }
}

540
/*
541
 * This function unpacks all of the superblock/macroblock/fragment coding
542 543
 * information from the bitstream.
 */
544
static int unpack_superblocks(Vp3DecodeContext *s, GetBitContext *gb)
545 546 547 548 549 550
{
    int bit = 0;
    int current_superblock = 0;
    int current_run = 0;
    int decode_fully_flags = 0;
    int decode_partial_blocks = 0;
551
    int first_c_fragment_seen;
552 553 554 555 556 557 558 559 560 561

    int i, j;
    int current_fragment;

    if (s->keyframe) {
        memset(s->superblock_coding, SB_FULLY_CODED, s->superblock_count);

    } else {

        /* unpack the list of partially-coded superblocks */
562
        bit = get_bits1(gb);
563
        /* toggle the bit because as soon as the first run length is
564 565 566
         * fetched the bit will be toggled again */
        bit ^= 1;
        while (current_superblock < s->superblock_count) {
567
            if (current_run-- == 0) {
568
                bit ^= 1;
569
                current_run = get_vlc2(gb,
570 571
                    s->superblock_run_length_vlc.table, 6, 2);
                if (current_run == 33)
572
                    current_run += get_bits(gb, 12);
573 574 575

                /* if any of the superblocks are not partially coded, flag
                 * a boolean to decode the list of fully-coded superblocks */
576
                if (bit == 0) {
577
                    decode_fully_flags = 1;
578
                } else {
579

580 581 582 583
                    /* make a note of the fact that there are partially coded
                     * superblocks */
                    decode_partial_blocks = 1;
                }
584
            }
585
            s->superblock_coding[current_superblock++] = bit;
586 587 588 589 590 591 592 593
        }

        /* unpack the list of fully coded superblocks if any of the blocks were
         * not marked as partially coded in the previous step */
        if (decode_fully_flags) {

            current_superblock = 0;
            current_run = 0;
594
            bit = get_bits1(gb);
595
            /* toggle the bit because as soon as the first run length is
596 597 598 599 600 601 602
             * fetched the bit will be toggled again */
            bit ^= 1;
            while (current_superblock < s->superblock_count) {

                /* skip any superblocks already marked as partially coded */
                if (s->superblock_coding[current_superblock] == SB_NOT_CODED) {

603
                    if (current_run-- == 0) {
604
                        bit ^= 1;
605
                        current_run = get_vlc2(gb,
606 607
                            s->superblock_run_length_vlc.table, 6, 2);
                        if (current_run == 33)
608
                            current_run += get_bits(gb, 12);
609
                    }
610
                    s->superblock_coding[current_superblock] = 2*bit;
611 612 613 614 615 616 617 618 619 620
                }
                current_superblock++;
            }
        }

        /* if there were partial blocks, initialize bitstream for
         * unpacking fragment codings */
        if (decode_partial_blocks) {

            current_run = 0;
621
            bit = get_bits1(gb);
622
            /* toggle the bit because as soon as the first run length is
623 624 625 626 627 628 629 630
             * fetched the bit will be toggled again */
            bit ^= 1;
        }
    }

    /* figure out which fragments are coded; iterate through each
     * superblock (all planes) */
    s->coded_fragment_list_index = 0;
631
    s->next_coeff= s->coeffs + s->fragment_count;
632 633
    s->first_coded_y_fragment = s->first_coded_c_fragment = 0;
    s->last_coded_y_fragment = s->last_coded_c_fragment = -1;
634
    first_c_fragment_seen = 0;
635
    memset(s->macroblock_coding, MODE_COPY, s->macroblock_count);
636 637 638 639 640 641 642
    for (i = 0; i < s->superblock_count; i++) {

        /* iterate through all 16 fragments in a superblock */
        for (j = 0; j < 16; j++) {

            /* if the fragment is in bounds, check its coding status */
            current_fragment = s->superblock_fragments[i * 16 + j];
643
            if (current_fragment >= s->fragment_count) {
644
                av_log(s->avctx, AV_LOG_ERROR, "  vp3:unpack_superblocks(): bad fragment number (%d >= %d)\n",
645 646 647
                    current_fragment, s->fragment_count);
                return 1;
            }
648 649 650 651
            if (current_fragment != -1) {
                if (s->superblock_coding[i] == SB_NOT_CODED) {

                    /* copy all the fragments from the prior frame */
652
                    s->all_fragments[current_fragment].coding_method =
653 654 655 656 657 658
                        MODE_COPY;

                } else if (s->superblock_coding[i] == SB_PARTIALLY_CODED) {

                    /* fragment may or may not be coded; this is the case
                     * that cares about the fragment coding runs */
659
                    if (current_run-- == 0) {
660
                        bit ^= 1;
661
                        current_run = get_vlc2(gb,
662
                            s->fragment_run_length_vlc.table, 5, 2);
663 664 665
                    }

                    if (bit) {
666
                        /* default mode; actual mode will be decoded in
667
                         * the next phase */
668
                        s->all_fragments[current_fragment].coding_method =
669
                            MODE_INTER_NO_MV;
670
                        s->all_fragments[current_fragment].next_coeff= s->coeffs + current_fragment;
671
                        s->coded_fragment_list[s->coded_fragment_list_index] =
672
                            current_fragment;
M
Michael Niedermayer 已提交
673
                        if ((current_fragment >= s->fragment_start[1]) &&
674 675
                            (s->last_coded_y_fragment == -1) &&
                            (!first_c_fragment_seen)) {
676 677
                            s->first_coded_c_fragment = s->coded_fragment_list_index;
                            s->last_coded_y_fragment = s->first_coded_c_fragment - 1;
678
                            first_c_fragment_seen = 1;
679 680
                        }
                        s->coded_fragment_list_index++;
681
                        s->macroblock_coding[s->all_fragments[current_fragment].macroblock] = MODE_INTER_NO_MV;
682 683 684 685 686 687 688 689 690 691
                    } else {
                        /* not coded; copy this fragment from the prior frame */
                        s->all_fragments[current_fragment].coding_method =
                            MODE_COPY;
                    }

                } else {

                    /* fragments are fully coded in this superblock; actual
                     * coding will be determined in next step */
692
                    s->all_fragments[current_fragment].coding_method =
693
                        MODE_INTER_NO_MV;
694
                    s->all_fragments[current_fragment].next_coeff= s->coeffs + current_fragment;
695
                    s->coded_fragment_list[s->coded_fragment_list_index] =
696
                        current_fragment;
M
Michael Niedermayer 已提交
697
                    if ((current_fragment >= s->fragment_start[1]) &&
698 699
                        (s->last_coded_y_fragment == -1) &&
                        (!first_c_fragment_seen)) {
700 701
                        s->first_coded_c_fragment = s->coded_fragment_list_index;
                        s->last_coded_y_fragment = s->first_coded_c_fragment - 1;
702
                        first_c_fragment_seen = 1;
703 704
                    }
                    s->coded_fragment_list_index++;
705
                    s->macroblock_coding[s->all_fragments[current_fragment].macroblock] = MODE_INTER_NO_MV;
706 707 708 709
                }
            }
        }
    }
710

711 712
    if (!first_c_fragment_seen)
        /* only Y fragments coded in this frame */
713
        s->last_coded_y_fragment = s->coded_fragment_list_index - 1;
714
    else
715
        /* end the list of coded C fragments */
716
        s->last_coded_c_fragment = s->coded_fragment_list_index - 1;
717

718
    return 0;
719 720 721 722 723 724
}

/*
 * This function unpacks all the coding mode data for individual macroblocks
 * from the bitstream.
 */
725
static int unpack_modes(Vp3DecodeContext *s, GetBitContext *gb)
726 727 728 729 730 731
{
    int i, j, k;
    int scheme;
    int current_macroblock;
    int current_fragment;
    int coding_mode;
732
    int custom_mode_alphabet[CODING_MODE_COUNT];
733 734 735 736 737 738 739 740 741 742 743 744 745

    if (s->keyframe) {
        for (i = 0; i < s->fragment_count; i++)
            s->all_fragments[i].coding_method = MODE_INTRA;

    } else {

        /* fetch the mode coding scheme for this frame */
        scheme = get_bits(gb, 3);

        /* is it a custom coding scheme? */
        if (scheme == 0) {
            for (i = 0; i < 8; i++)
746
                custom_mode_alphabet[get_bits(gb, 3)] = i;
747 748 749 750 751 752 753 754 755
        }

        /* iterate through all of the macroblocks that contain 1 or more
         * coded fragments */
        for (i = 0; i < s->u_superblock_start; i++) {

            for (j = 0; j < 4; j++) {
                current_macroblock = s->superblock_macroblocks[i * 4 + j];
                if ((current_macroblock == -1) ||
756
                    (s->macroblock_coding[current_macroblock] == MODE_COPY))
757
                    continue;
758
                if (current_macroblock >= s->macroblock_count) {
759
                    av_log(s->avctx, AV_LOG_ERROR, "  vp3:unpack_modes(): bad macroblock number (%d >= %d)\n",
760 761 762
                        current_macroblock, s->macroblock_count);
                    return 1;
                }
763 764 765 766

                /* mode 7 means get 3 bits for each coding mode */
                if (scheme == 7)
                    coding_mode = get_bits(gb, 3);
767 768 769
                else if(scheme == 0)
                    coding_mode = custom_mode_alphabet
                        [get_vlc2(gb, s->mode_code_vlc.table, 3, 3)];
770
                else
771
                    coding_mode = ModeAlphabet[scheme-1]
772
                        [get_vlc2(gb, s->mode_code_vlc.table, 3, 3)];
773

774
                s->macroblock_coding[current_macroblock] = coding_mode;
775
                for (k = 0; k < 6; k++) {
776
                    current_fragment =
777
                        s->macroblock_fragments[current_macroblock * 6 + k];
778 779 780
                    if (current_fragment == -1)
                        continue;
                    if (current_fragment >= s->fragment_count) {
781
                        av_log(s->avctx, AV_LOG_ERROR, "  vp3:unpack_modes(): bad fragment number (%d >= %d)\n",
782 783 784
                            current_fragment, s->fragment_count);
                        return 1;
                    }
785
                    if (s->all_fragments[current_fragment].coding_method !=
786 787 788 789 790 791 792
                        MODE_COPY)
                        s->all_fragments[current_fragment].coding_method =
                            coding_mode;
                }
            }
        }
    }
793 794

    return 0;
795 796
}

797 798 799 800
/*
 * This function unpacks all the motion vectors for the individual
 * macroblocks from the bitstream.
 */
801
static int unpack_vectors(Vp3DecodeContext *s, GetBitContext *gb)
802
{
803
    int i, j, k, l;
804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819
    int coding_mode;
    int motion_x[6];
    int motion_y[6];
    int last_motion_x = 0;
    int last_motion_y = 0;
    int prior_last_motion_x = 0;
    int prior_last_motion_y = 0;
    int current_macroblock;
    int current_fragment;

    if (s->keyframe) {
    } else {
        memset(motion_x, 0, 6 * sizeof(int));
        memset(motion_y, 0, 6 * sizeof(int));

        /* coding mode 0 is the VLC scheme; 1 is the fixed code scheme */
820
        coding_mode = get_bits1(gb);
821 822 823 824 825 826 827 828

        /* iterate through all of the macroblocks that contain 1 or more
         * coded fragments */
        for (i = 0; i < s->u_superblock_start; i++) {

            for (j = 0; j < 4; j++) {
                current_macroblock = s->superblock_macroblocks[i * 4 + j];
                if ((current_macroblock == -1) ||
829
                    (s->macroblock_coding[current_macroblock] == MODE_COPY))
830
                    continue;
831
                if (current_macroblock >= s->macroblock_count) {
832
                    av_log(s->avctx, AV_LOG_ERROR, "  vp3:unpack_vectors(): bad macroblock number (%d >= %d)\n",
833 834 835
                        current_macroblock, s->macroblock_count);
                    return 1;
                }
836 837

                current_fragment = s->macroblock_fragments[current_macroblock * 6];
838
                if (current_fragment >= s->fragment_count) {
839
                    av_log(s->avctx, AV_LOG_ERROR, "  vp3:unpack_vectors(): bad fragment number (%d >= %d\n",
840 841 842
                        current_fragment, s->fragment_count);
                    return 1;
                }
843
                switch (s->macroblock_coding[current_macroblock]) {
844 845 846 847 848

                case MODE_INTER_PLUS_MV:
                case MODE_GOLDEN_MV:
                    /* all 6 fragments use the same motion vector */
                    if (coding_mode == 0) {
849 850
                        motion_x[0] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)];
                        motion_y[0] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)];
851
                    } else {
852 853
                        motion_x[0] = fixed_motion_vector_table[get_bits(gb, 6)];
                        motion_y[0] = fixed_motion_vector_table[get_bits(gb, 6)];
854
                    }
855

856 857 858 859 860 861
                    for (k = 1; k < 6; k++) {
                        motion_x[k] = motion_x[0];
                        motion_y[k] = motion_y[0];
                    }

                    /* vector maintenance, only on MODE_INTER_PLUS_MV */
862
                    if (s->macroblock_coding[current_macroblock] ==
863 864 865 866 867 868 869 870 871
                        MODE_INTER_PLUS_MV) {
                        prior_last_motion_x = last_motion_x;
                        prior_last_motion_y = last_motion_y;
                        last_motion_x = motion_x[0];
                        last_motion_y = motion_y[0];
                    }
                    break;

                case MODE_INTER_FOURMV:
872 873 874 875
                    /* vector maintenance */
                    prior_last_motion_x = last_motion_x;
                    prior_last_motion_y = last_motion_y;

876 877 878 879
                    /* fetch 4 vectors from the bitstream, one for each
                     * Y fragment, then average for the C fragment vectors */
                    motion_x[4] = motion_y[4] = 0;
                    for (k = 0; k < 4; k++) {
880 881 882 883
                        for (l = 0; l < s->coded_fragment_list_index; l++)
                            if (s->coded_fragment_list[l] == s->macroblock_fragments[6*current_macroblock + k])
                                break;
                        if (l < s->coded_fragment_list_index) {
884 885 886 887 888 889 890 891 892
                            if (coding_mode == 0) {
                                motion_x[k] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)];
                                motion_y[k] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)];
                            } else {
                                motion_x[k] = fixed_motion_vector_table[get_bits(gb, 6)];
                                motion_y[k] = fixed_motion_vector_table[get_bits(gb, 6)];
                            }
                            last_motion_x = motion_x[k];
                            last_motion_y = motion_y[k];
893 894 895 896
                        } else {
                            motion_x[k] = 0;
                            motion_y[k] = 0;
                        }
897 898 899 900
                        motion_x[4] += motion_x[k];
                        motion_y[4] += motion_y[k];
                    }

M
Michael Niedermayer 已提交
901 902 903 904
                    motion_x[5]=
                    motion_x[4]= RSHIFT(motion_x[4], 2);
                    motion_y[5]=
                    motion_y[4]= RSHIFT(motion_y[4], 2);
905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935
                    break;

                case MODE_INTER_LAST_MV:
                    /* all 6 fragments use the last motion vector */
                    motion_x[0] = last_motion_x;
                    motion_y[0] = last_motion_y;
                    for (k = 1; k < 6; k++) {
                        motion_x[k] = motion_x[0];
                        motion_y[k] = motion_y[0];
                    }

                    /* no vector maintenance (last vector remains the
                     * last vector) */
                    break;

                case MODE_INTER_PRIOR_LAST:
                    /* all 6 fragments use the motion vector prior to the
                     * last motion vector */
                    motion_x[0] = prior_last_motion_x;
                    motion_y[0] = prior_last_motion_y;
                    for (k = 1; k < 6; k++) {
                        motion_x[k] = motion_x[0];
                        motion_y[k] = motion_y[0];
                    }

                    /* vector maintenance */
                    prior_last_motion_x = last_motion_x;
                    prior_last_motion_y = last_motion_y;
                    last_motion_x = motion_x[0];
                    last_motion_y = motion_y[0];
                    break;
936 937 938 939 940 941 942 943

                default:
                    /* covers intra, inter without MV, golden without MV */
                    memset(motion_x, 0, 6 * sizeof(int));
                    memset(motion_y, 0, 6 * sizeof(int));

                    /* no vector maintenance */
                    break;
944 945 946 947
                }

                /* assign the motion vectors to the correct fragments */
                for (k = 0; k < 6; k++) {
948
                    current_fragment =
949
                        s->macroblock_fragments[current_macroblock * 6 + k];
950 951 952
                    if (current_fragment == -1)
                        continue;
                    if (current_fragment >= s->fragment_count) {
953
                        av_log(s->avctx, AV_LOG_ERROR, "  vp3:unpack_vectors(): bad fragment number (%d >= %d)\n",
954 955 956
                            current_fragment, s->fragment_count);
                        return 1;
                    }
957
                    s->all_fragments[current_fragment].motion_x = motion_x[k];
958
                    s->all_fragments[current_fragment].motion_y = motion_y[k];
959 960 961 962
                }
            }
        }
    }
963 964

    return 0;
965 966
}

967
/*
968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985
 * This function is called by unpack_dct_coeffs() to extract the VLCs from
 * the bitstream. The VLCs encode tokens which are used to unpack DCT
 * data. This function unpacks all the VLCs for either the Y plane or both
 * C planes, and is called for DC coefficients or different AC coefficient
 * levels (since different coefficient types require different VLC tables.
 *
 * This function returns a residual eob run. E.g, if a particular token gave
 * instructions to EOB the next 5 fragments and there were only 2 fragments
 * left in the current fragment range, 3 would be returned so that it could
 * be passed into the next call to this same function.
 */
static int unpack_vlcs(Vp3DecodeContext *s, GetBitContext *gb,
                        VLC *table, int coeff_index,
                        int first_fragment, int last_fragment,
                        int eob_run)
{
    int i;
    int token;
986 987
    int zero_run = 0;
    DCTELEM coeff = 0;
988
    Vp3Fragment *fragment;
M
Michael Niedermayer 已提交
989
    uint8_t *perm= s->scantable.permutated;
990
    int bits_to_get;
991

992
    if ((first_fragment >= s->fragment_count) ||
993 994
        (last_fragment >= s->fragment_count)) {

995
        av_log(s->avctx, AV_LOG_ERROR, "  vp3:unpack_vlcs(): bad fragment number (%d -> %d ?)\n",
996
            first_fragment, last_fragment);
997
        return 0;
998 999
    }

1000
    for (i = first_fragment; i <= last_fragment; i++) {
1001
        int fragment_num = s->coded_fragment_list[i];
1002

1003
        if (s->coeff_counts[fragment_num] > coeff_index)
1004
            continue;
1005
        fragment = &s->all_fragments[fragment_num];
1006 1007 1008 1009 1010

        if (!eob_run) {
            /* decode a VLC into a token */
            token = get_vlc2(gb, table->table, 5, 3);
            /* use the token to get a zero run, a coefficient, and an eob run */
1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026
            if (token <= 6) {
                eob_run = eob_run_base[token];
                if (eob_run_get_bits[token])
                    eob_run += get_bits(gb, eob_run_get_bits[token]);
                coeff = zero_run = 0;
            } else {
                bits_to_get = coeff_get_bits[token];
                if (!bits_to_get)
                    coeff = coeff_tables[token][0];
                else
                    coeff = coeff_tables[token][get_bits(gb, bits_to_get)];

                zero_run = zero_run_base[token];
                if (zero_run_get_bits[token])
                    zero_run += get_bits(gb, zero_run_get_bits[token]);
            }
1027 1028 1029
        }

        if (!eob_run) {
1030 1031
            s->coeff_counts[fragment_num] += zero_run;
            if (s->coeff_counts[fragment_num] < 64){
1032
                fragment->next_coeff->coeff= coeff;
1033
                fragment->next_coeff->index= perm[s->coeff_counts[fragment_num]++]; //FIXME perm here already?
1034 1035 1036 1037
                fragment->next_coeff->next= s->next_coeff;
                s->next_coeff->next=NULL;
                fragment->next_coeff= s->next_coeff++;
            }
1038
        } else {
1039
            s->coeff_counts[fragment_num] |= 128;
1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050
            eob_run--;
        }
    }

    return eob_run;
}

/*
 * This function unpacks all of the DCT coefficient data from the
 * bitstream.
 */
1051
static int unpack_dct_coeffs(Vp3DecodeContext *s, GetBitContext *gb)
1052 1053 1054 1055 1056 1057 1058 1059
{
    int i;
    int dc_y_table;
    int dc_c_table;
    int ac_y_table;
    int ac_c_table;
    int residual_eob_run = 0;

1060
    /* fetch the DC table indexes */
1061 1062 1063 1064
    dc_y_table = get_bits(gb, 4);
    dc_c_table = get_bits(gb, 4);

    /* unpack the Y plane DC coefficients */
1065
    residual_eob_run = unpack_vlcs(s, gb, &s->dc_vlc[dc_y_table], 0,
1066
        s->first_coded_y_fragment, s->last_coded_y_fragment, residual_eob_run);
1067 1068 1069

    /* unpack the C plane DC coefficients */
    residual_eob_run = unpack_vlcs(s, gb, &s->dc_vlc[dc_c_table], 0,
1070
        s->first_coded_c_fragment, s->last_coded_c_fragment, residual_eob_run);
1071

1072
    /* fetch the AC table indexes */
1073 1074 1075
    ac_y_table = get_bits(gb, 4);
    ac_c_table = get_bits(gb, 4);

1076
    /* unpack the group 1 AC coefficients (coeffs 1-5) */
1077
    for (i = 1; i <= 5; i++) {
1078
        residual_eob_run = unpack_vlcs(s, gb, &s->ac_vlc_1[ac_y_table], i,
1079
            s->first_coded_y_fragment, s->last_coded_y_fragment, residual_eob_run);
1080

1081
        residual_eob_run = unpack_vlcs(s, gb, &s->ac_vlc_1[ac_c_table], i,
1082
            s->first_coded_c_fragment, s->last_coded_c_fragment, residual_eob_run);
1083 1084
    }

1085
    /* unpack the group 2 AC coefficients (coeffs 6-14) */
1086
    for (i = 6; i <= 14; i++) {
1087
        residual_eob_run = unpack_vlcs(s, gb, &s->ac_vlc_2[ac_y_table], i,
1088
            s->first_coded_y_fragment, s->last_coded_y_fragment, residual_eob_run);
1089

1090
        residual_eob_run = unpack_vlcs(s, gb, &s->ac_vlc_2[ac_c_table], i,
1091
            s->first_coded_c_fragment, s->last_coded_c_fragment, residual_eob_run);
1092 1093
    }

1094
    /* unpack the group 3 AC coefficients (coeffs 15-27) */
1095
    for (i = 15; i <= 27; i++) {
1096
        residual_eob_run = unpack_vlcs(s, gb, &s->ac_vlc_3[ac_y_table], i,
1097
            s->first_coded_y_fragment, s->last_coded_y_fragment, residual_eob_run);
1098

1099
        residual_eob_run = unpack_vlcs(s, gb, &s->ac_vlc_3[ac_c_table], i,
1100
            s->first_coded_c_fragment, s->last_coded_c_fragment, residual_eob_run);
1101 1102
    }

1103
    /* unpack the group 4 AC coefficients (coeffs 28-63) */
1104
    for (i = 28; i <= 63; i++) {
1105
        residual_eob_run = unpack_vlcs(s, gb, &s->ac_vlc_4[ac_y_table], i,
1106
            s->first_coded_y_fragment, s->last_coded_y_fragment, residual_eob_run);
1107

1108
        residual_eob_run = unpack_vlcs(s, gb, &s->ac_vlc_4[ac_c_table], i,
1109
            s->first_coded_c_fragment, s->last_coded_c_fragment, residual_eob_run);
1110
    }
1111 1112

    return 0;
1113 1114 1115 1116
}

/*
 * This function reverses the DC prediction for each coded fragment in
1117
 * the frame. Much of this function is adapted directly from the original
1118 1119 1120 1121 1122
 * VP3 source code.
 */
#define COMPATIBLE_FRAME(x) \
  (compatible_frame[s->all_fragments[x].coding_method] == current_frame_type)
#define FRAME_CODED(x) (s->all_fragments[x].coding_method != MODE_COPY)
1123
#define DC_COEFF(u) (s->coeffs[u].index ? 0 : s->coeffs[u].coeff) //FIXME do somethin to simplify this
1124 1125 1126 1127

static void reverse_dc_prediction(Vp3DecodeContext *s,
                                  int first_fragment,
                                  int fragment_width,
1128
                                  int fragment_height)
1129 1130 1131 1132 1133 1134 1135 1136 1137 1138
{

#define PUL 8
#define PU 4
#define PUR 2
#define PL 1

    int x, y;
    int i = first_fragment;

1139
    int predicted_dc;
1140 1141 1142 1143

    /* DC values for the left, up-left, up, and up-right fragments */
    int vl, vul, vu, vur;

1144
    /* indexes for the left, up-left, up, and up-right fragments */
1145 1146
    int l, ul, u, ur;

1147
    /*
1148 1149 1150 1151 1152 1153
     * The 6 fields mean:
     *   0: up-left multiplier
     *   1: up multiplier
     *   2: up-right multiplier
     *   3: left multiplier
     */
M
Michael Niedermayer 已提交
1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170
    int predictor_transform[16][4] = {
        {  0,  0,  0,  0},
        {  0,  0,  0,128},        // PL
        {  0,  0,128,  0},        // PUR
        {  0,  0, 53, 75},        // PUR|PL
        {  0,128,  0,  0},        // PU
        {  0, 64,  0, 64},        // PU|PL
        {  0,128,  0,  0},        // PU|PUR
        {  0,  0, 53, 75},        // PU|PUR|PL
        {128,  0,  0,  0},        // PUL
        {  0,  0,  0,128},        // PUL|PL
        { 64,  0, 64,  0},        // PUL|PUR
        {  0,  0, 53, 75},        // PUL|PUR|PL
        {  0,128,  0,  0},        // PUL|PU
       {-104,116,  0,116},        // PUL|PU|PL
        { 24, 80, 24,  0},        // PUL|PU|PUR
       {-104,116,  0,116}         // PUL|PU|PUR|PL
1171 1172 1173 1174 1175
    };

    /* This table shows which types of blocks can use other blocks for
     * prediction. For example, INTRA is the only mode in this table to
     * have a frame number of 0. That means INTRA blocks can only predict
1176
     * from other INTRA blocks. There are 2 golden frame coding types;
1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207
     * blocks encoding in these modes can only predict from other blocks
     * that were encoded with these 1 of these 2 modes. */
    unsigned char compatible_frame[8] = {
        1,    /* MODE_INTER_NO_MV */
        0,    /* MODE_INTRA */
        1,    /* MODE_INTER_PLUS_MV */
        1,    /* MODE_INTER_LAST_MV */
        1,    /* MODE_INTER_PRIOR_MV */
        2,    /* MODE_USING_GOLDEN */
        2,    /* MODE_GOLDEN_MV */
        1     /* MODE_INTER_FOUR_MV */
    };
    int current_frame_type;

    /* there is a last DC predictor for each of the 3 frame types */
    short last_dc[3];

    int transform = 0;

    vul = vu = vur = vl = 0;
    last_dc[0] = last_dc[1] = last_dc[2] = 0;

    /* for each fragment row... */
    for (y = 0; y < fragment_height; y++) {

        /* for each fragment in a row... */
        for (x = 0; x < fragment_width; x++, i++) {

            /* reverse prediction if this block was coded */
            if (s->all_fragments[i].coding_method != MODE_COPY) {

1208
                current_frame_type =
1209 1210
                    compatible_frame[s->all_fragments[i].coding_method];

M
Michael Niedermayer 已提交
1211 1212 1213
                transform= 0;
                if(x){
                    l= i-1;
1214
                    vl = DC_COEFF(l);
M
Michael Niedermayer 已提交
1215 1216
                    if(FRAME_CODED(l) && COMPATIBLE_FRAME(l))
                        transform |= PL;
M
Michael Niedermayer 已提交
1217 1218 1219
                }
                if(y){
                    u= i-fragment_width;
1220
                    vu = DC_COEFF(u);
M
Michael Niedermayer 已提交
1221 1222
                    if(FRAME_CODED(u) && COMPATIBLE_FRAME(u))
                        transform |= PU;
M
Michael Niedermayer 已提交
1223 1224 1225
                    if(x){
                        ul= i-fragment_width-1;
                        vul = DC_COEFF(ul);
M
Michael Niedermayer 已提交
1226 1227
                        if(FRAME_CODED(ul) && COMPATIBLE_FRAME(ul))
                            transform |= PUL;
M
Michael Niedermayer 已提交
1228 1229 1230 1231
                    }
                    if(x + 1 < fragment_width){
                        ur= i-fragment_width+1;
                        vur = DC_COEFF(ur);
M
Michael Niedermayer 已提交
1232 1233
                        if(FRAME_CODED(ur) && COMPATIBLE_FRAME(ur))
                            transform |= PUR;
M
Michael Niedermayer 已提交
1234
                    }
1235 1236 1237 1238 1239 1240
                }

                if (transform == 0) {

                    /* if there were no fragments to predict from, use last
                     * DC saved */
1241
                    predicted_dc = last_dc[current_frame_type];
1242 1243 1244 1245 1246 1247 1248 1249 1250
                } else {

                    /* apply the appropriate predictor transform */
                    predicted_dc =
                        (predictor_transform[transform][0] * vul) +
                        (predictor_transform[transform][1] * vu) +
                        (predictor_transform[transform][2] * vur) +
                        (predictor_transform[transform][3] * vl);

M
Michael Niedermayer 已提交
1251
                    predicted_dc /= 128;
1252 1253 1254 1255

                    /* check for outranging on the [ul u l] and
                     * [ul u ur l] predictors */
                    if ((transform == 13) || (transform == 15)) {
D
Diego Biurrun 已提交
1256
                        if (FFABS(predicted_dc - vu) > 128)
1257
                            predicted_dc = vu;
D
Diego Biurrun 已提交
1258
                        else if (FFABS(predicted_dc - vl) > 128)
1259
                            predicted_dc = vl;
D
Diego Biurrun 已提交
1260
                        else if (FFABS(predicted_dc - vul) > 128)
1261 1262 1263 1264
                            predicted_dc = vul;
                    }
                }

1265 1266 1267 1268 1269 1270 1271 1272
                /* at long last, apply the predictor */
                if(s->coeffs[i].index){
                    *s->next_coeff= s->coeffs[i];
                    s->coeffs[i].index=0;
                    s->coeffs[i].coeff=0;
                    s->coeffs[i].next= s->next_coeff++;
                }
                s->coeffs[i].coeff += predicted_dc;
1273
                /* save the DC */
1274
                last_dc[current_frame_type] = DC_COEFF(i);
1275 1276
                if(DC_COEFF(i) && !(s->coeff_counts[i]&127)){
                    s->coeff_counts[i]= 129;
1277 1278 1279 1280
//                    s->all_fragments[i].next_coeff= s->next_coeff;
                    s->coeffs[i].next= s->next_coeff;
                    (s->next_coeff++)->next=NULL;
                }
1281 1282 1283 1284 1285
            }
        }
    }
}

1286 1287 1288 1289 1290 1291

static void horizontal_filter(unsigned char *first_pixel, int stride,
    int *bounding_values);
static void vertical_filter(unsigned char *first_pixel, int stride,
    int *bounding_values);

1292 1293 1294 1295 1296 1297
/*
 * Perform the final rendering for a particular slice of data.
 * The slice number ranges from 0..(macroblock_height - 1).
 */
static void render_slice(Vp3DecodeContext *s, int slice)
{
M
Michael Niedermayer 已提交
1298
    int x;
1299
    int16_t *dequantizer;
1300
    DECLARE_ALIGNED_16(DCTELEM, block[64]);
1301 1302 1303 1304 1305 1306 1307 1308 1309 1310
    int motion_x = 0xdeadbeef, motion_y = 0xdeadbeef;
    int motion_halfpel_index;
    uint8_t *motion_source;
    int plane;
    int current_macroblock_entry = slice * s->macroblock_width * 6;

    if (slice >= s->macroblock_height)
        return;

    for (plane = 0; plane < 3; plane++) {
M
Michael Niedermayer 已提交
1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321
        uint8_t *output_plane = s->current_frame.data    [plane];
        uint8_t *  last_plane = s->   last_frame.data    [plane];
        uint8_t *golden_plane = s-> golden_frame.data    [plane];
        int stride            = s->current_frame.linesize[plane];
        int plane_width       = s->width  >> !!plane;
        int plane_height      = s->height >> !!plane;
        int y =        slice *  FRAGMENT_PIXELS << !plane ;
        int slice_height = y + (FRAGMENT_PIXELS << !plane);
        int i = s->macroblock_fragments[current_macroblock_entry + plane + 3*!!plane];

        if (!s->flipped_image) stride = -stride;
1322

1323

D
Diego Biurrun 已提交
1324
        if(FFABS(stride) > 2048)
1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344
            return; //various tables are fixed size

        /* for each fragment row in the slice (both of them)... */
        for (; y < slice_height; y += 8) {

            /* for each fragment in a row... */
            for (x = 0; x < plane_width; x += 8, i++) {

                if ((i < 0) || (i >= s->fragment_count)) {
                    av_log(s->avctx, AV_LOG_ERROR, "  vp3:render_slice(): bad fragment number (%d)\n", i);
                    return;
                }

                /* transform if this block was coded */
                if ((s->all_fragments[i].coding_method != MODE_COPY) &&
                    !((s->avctx->flags & CODEC_FLAG_GRAY) && plane)) {

                    if ((s->all_fragments[i].coding_method == MODE_USING_GOLDEN) ||
                        (s->all_fragments[i].coding_method == MODE_GOLDEN_MV))
                        motion_source= golden_plane;
1345
                    else
1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382
                        motion_source= last_plane;

                    motion_source += s->all_fragments[i].first_pixel;
                    motion_halfpel_index = 0;

                    /* sort out the motion vector if this fragment is coded
                     * using a motion vector method */
                    if ((s->all_fragments[i].coding_method > MODE_INTRA) &&
                        (s->all_fragments[i].coding_method != MODE_USING_GOLDEN)) {
                        int src_x, src_y;
                        motion_x = s->all_fragments[i].motion_x;
                        motion_y = s->all_fragments[i].motion_y;
                        if(plane){
                            motion_x= (motion_x>>1) | (motion_x&1);
                            motion_y= (motion_y>>1) | (motion_y&1);
                        }

                        src_x= (motion_x>>1) + x;
                        src_y= (motion_y>>1) + y;
                        if ((motion_x == 127) || (motion_y == 127))
                            av_log(s->avctx, AV_LOG_ERROR, " help! got invalid motion vector! (%X, %X)\n", motion_x, motion_y);

                        motion_halfpel_index = motion_x & 0x01;
                        motion_source += (motion_x >> 1);

                        motion_halfpel_index |= (motion_y & 0x01) << 1;
                        motion_source += ((motion_y >> 1) * stride);

                        if(src_x<0 || src_y<0 || src_x + 9 >= plane_width || src_y + 9 >= plane_height){
                            uint8_t *temp= s->edge_emu_buffer;
                            if(stride<0) temp -= 9*stride;
                            else temp += 9*stride;

                            ff_emulated_edge_mc(temp, motion_source, stride, 9, 9, src_x, src_y, plane_width, plane_height);
                            motion_source= temp;
                        }
                    }
1383

1384 1385 1386 1387

                    /* first, take care of copying a block from either the
                     * previous or the golden frame */
                    if (s->all_fragments[i].coding_method != MODE_INTRA) {
1388 1389 1390
                        /* Note, it is possible to implement all MC cases with
                           put_no_rnd_pixels_l2 which would look more like the
                           VP3 source but this would be slower as
1391 1392 1393 1394 1395 1396 1397 1398 1399
                           put_no_rnd_pixels_tab is better optimzed */
                        if(motion_halfpel_index != 3){
                            s->dsp.put_no_rnd_pixels_tab[1][motion_halfpel_index](
                                output_plane + s->all_fragments[i].first_pixel,
                                motion_source, stride, 8);
                        }else{
                            int d= (motion_x ^ motion_y)>>31; // d is 0 if motion_x and _y have the same sign, else -1
                            s->dsp.put_no_rnd_pixels_l2[1](
                                output_plane + s->all_fragments[i].first_pixel,
1400 1401
                                motion_source - d,
                                motion_source + stride + 1 + d,
1402 1403
                                stride, 8);
                        }
1404
                        dequantizer = s->qmat[1][plane];
1405
                    }else{
1406
                        dequantizer = s->qmat[0][plane];
1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426
                    }

                    /* dequantize the DCT coefficients */
                    if(s->avctx->idct_algo==FF_IDCT_VP3){
                        Coeff *coeff= s->coeffs + i;
                        memset(block, 0, sizeof(block));
                        while(coeff->next){
                            block[coeff->index]= coeff->coeff * dequantizer[coeff->index];
                            coeff= coeff->next;
                        }
                    }else{
                        Coeff *coeff= s->coeffs + i;
                        memset(block, 0, sizeof(block));
                        while(coeff->next){
                            block[coeff->index]= (coeff->coeff * dequantizer[coeff->index] + 2)>>2;
                            coeff= coeff->next;
                        }
                    }

                    /* invert DCT and place (or add) in final output */
1427

1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449
                    if (s->all_fragments[i].coding_method == MODE_INTRA) {
                        if(s->avctx->idct_algo!=FF_IDCT_VP3)
                            block[0] += 128<<3;
                        s->dsp.idct_put(
                            output_plane + s->all_fragments[i].first_pixel,
                            stride,
                            block);
                    } else {
                        s->dsp.idct_add(
                            output_plane + s->all_fragments[i].first_pixel,
                            stride,
                            block);
                    }
                } else {

                    /* copy directly from the previous frame */
                    s->dsp.put_pixels_tab[1][0](
                        output_plane + s->all_fragments[i].first_pixel,
                        last_plane + s->all_fragments[i].first_pixel,
                        stride, 8);

                }
1450
#if 0
1451 1452 1453 1454 1455 1456 1457
                /* perform the left edge filter if:
                 *   - the fragment is not on the left column
                 *   - the fragment is coded in this frame
                 *   - the fragment is not coded in this frame but the left
                 *     fragment is coded in this frame (this is done instead
                 *     of a right edge filter when rendering the left fragment
                 *     since this fragment is not available yet) */
1458
                if ((x > 0) &&
1459 1460 1461
                    ((s->all_fragments[i].coding_method != MODE_COPY) ||
                     ((s->all_fragments[i].coding_method == MODE_COPY) &&
                      (s->all_fragments[i - 1].coding_method != MODE_COPY)) )) {
1462
                    horizontal_filter(
1463
                        output_plane + s->all_fragments[i].first_pixel + 7*stride,
M
Michael Niedermayer 已提交
1464
                        -stride, s->bounding_values_array + 127);
1465 1466
                }

1467 1468 1469 1470 1471 1472 1473
                /* perform the top edge filter if:
                 *   - the fragment is not on the top row
                 *   - the fragment is coded in this frame
                 *   - the fragment is not coded in this frame but the above
                 *     fragment is coded in this frame (this is done instead
                 *     of a bottom edge filter when rendering the above
                 *     fragment since this fragment is not available yet) */
1474
                if ((y > 0) &&
1475 1476 1477
                    ((s->all_fragments[i].coding_method != MODE_COPY) ||
                     ((s->all_fragments[i].coding_method == MODE_COPY) &&
                      (s->all_fragments[i - fragment_width].coding_method != MODE_COPY)) )) {
1478
                    vertical_filter(
1479
                        output_plane + s->all_fragments[i].first_pixel - stride,
M
Michael Niedermayer 已提交
1480
                        -stride, s->bounding_values_array + 127);
1481
                }
1482
#endif
1483 1484 1485 1486 1487 1488 1489
            }
        }
    }

     /* this looks like a good place for slice dispatch... */
     /* algorithm:
      *   if (slice == s->macroblock_height - 1)
1490 1491 1492
      *     dispatch (both last slice & 2nd-to-last slice);
      *   else if (slice > 0)
      *     dispatch (slice - 1);
1493 1494 1495 1496 1497
      */

    emms_c();
}

1498 1499 1500
static void horizontal_filter(unsigned char *first_pixel, int stride,
    int *bounding_values)
{
1501
    unsigned char *end;
1502 1503
    int filter_value;

M
Michael Niedermayer 已提交
1504
    for (end= first_pixel + 8*stride; first_pixel != end; first_pixel += stride) {
1505
        filter_value =
1506 1507
            (first_pixel[-2] - first_pixel[ 1])
         +3*(first_pixel[ 0] - first_pixel[-1]);
1508
        filter_value = bounding_values[(filter_value + 4) >> 3];
1509 1510
        first_pixel[-1] = av_clip_uint8(first_pixel[-1] + filter_value);
        first_pixel[ 0] = av_clip_uint8(first_pixel[ 0] - filter_value);
1511 1512 1513 1514 1515 1516
    }
}

static void vertical_filter(unsigned char *first_pixel, int stride,
    int *bounding_values)
{
1517
    unsigned char *end;
1518
    int filter_value;
1519
    const int nstride= -stride;
1520

1521
    for (end= first_pixel + 8; first_pixel < end; first_pixel++) {
1522
        filter_value =
1523 1524
            (first_pixel[2 * nstride] - first_pixel[ stride])
         +3*(first_pixel[0          ] - first_pixel[nstride]);
1525
        filter_value = bounding_values[(filter_value + 4) >> 3];
1526 1527
        first_pixel[nstride] = av_clip_uint8(first_pixel[nstride] + filter_value);
        first_pixel[0] = av_clip_uint8(first_pixel[0] - filter_value);
1528 1529 1530 1531 1532
    }
}

static void apply_loop_filter(Vp3DecodeContext *s)
{
M
Michael Niedermayer 已提交
1533 1534
    int plane;
    int x, y;
1535
    int *bounding_values= s->bounding_values_array+127;
1536

1537
#if 0
1538
    int bounding_values_array[256];
1539 1540 1541 1542 1543 1544 1545
    int filter_limit;

    /* find the right loop limit value */
    for (x = 63; x >= 0; x--) {
        if (vp31_ac_scale_factor[x] >= s->quality_index)
            break;
    }
1546
    filter_limit = vp31_filter_limit_values[s->quality_index];
1547 1548

    /* set up the bounding values */
1549
    memset(bounding_values_array, 0, 256 * sizeof(int));
1550 1551 1552 1553 1554 1555
    for (x = 0; x < filter_limit; x++) {
        bounding_values[-x - filter_limit] = -filter_limit + x;
        bounding_values[-x] = -x;
        bounding_values[x] = x;
        bounding_values[x + filter_limit] = filter_limit - x;
    }
1556
#endif
1557 1558

    for (plane = 0; plane < 3; plane++) {
M
Michael Niedermayer 已提交
1559 1560 1561 1562 1563
        int width           = s->fragment_width  >> !!plane;
        int height          = s->fragment_height >> !!plane;
        int fragment        = s->fragment_start        [plane];
        int stride          = s->current_frame.linesize[plane];
        uint8_t *plane_data = s->current_frame.data    [plane];
M
Michael Niedermayer 已提交
1564
        if (!s->flipped_image) stride = -stride;
1565 1566

        for (y = 0; y < height; y++) {
1567

1568 1569 1570 1571 1572
            for (x = 0; x < width; x++) {
                /* do not perform left edge filter for left columns frags */
                if ((x > 0) &&
                    (s->all_fragments[fragment].coding_method != MODE_COPY)) {
                    horizontal_filter(
M
Michael Niedermayer 已提交
1573
                        plane_data + s->all_fragments[fragment].first_pixel,
1574 1575 1576 1577 1578 1579 1580
                        stride, bounding_values);
                }

                /* do not perform top edge filter for top row fragments */
                if ((y > 0) &&
                    (s->all_fragments[fragment].coding_method != MODE_COPY)) {
                    vertical_filter(
M
Michael Niedermayer 已提交
1581
                        plane_data + s->all_fragments[fragment].first_pixel,
1582 1583 1584 1585 1586 1587 1588 1589 1590 1591
                        stride, bounding_values);
                }

                /* do not perform right edge filter for right column
                 * fragments or if right fragment neighbor is also coded
                 * in this frame (it will be filtered in next iteration) */
                if ((x < width - 1) &&
                    (s->all_fragments[fragment].coding_method != MODE_COPY) &&
                    (s->all_fragments[fragment + 1].coding_method == MODE_COPY)) {
                    horizontal_filter(
M
Michael Niedermayer 已提交
1592
                        plane_data + s->all_fragments[fragment + 1].first_pixel,
1593 1594 1595 1596 1597 1598 1599 1600 1601 1602
                        stride, bounding_values);
                }

                /* do not perform bottom edge filter for bottom row
                 * fragments or if bottom fragment neighbor is also coded
                 * in this frame (it will be filtered in the next row) */
                if ((y < height - 1) &&
                    (s->all_fragments[fragment].coding_method != MODE_COPY) &&
                    (s->all_fragments[fragment + width].coding_method == MODE_COPY)) {
                    vertical_filter(
M
Michael Niedermayer 已提交
1603
                        plane_data + s->all_fragments[fragment + width].first_pixel,
1604 1605 1606 1607 1608 1609 1610
                        stride, bounding_values);
                }

                fragment++;
            }
        }
    }
1611 1612
}

1613
/*
1614 1615 1616 1617
 * This function computes the first pixel addresses for each fragment.
 * This function needs to be invoked after the first frame is allocated
 * so that it has access to the plane strides.
 */
1618
static void vp3_calculate_pixel_addresses(Vp3DecodeContext *s)
1619
{
1620 1621
#define Y_INITIAL(chroma_shift)  s->flipped_image ? 1  : s->fragment_height >> chroma_shift
#define Y_FINISHED(chroma_shift) s->flipped_image ? y <= s->fragment_height >> chroma_shift : y > 0
1622 1623

    int i, x, y;
1624
    const int y_inc = s->flipped_image ? 1 : -1;
1625 1626 1627 1628

    /* figure out the first pixel addresses for each of the fragments */
    /* Y plane */
    i = 0;
1629
    for (y = Y_INITIAL(0); Y_FINISHED(0); y += y_inc) {
1630
        for (x = 0; x < s->fragment_width; x++) {
1631
            s->all_fragments[i++].first_pixel =
1632 1633 1634 1635 1636 1637 1638
                s->golden_frame.linesize[0] * y * FRAGMENT_PIXELS -
                    s->golden_frame.linesize[0] +
                    x * FRAGMENT_PIXELS;
        }
    }

    /* U plane */
M
Michael Niedermayer 已提交
1639
    i = s->fragment_start[1];
1640
    for (y = Y_INITIAL(1); Y_FINISHED(1); y += y_inc) {
1641
        for (x = 0; x < s->fragment_width / 2; x++) {
1642
            s->all_fragments[i++].first_pixel =
1643 1644 1645 1646 1647 1648 1649
                s->golden_frame.linesize[1] * y * FRAGMENT_PIXELS -
                    s->golden_frame.linesize[1] +
                    x * FRAGMENT_PIXELS;
        }
    }

    /* V plane */
M
Michael Niedermayer 已提交
1650
    i = s->fragment_start[2];
1651
    for (y = Y_INITIAL(1); Y_FINISHED(1); y += y_inc) {
1652
        for (x = 0; x < s->fragment_width / 2; x++) {
1653
            s->all_fragments[i++].first_pixel =
1654 1655 1656 1657 1658 1659 1660
                s->golden_frame.linesize[2] * y * FRAGMENT_PIXELS -
                    s->golden_frame.linesize[2] +
                    x * FRAGMENT_PIXELS;
        }
    }
}

1661 1662 1663
/*
 * This is the ffmpeg/libavcodec API init function.
 */
1664
static av_cold int vp3_decode_init(AVCodecContext *avctx)
1665 1666
{
    Vp3DecodeContext *s = avctx->priv_data;
1667
    int i, inter, plane;
1668 1669 1670 1671
    int c_width;
    int c_height;
    int y_superblock_count;
    int c_superblock_count;
1672

A
Alex Beregszaszi 已提交
1673
    if (avctx->codec_tag == MKTAG('V','P','3','0'))
1674
        s->version = 0;
A
Alex Beregszaszi 已提交
1675
    else
1676
        s->version = 1;
A
Alex Beregszaszi 已提交
1677

1678
    s->avctx = avctx;
1679 1680
    s->width = (avctx->width + 15) & 0xFFFFFFF0;
    s->height = (avctx->height + 15) & 0xFFFFFFF0;
1681
    avctx->pix_fmt = PIX_FMT_YUV420P;
1682 1683
    if(avctx->idct_algo==FF_IDCT_AUTO)
        avctx->idct_algo=FF_IDCT_VP3;
1684
    dsputil_init(&s->dsp, avctx);
1685

M
Michael Niedermayer 已提交
1686
    ff_init_scantable(s->dsp.idct_permutation, &s->scantable, ff_zigzag_direct);
1687 1688 1689 1690 1691

    /* initialize to an impossible value which will force a recalculation
     * in the first frame decode */
    s->quality_index = -1;

1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705
    s->y_superblock_width = (s->width + 31) / 32;
    s->y_superblock_height = (s->height + 31) / 32;
    y_superblock_count = s->y_superblock_width * s->y_superblock_height;

    /* work out the dimensions for the C planes */
    c_width = s->width / 2;
    c_height = s->height / 2;
    s->c_superblock_width = (c_width + 31) / 32;
    s->c_superblock_height = (c_height + 31) / 32;
    c_superblock_count = s->c_superblock_width * s->c_superblock_height;

    s->superblock_count = y_superblock_count + (c_superblock_count * 2);
    s->u_superblock_start = y_superblock_count;
    s->v_superblock_start = s->u_superblock_start + c_superblock_count;
1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716
    s->superblock_coding = av_malloc(s->superblock_count);

    s->macroblock_width = (s->width + 15) / 16;
    s->macroblock_height = (s->height + 15) / 16;
    s->macroblock_count = s->macroblock_width * s->macroblock_height;

    s->fragment_width = s->width / FRAGMENT_PIXELS;
    s->fragment_height = s->height / FRAGMENT_PIXELS;

    /* fragment count covers all 8x8 blocks for all 3 planes */
    s->fragment_count = s->fragment_width * s->fragment_height * 3 / 2;
M
Michael Niedermayer 已提交
1717 1718
    s->fragment_start[1] = s->fragment_width * s->fragment_height;
    s->fragment_start[2] = s->fragment_width * s->fragment_height * 5 / 4;
1719 1720

    s->all_fragments = av_malloc(s->fragment_count * sizeof(Vp3Fragment));
1721
    s->coeff_counts = av_malloc(s->fragment_count * sizeof(*s->coeff_counts));
1722
    s->coeffs = av_malloc(s->fragment_count * sizeof(Coeff) * 65);
1723
    s->coded_fragment_list = av_malloc(s->fragment_count * sizeof(int));
D
Diego Biurrun 已提交
1724
    s->pixel_addresses_initialized = 0;
1725

1726 1727
    if (!s->theora_tables)
    {
M
cleanup  
Michael Niedermayer 已提交
1728
        for (i = 0; i < 64; i++) {
1729 1730
            s->coded_dc_scale_factor[i] = vp31_dc_scale_factor[i];
            s->coded_ac_scale_factor[i] = vp31_ac_scale_factor[i];
1731 1732 1733
            s->base_matrix[0][i] = vp31_intra_y_dequant[i];
            s->base_matrix[1][i] = vp31_intra_c_dequant[i];
            s->base_matrix[2][i] = vp31_inter_dequant[i];
1734
            s->filter_limit_values[i] = vp31_filter_limit_values[i];
M
cleanup  
Michael Niedermayer 已提交
1735
        }
1736

1737 1738 1739 1740 1741 1742 1743 1744 1745
        for(inter=0; inter<2; inter++){
            for(plane=0; plane<3; plane++){
                s->qr_count[inter][plane]= 1;
                s->qr_size [inter][plane][0]= 63;
                s->qr_base [inter][plane][0]=
                s->qr_base [inter][plane][1]= 2*inter + (!!plane)*!inter;
            }
        }

1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801
        /* init VLC tables */
        for (i = 0; i < 16; i++) {

            /* DC histograms */
            init_vlc(&s->dc_vlc[i], 5, 32,
                &dc_bias[i][0][1], 4, 2,
                &dc_bias[i][0][0], 4, 2, 0);

            /* group 1 AC histograms */
            init_vlc(&s->ac_vlc_1[i], 5, 32,
                &ac_bias_0[i][0][1], 4, 2,
                &ac_bias_0[i][0][0], 4, 2, 0);

            /* group 2 AC histograms */
            init_vlc(&s->ac_vlc_2[i], 5, 32,
                &ac_bias_1[i][0][1], 4, 2,
                &ac_bias_1[i][0][0], 4, 2, 0);

            /* group 3 AC histograms */
            init_vlc(&s->ac_vlc_3[i], 5, 32,
                &ac_bias_2[i][0][1], 4, 2,
                &ac_bias_2[i][0][0], 4, 2, 0);

            /* group 4 AC histograms */
            init_vlc(&s->ac_vlc_4[i], 5, 32,
                &ac_bias_3[i][0][1], 4, 2,
                &ac_bias_3[i][0][0], 4, 2, 0);
        }
    } else {
        for (i = 0; i < 16; i++) {

            /* DC histograms */
            init_vlc(&s->dc_vlc[i], 5, 32,
                &s->huffman_table[i][0][1], 4, 2,
                &s->huffman_table[i][0][0], 4, 2, 0);

            /* group 1 AC histograms */
            init_vlc(&s->ac_vlc_1[i], 5, 32,
                &s->huffman_table[i+16][0][1], 4, 2,
                &s->huffman_table[i+16][0][0], 4, 2, 0);

            /* group 2 AC histograms */
            init_vlc(&s->ac_vlc_2[i], 5, 32,
                &s->huffman_table[i+16*2][0][1], 4, 2,
                &s->huffman_table[i+16*2][0][0], 4, 2, 0);

            /* group 3 AC histograms */
            init_vlc(&s->ac_vlc_3[i], 5, 32,
                &s->huffman_table[i+16*3][0][1], 4, 2,
                &s->huffman_table[i+16*3][0][0], 4, 2, 0);

            /* group 4 AC histograms */
            init_vlc(&s->ac_vlc_4[i], 5, 32,
                &s->huffman_table[i+16*4][0][1], 4, 2,
                &s->huffman_table[i+16*4][0][0], 4, 2, 0);
        }
1802 1803
    }

1804 1805 1806 1807
    init_vlc(&s->superblock_run_length_vlc, 6, 34,
        &superblock_run_length_vlc_table[0][1], 4, 2,
        &superblock_run_length_vlc_table[0][0], 4, 2, 0);

1808
    init_vlc(&s->fragment_run_length_vlc, 5, 30,
1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819
        &fragment_run_length_vlc_table[0][1], 4, 2,
        &fragment_run_length_vlc_table[0][0], 4, 2, 0);

    init_vlc(&s->mode_code_vlc, 3, 8,
        &mode_code_vlc_table[0][1], 2, 1,
        &mode_code_vlc_table[0][0], 2, 1, 0);

    init_vlc(&s->motion_vector_vlc, 6, 63,
        &motion_vector_vlc_table[0][1], 2, 1,
        &motion_vector_vlc_table[0][0], 2, 1, 0);

1820 1821 1822 1823
    /* work out the block mapping tables */
    s->superblock_fragments = av_malloc(s->superblock_count * 16 * sizeof(int));
    s->superblock_macroblocks = av_malloc(s->superblock_count * 4 * sizeof(int));
    s->macroblock_fragments = av_malloc(s->macroblock_count * 6 * sizeof(int));
1824
    s->macroblock_coding = av_malloc(s->macroblock_count + 1);
1825 1826
    init_block_mapping(s);

1827 1828 1829 1830
    for (i = 0; i < 3; i++) {
        s->current_frame.data[i] = NULL;
        s->last_frame.data[i] = NULL;
        s->golden_frame.data[i] = NULL;
1831 1832
    }

1833 1834 1835 1836 1837 1838
    return 0;
}

/*
 * This is the ffmpeg/libavcodec API frame decode function.
 */
1839
static int vp3_decode_frame(AVCodecContext *avctx,
1840
                            void *data, int *data_size,
M
const  
Michael Niedermayer 已提交
1841
                            const uint8_t *buf, int buf_size)
1842 1843 1844 1845
{
    Vp3DecodeContext *s = avctx->priv_data;
    GetBitContext gb;
    static int counter = 0;
1846
    int i;
1847 1848

    init_get_bits(&gb, buf, buf_size * 8);
1849

1850 1851
    if (s->theora && get_bits1(&gb))
    {
1852 1853
        av_log(avctx, AV_LOG_ERROR, "Header packet passed to frame decoder, skipping\n");
        return -1;
1854
    }
A
Alex Beregszaszi 已提交
1855 1856 1857

    s->keyframe = !get_bits1(&gb);
    if (!s->theora)
1858
        skip_bits(&gb, 1);
A
Alex Beregszaszi 已提交
1859
    s->last_quality_index = s->quality_index;
1860 1861 1862 1863 1864 1865 1866

    s->nqis=0;
    do{
        s->qis[s->nqis++]= get_bits(&gb, 6);
    } while(s->theora >= 0x030200 && s->nqis<3 && get_bits1(&gb));

    s->quality_index= s->qis[0];
1867

1868
    if (s->avctx->debug & FF_DEBUG_PICT_INFO)
1869 1870
        av_log(s->avctx, AV_LOG_INFO, " VP3 %sframe #%d: Q index = %d\n",
            s->keyframe?"key":"", counter, s->quality_index);
1871 1872
    counter++;

1873
    if (s->quality_index != s->last_quality_index) {
1874
        init_dequantizer(s);
1875 1876
        init_loop_filter(s);
    }
1877

1878 1879 1880
    if (avctx->skip_frame >= AVDISCARD_NONKEY && !s->keyframe)
        return buf_size;

1881
    if (s->keyframe) {
1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898
        if (!s->theora)
        {
            skip_bits(&gb, 4); /* width code */
            skip_bits(&gb, 4); /* height code */
            if (s->version)
            {
                s->version = get_bits(&gb, 5);
                if (counter == 1)
                    av_log(s->avctx, AV_LOG_DEBUG, "VP version: %d\n", s->version);
            }
        }
        if (s->version || s->theora)
        {
                if (get_bits1(&gb))
                    av_log(s->avctx, AV_LOG_ERROR, "Warning, unsupported keyframe coding type?!\n");
            skip_bits(&gb, 2); /* reserved? */
        }
A
Alex Beregszaszi 已提交
1899

1900 1901 1902
        if (s->last_frame.data[0] == s->golden_frame.data[0]) {
            if (s->golden_frame.data[0])
                avctx->release_buffer(avctx, &s->golden_frame);
1903
            s->last_frame= s->golden_frame; /* ensure that we catch any access to this released frame */
1904 1905 1906 1907 1908 1909
        } else {
            if (s->golden_frame.data[0])
                avctx->release_buffer(avctx, &s->golden_frame);
            if (s->last_frame.data[0])
                avctx->release_buffer(avctx, &s->last_frame);
        }
1910

1911
        s->golden_frame.reference = 3;
1912
        if(avctx->get_buffer(avctx, &s->golden_frame) < 0) {
1913
            av_log(s->avctx, AV_LOG_ERROR, "vp3: get_buffer() failed\n");
1914 1915 1916 1917
            return -1;
        }

        /* golden frame is also the current frame */
M
Michael Niedermayer 已提交
1918
        s->current_frame= s->golden_frame;
1919 1920

        /* time to figure out pixel addresses? */
D
Diego Biurrun 已提交
1921
        if (!s->pixel_addresses_initialized)
1922
        {
D
David Conrad 已提交
1923
            vp3_calculate_pixel_addresses(s);
D
Diego Biurrun 已提交
1924
            s->pixel_addresses_initialized = 1;
1925
        }
1926 1927
    } else {
        /* allocate a new current frame */
1928
        s->current_frame.reference = 3;
D
Diego Biurrun 已提交
1929
        if (!s->pixel_addresses_initialized) {
1930 1931 1932
            av_log(s->avctx, AV_LOG_ERROR, "vp3: first frame not a keyframe\n");
            return -1;
        }
1933
        if(avctx->get_buffer(avctx, &s->current_frame) < 0) {
1934
            av_log(s->avctx, AV_LOG_ERROR, "vp3: get_buffer() failed\n");
1935 1936 1937 1938
            return -1;
        }
    }

M
Michael Niedermayer 已提交
1939 1940 1941
    s->current_frame.qscale_table= s->qscale_table; //FIXME allocate individual tables per AVFrame
    s->current_frame.qstride= 0;

1942 1943
    init_frame(s, &gb);

M
Michael Niedermayer 已提交
1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957
    if (unpack_superblocks(s, &gb)){
        av_log(s->avctx, AV_LOG_ERROR, "error in unpack_superblocks\n");
        return -1;
    }
    if (unpack_modes(s, &gb)){
        av_log(s->avctx, AV_LOG_ERROR, "error in unpack_modes\n");
        return -1;
    }
    if (unpack_vectors(s, &gb)){
        av_log(s->avctx, AV_LOG_ERROR, "error in unpack_vectors\n");
        return -1;
    }
    if (unpack_dct_coeffs(s, &gb)){
        av_log(s->avctx, AV_LOG_ERROR, "error in unpack_dct_coeffs\n");
1958 1959
        return -1;
    }
1960 1961

    reverse_dc_prediction(s, 0, s->fragment_width, s->fragment_height);
1962
    if ((avctx->flags & CODEC_FLAG_GRAY) == 0) {
M
Michael Niedermayer 已提交
1963
        reverse_dc_prediction(s, s->fragment_start[1],
1964
            s->fragment_width / 2, s->fragment_height / 2);
M
Michael Niedermayer 已提交
1965
        reverse_dc_prediction(s, s->fragment_start[2],
1966
            s->fragment_width / 2, s->fragment_height / 2);
1967 1968 1969 1970
    }

    for (i = 0; i < s->macroblock_height; i++)
        render_slice(s, i);
1971

1972
    apply_loop_filter(s);
1973

1974 1975 1976
    *data_size=sizeof(AVFrame);
    *(AVFrame*)data= s->current_frame;

1977 1978 1979 1980 1981
    /* release the last frame, if it is allocated and if it is not the
     * golden frame */
    if ((s->last_frame.data[0]) &&
        (s->last_frame.data[0] != s->golden_frame.data[0]))
        avctx->release_buffer(avctx, &s->last_frame);
1982

1983
    /* shuffle frames (last = current) */
M
Michael Niedermayer 已提交
1984
    s->last_frame= s->current_frame;
1985
    s->current_frame.data[0]= NULL; /* ensure that we catch any access to this released frame */
1986 1987 1988 1989 1990 1991 1992

    return buf_size;
}

/*
 * This is the ffmpeg/libavcodec API module cleanup function.
 */
1993
static av_cold int vp3_decode_end(AVCodecContext *avctx)
1994 1995
{
    Vp3DecodeContext *s = avctx->priv_data;
1996
    int i;
1997

1998
    av_free(s->superblock_coding);
1999
    av_free(s->all_fragments);
2000
    av_free(s->coeff_counts);
2001
    av_free(s->coeffs);
2002 2003 2004 2005
    av_free(s->coded_fragment_list);
    av_free(s->superblock_fragments);
    av_free(s->superblock_macroblocks);
    av_free(s->macroblock_fragments);
2006
    av_free(s->macroblock_coding);
2007

2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020
    for (i = 0; i < 16; i++) {
        free_vlc(&s->dc_vlc[i]);
        free_vlc(&s->ac_vlc_1[i]);
        free_vlc(&s->ac_vlc_2[i]);
        free_vlc(&s->ac_vlc_3[i]);
        free_vlc(&s->ac_vlc_4[i]);
    }

    free_vlc(&s->superblock_run_length_vlc);
    free_vlc(&s->fragment_run_length_vlc);
    free_vlc(&s->mode_code_vlc);
    free_vlc(&s->motion_vector_vlc);

2021
    /* release all frames */
2022
    if (s->golden_frame.data[0] && s->golden_frame.data[0] != s->last_frame.data[0])
2023 2024 2025 2026 2027
        avctx->release_buffer(avctx, &s->golden_frame);
    if (s->last_frame.data[0])
        avctx->release_buffer(avctx, &s->last_frame);
    /* no need to release the current_frame since it will always be pointing
     * to the same frame as either the golden or last frame */
2028 2029 2030 2031

    return 0;
}

2032 2033 2034 2035
static int read_huffman_tree(AVCodecContext *avctx, GetBitContext *gb)
{
    Vp3DecodeContext *s = avctx->priv_data;

2036
    if (get_bits1(gb)) {
2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063
        int token;
        if (s->entries >= 32) { /* overflow */
            av_log(avctx, AV_LOG_ERROR, "huffman tree overflow\n");
            return -1;
        }
        token = get_bits(gb, 5);
        //av_log(avctx, AV_LOG_DEBUG, "hti %d hbits %x token %d entry : %d size %d\n", s->hti, s->hbits, token, s->entries, s->huff_code_size);
        s->huffman_table[s->hti][token][0] = s->hbits;
        s->huffman_table[s->hti][token][1] = s->huff_code_size;
        s->entries++;
    }
    else {
        if (s->huff_code_size >= 32) {/* overflow */
            av_log(avctx, AV_LOG_ERROR, "huffman tree overflow\n");
            return -1;
        }
        s->huff_code_size++;
        s->hbits <<= 1;
        read_huffman_tree(avctx, gb);
        s->hbits |= 1;
        read_huffman_tree(avctx, gb);
        s->hbits >>= 1;
        s->huff_code_size--;
    }
    return 0;
}

2064
#ifdef CONFIG_THEORA_DECODER
2065
static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb)
2066 2067
{
    Vp3DecodeContext *s = avctx->priv_data;
2068
    int visible_width, visible_height;
2069

2070
    s->theora = get_bits_long(gb, 24);
2071
    av_log(avctx, AV_LOG_DEBUG, "Theora bitstream version %X\n", s->theora);
2072

M
Matthieu Castet 已提交
2073
    /* 3.2.0 aka alpha3 has the same frame orientation as original vp3 */
2074
    /* but previous versions have the image flipped relative to vp3 */
M
Matthieu Castet 已提交
2075
    if (s->theora < 0x030200)
2076
    {
2077
        s->flipped_image = 1;
2078 2079
        av_log(avctx, AV_LOG_DEBUG, "Old (<alpha3) Theora bitstream, flipped image\n");
    }
2080

2081 2082
    visible_width  = s->width  = get_bits(gb, 16) << 4;
    visible_height = s->height = get_bits(gb, 16) << 4;
2083

2084
    if(avcodec_check_dimensions(avctx, s->width, s->height)){
2085
        av_log(avctx, AV_LOG_ERROR, "Invalid dimensions (%dx%d)\n", s->width, s->height);
2086 2087 2088
        s->width= s->height= 0;
        return -1;
    }
2089 2090 2091

    if (s->theora >= 0x030400)
    {
2092
        skip_bits(gb, 32); /* total number of superblocks in a frame */
2093
        // fixme, the next field is 36bits long
2094 2095 2096
        skip_bits(gb, 32); /* total number of blocks in a frame */
        skip_bits(gb, 4); /* total number of blocks in a frame */
        skip_bits(gb, 32); /* total number of macroblocks in a frame */
2097
    }
2098

2099
    if (s->theora >= 0x030200) {
D
David Conrad 已提交
2100 2101
        visible_width  = get_bits_long(gb, 24);
        visible_height = get_bits_long(gb, 24);
2102

2103 2104 2105
        skip_bits(gb, 8); /* offset x */
        skip_bits(gb, 8); /* offset y */
    }
2106

2107 2108 2109 2110
    skip_bits(gb, 32); /* fps numerator */
    skip_bits(gb, 32); /* fps denumerator */
    skip_bits(gb, 24); /* aspect numerator */
    skip_bits(gb, 24); /* aspect denumerator */
2111

M
Matthieu Castet 已提交
2112
    if (s->theora < 0x030200)
2113 2114
        skip_bits(gb, 5); /* keyframe frequency force */
    skip_bits(gb, 8); /* colorspace */
2115
    if (s->theora >= 0x030400)
2116 2117
        skip_bits(gb, 2); /* pixel format: 420,res,422,444 */
    skip_bits(gb, 24); /* bitrate */
2118

2119
    skip_bits(gb, 6); /* quality hint */
2120

M
Matthieu Castet 已提交
2121
    if (s->theora >= 0x030200)
2122
    {
2123
        skip_bits(gb, 5); /* keyframe frequency force */
2124

2125
        if (s->theora < 0x030400)
2126
            skip_bits(gb, 5); /* spare bits */
2127
    }
2128

2129
//    align_get_bits(gb);
2130

2131 2132 2133 2134 2135
    if (   visible_width  <= s->width  && visible_width  > s->width-16
        && visible_height <= s->height && visible_height > s->height-16)
        avcodec_set_dimensions(avctx, visible_width, visible_height);
    else
        avcodec_set_dimensions(avctx, s->width, s->height);
2136 2137 2138 2139

    return 0;
}

2140
static int theora_decode_tables(AVCodecContext *avctx, GetBitContext *gb)
2141 2142
{
    Vp3DecodeContext *s = avctx->priv_data;
2143
    int i, n, matrices, inter, plane;
M
Matthieu Castet 已提交
2144 2145

    if (s->theora >= 0x030200) {
2146
        n = get_bits(gb, 3);
2147
        /* loop filter limit values table */
M
Matthieu Castet 已提交
2148
        for (i = 0; i < 64; i++)
2149
            s->filter_limit_values[i] = get_bits(gb, n);
M
Matthieu Castet 已提交
2150
    }
2151

M
Matthieu Castet 已提交
2152
    if (s->theora >= 0x030200)
2153
        n = get_bits(gb, 4) + 1;
M
Matthieu Castet 已提交
2154 2155
    else
        n = 16;
2156 2157
    /* quality threshold table */
    for (i = 0; i < 64; i++)
2158
        s->coded_ac_scale_factor[i] = get_bits(gb, n);
2159

M
Matthieu Castet 已提交
2160
    if (s->theora >= 0x030200)
2161
        n = get_bits(gb, 4) + 1;
M
Matthieu Castet 已提交
2162 2163
    else
        n = 16;
2164 2165
    /* dc scale factor table */
    for (i = 0; i < 64; i++)
2166
        s->coded_dc_scale_factor[i] = get_bits(gb, n);
2167

M
Matthieu Castet 已提交
2168
    if (s->theora >= 0x030200)
2169
        matrices = get_bits(gb, 9) + 1;
M
Matthieu Castet 已提交
2170
    else
2171
        matrices = 3;
2172

2173 2174 2175 2176
    if(matrices > 384){
        av_log(avctx, AV_LOG_ERROR, "invalid number of base matrixes\n");
        return -1;
    }
A
Alex Beregszaszi 已提交
2177

2178
    for(n=0; n<matrices; n++){
2179
        for (i = 0; i < 64; i++)
2180 2181
            s->base_matrix[n][i]= get_bits(gb, 8);
    }
2182

2183 2184 2185 2186
    for (inter = 0; inter <= 1; inter++) {
        for (plane = 0; plane <= 2; plane++) {
            int newqr= 1;
            if (inter || plane > 0)
2187
                newqr = get_bits1(gb);
2188
            if (!newqr) {
2189
                int qtj, plj;
2190
                if(inter && get_bits1(gb)){
2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201
                    qtj = 0;
                    plj = plane;
                }else{
                    qtj= (3*inter + plane - 1) / 3;
                    plj= (plane + 2) % 3;
                }
                s->qr_count[inter][plane]= s->qr_count[qtj][plj];
                memcpy(s->qr_size[inter][plane], s->qr_size[qtj][plj], sizeof(s->qr_size[0][0]));
                memcpy(s->qr_base[inter][plane], s->qr_base[qtj][plj], sizeof(s->qr_base[0][0]));
            } else {
                int qri= 0;
2202
                int qi = 0;
2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215

                for(;;){
                    i= get_bits(gb, av_log2(matrices-1)+1);
                    if(i>= matrices){
                        av_log(avctx, AV_LOG_ERROR, "invalid base matrix index\n");
                        return -1;
                    }
                    s->qr_base[inter][plane][qri]= i;
                    if(qi >= 63)
                        break;
                    i = get_bits(gb, av_log2(63-qi)+1) + 1;
                    s->qr_size[inter][plane][qri++]= i;
                    qi += i;
2216
                }
2217

2218
                if (qi > 63) {
2219
                    av_log(avctx, AV_LOG_ERROR, "invalid qi %d > 63\n", qi);
2220 2221
                    return -1;
                }
2222
                s->qr_count[inter][plane]= qri;
2223 2224 2225 2226
            }
        }
    }

2227
    /* Huffman tables */
2228 2229 2230
    for (s->hti = 0; s->hti < 80; s->hti++) {
        s->entries = 0;
        s->huff_code_size = 1;
2231
        if (!get_bits1(gb)) {
2232
            s->hbits = 0;
2233
            read_huffman_tree(avctx, gb);
2234
            s->hbits = 1;
2235
            read_huffman_tree(avctx, gb);
2236 2237
        }
    }
2238

2239
    s->theora_tables = 1;
2240

2241 2242 2243 2244 2245 2246 2247 2248
    return 0;
}

static int theora_decode_init(AVCodecContext *avctx)
{
    Vp3DecodeContext *s = avctx->priv_data;
    GetBitContext gb;
    int ptype;
2249 2250 2251
    uint8_t *header_start[3];
    int header_len[3];
    int i;
2252

2253 2254 2255
    s->theora = 1;

    if (!avctx->extradata_size)
2256 2257
    {
        av_log(avctx, AV_LOG_ERROR, "Missing extradata!\n");
2258
        return -1;
2259
    }
2260

2261 2262 2263 2264 2265
    if (ff_split_xiph_headers(avctx->extradata, avctx->extradata_size,
                              42, header_start, header_len) < 0) {
        av_log(avctx, AV_LOG_ERROR, "Corrupt extradata\n");
        return -1;
    }
2266

2267 2268
  for(i=0;i<3;i++) {
    init_get_bits(&gb, header_start[i], header_len[i]);
2269 2270

    ptype = get_bits(&gb, 8);
2271

2272 2273 2274
     if (!(ptype & 0x80))
     {
        av_log(avctx, AV_LOG_ERROR, "Invalid extradata!\n");
2275
//        return -1;
2276
     }
2277

2278
    // FIXME: Check for this as well.
2279
    skip_bits(&gb, 6*8); /* "theora" */
2280

2281 2282 2283
    switch(ptype)
    {
        case 0x80:
2284
            theora_decode_header(avctx, &gb);
2285 2286
                break;
        case 0x81:
2287
// FIXME: is this needed? it breaks sometimes
2288 2289 2290
//            theora_decode_comments(avctx, gb);
            break;
        case 0x82:
2291
            theora_decode_tables(avctx, &gb);
2292 2293 2294 2295
            break;
        default:
            av_log(avctx, AV_LOG_ERROR, "Unknown Theora config packet: %d\n", ptype&~0x80);
            break;
2296
    }
2297 2298
    if(ptype != 0x81 && 8*header_len[i] != get_bits_count(&gb))
        av_log(avctx, AV_LOG_WARNING, "%d bits left in packet %X\n", 8*header_len[i] - get_bits_count(&gb), ptype);
2299 2300
    if (s->theora < 0x030200)
        break;
2301
  }
2302

M
Matthieu Castet 已提交
2303
    vp3_decode_init(avctx);
2304 2305 2306
    return 0;
}

2307 2308
AVCodec theora_decoder = {
    "theora",
2309
    CODEC_TYPE_VIDEO,
2310
    CODEC_ID_THEORA,
2311
    sizeof(Vp3DecodeContext),
2312
    theora_decode_init,
2313 2314 2315 2316
    NULL,
    vp3_decode_end,
    vp3_decode_frame,
    0,
2317
    NULL,
2318
    .long_name = NULL_IF_CONFIG_SMALL("Theora"),
2319
};
2320
#endif
2321

2322 2323
AVCodec vp3_decoder = {
    "vp3",
2324
    CODEC_TYPE_VIDEO,
2325
    CODEC_ID_VP3,
2326
    sizeof(Vp3DecodeContext),
2327
    vp3_decode_init,
2328 2329 2330 2331
    NULL,
    vp3_decode_end,
    vp3_decode_frame,
    0,
2332
    NULL,
2333
    .long_name = NULL_IF_CONFIG_SMALL("On2 VP3"),
2334
};