vp3.c 82.6 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
 * @file libavcodec/vp3.c
23
 * 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
 */

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

#include "avcodec.h"
#include "dsputil.h"
38
#include "get_bits.h"
39 40

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

#define FRAGMENT_PIXELS 8

45 46
static av_cold int vp3_decode_end(AVCodecContext *avctx);

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

//FIXME split things out into their own arrays
54
typedef struct Vp3Fragment {
55
    Coeff *next_coeff;
56 57 58 59
    /* 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 */
60 61 62 63
    uint16_t macroblock;
    uint8_t coding_method;
    int8_t motion_x;
    int8_t motion_y;
64
    uint8_t qpi;
65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84
} 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 */
85
static const int ModeAlphabet[6][CODING_MODE_COUNT] =
86 87
{
    /* scheme 1: Last motion vector dominates */
88
    {    MODE_INTER_LAST_MV,    MODE_INTER_PRIOR_LAST,
89
         MODE_INTER_PLUS_MV,    MODE_INTER_NO_MV,
90
         MODE_INTRA,            MODE_USING_GOLDEN,
91 92 93
         MODE_GOLDEN_MV,        MODE_INTER_FOURMV },

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

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

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

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

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

};

#define MIN_DEQUANT_VAL 2

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

139 140 141
    int qps[3];
    int nqps;
    int last_qps[3];
142 143

    int superblock_count;
144 145 146 147
    int y_superblock_width;
    int y_superblock_height;
    int c_superblock_width;
    int c_superblock_height;
148 149 150 151 152 153 154 155 156 157 158 159 160
    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;
161
    uint8_t *coeff_counts;
162 163
    Coeff *coeffs;
    Coeff *next_coeff;
M
Michael Niedermayer 已提交
164
    int fragment_start[3];
165

M
Michael Niedermayer 已提交
166
    ScanTable scantable;
167

168 169
    /* tables */
    uint16_t coded_dc_scale_factor[64];
170
    uint32_t coded_ac_scale_factor[64];
171 172 173 174
    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];
175

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

182 183 184 185 186 187 188 189
    /* track which fragments have already been decoded; called 'fast'
     * because this data structure avoids having to iterate through every
     * fragment in coded_fragment_list; once a fragment has been fully
     * decoded, it is removed from this list */
    int *fast_fragment_list;
    int fragment_list_y_head;
    int fragment_list_c_head;

190 191 192 193 194 195
    VLC dc_vlc[16];
    VLC ac_vlc_1[16];
    VLC ac_vlc_2[16];
    VLC ac_vlc_3[16];
    VLC ac_vlc_4[16];

196 197 198 199 200
    VLC superblock_run_length_vlc;
    VLC fragment_run_length_vlc;
    VLC mode_code_vlc;
    VLC motion_vector_vlc;

201 202
    /* these arrays need to be on 16-byte boundaries since SSE2 operations
     * index into them */
203
    DECLARE_ALIGNED_16(int16_t, qmat)[3][2][3][64];     //<qmat[qpi][is_inter][plane]
204 205

    /* This table contains superblock_count * 16 entries. Each set of 16
206
     * numbers corresponds to the fragment indexes 0..15 of the superblock.
207 208 209 210 211
     * 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
212
     * numbers corresponds to the macroblock indexes 0..3 of the superblock.
213 214 215 216 217
     * 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
218
     * numbers corresponds to the fragment indexes 0..5 which comprise
219 220
     * the macroblock (4 Y fragments and 2 C fragments). */
    int *macroblock_fragments;
221
    /* This is an array that indicates how a particular macroblock
222
     * is coded. */
223
    unsigned char *macroblock_coding;
224

225 226 227 228 229
    int first_coded_y_fragment;
    int first_coded_c_fragment;
    int last_coded_y_fragment;
    int last_coded_c_fragment;

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

233 234 235 236 237 238 239
    /* Huffman decode */
    int hti;
    unsigned int hbits;
    int entries;
    int huff_code_size;
    uint16_t huffman_table[80][32][2];

240
    uint8_t filter_limit_values[64];
241
    DECLARE_ALIGNED_8(int, bounding_values_array)[256+2];
242 243 244 245 246 247 248 249 250 251
} Vp3DecodeContext;

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

/*
 * This function sets up all of the various blocks mappings:
 * superblocks <-> fragments, macroblocks <-> fragments,
 * superblocks <-> macroblocks
252 253
 *
 * Returns 0 is successful; returns 1 if *anything* went wrong.
254
 */
255
static int init_block_mapping(Vp3DecodeContext *s)
256 257 258 259 260 261 262 263 264 265 266 267 268 269 270
{
    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 mapping_index = 0;

    int current_macroblock;
    int c_fragment;

271
    static const signed char travel_width[16] = {
272
         1,  1,  0, -1,
273 274 275 276 277
         0,  0,  1,  0,
         1,  0,  1,  0,
         0, -1,  0,  1
    };

278
    static const signed char travel_height[16] = {
279 280 281 282 283 284
         0,  0,  1,  0,
         1,  1,  0, -1,
         0,  1,  0, -1,
        -1,  0, -1,  0
    };

285
    static const signed char travel_width_mb[4] = {
286 287 288
         1,  0,  1,  0
    };

289
    static const signed char travel_height_mb[4] = {
290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305
         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;
306
            current_width = -1;
307
            current_height = 0;
308
            superblock_row_inc = 3 * s->fragment_width -
309
                (s->y_superblock_width * 4 - s->fragment_width);
310 311 312 313 314 315 316 317 318

            /* 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;
319
            current_width = -1;
320
            current_height = 0;
321
            superblock_row_inc = 3 * (s->fragment_width / 2) -
322
                (s->c_superblock_width * 4 - s->fragment_width / 2);
323 324

            /* the first operation for this variable is to advance by 1 */
M
Michael Niedermayer 已提交
325
            current_fragment = s->fragment_start[1] - 1;
326 327 328 329 330 331

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

            /* start of V superblocks */
            right_edge = s->fragment_width / 2;
            bottom_edge = s->fragment_height / 2;
332
            current_width = -1;
333
            current_height = 0;
334
            superblock_row_inc = 3 * (s->fragment_width / 2) -
335
                (s->c_superblock_width * 4 - s->fragment_width / 2);
336 337

            /* the first operation for this variable is to advance by 1 */
M
Michael Niedermayer 已提交
338
            current_fragment = s->fragment_start[2] - 1;
339 340 341

        }

342
        if (current_width >= right_edge - 1) {
343
            /* reset width and move to next superblock row */
344
            current_width = -1;
345 346 347 348 349 350 351 352
            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 已提交
353
            current_fragment += travel_width[j] + right_edge * travel_height[j];
354
            current_width += travel_width[j];
355 356 357
            current_height += travel_height[j];

            /* check if the fragment is in bounds */
358
            if ((current_width < right_edge) &&
359 360 361 362 363 364 365 366 367 368 369 370 371 372
                (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;
373
    current_width = -1;
374
    current_height = 0;
375
    superblock_row_inc = s->macroblock_width -
M
Fix ;;  
Michael Niedermayer 已提交
376
        (s->y_superblock_width * 2 - s->macroblock_width);
377 378 379 380
    mapping_index = 0;
    current_macroblock = -1;
    for (i = 0; i < s->u_superblock_start; i++) {

381
        if (current_width >= right_edge - 1) {
382
            /* reset width and move to next superblock row */
383
            current_width = -1;
384 385 386 387 388 389 390 391 392
            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];
393
            current_width += travel_width_mb[j];
394 395 396
            current_height += travel_height_mb[j];

            /* check if the macroblock is in bounds */
397
            if ((current_width < right_edge) &&
398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425
                (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) {
426
                s->all_fragments[current_fragment + s->fragment_width].macroblock =
427
                    current_macroblock;
428
                s->macroblock_fragments[mapping_index++] =
429 430 431 432 433
                    current_fragment + s->fragment_width;
            } else
                s->macroblock_fragments[mapping_index++] = -1;

            if ((j + 1 < s->fragment_width) && (i + 1 < s->fragment_height)) {
434
                s->all_fragments[current_fragment + s->fragment_width + 1].macroblock =
435
                    current_macroblock;
436
                s->macroblock_fragments[mapping_index++] =
437 438 439 440 441
                    current_fragment + s->fragment_width + 1;
            } else
                s->macroblock_fragments[mapping_index++] = -1;

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

M
Michael Niedermayer 已提交
447
            c_fragment = s->fragment_start[2] +
448
                (i * s->fragment_width / 4) + (j / 2);
449
            s->all_fragments[c_fragment].macroblock = s->macroblock_count;
450 451 452 453
            s->macroblock_fragments[mapping_index++] = c_fragment;

            if (j + 2 <= s->fragment_width)
                current_fragment += 2;
454
            else
455 456 457 458 459 460
                current_fragment++;
            current_macroblock++;
        }

        current_fragment += s->fragment_width;
    }
461 462

    return 0;  /* successful path out */
463 464 465 466 467 468 469 470 471 472 473 474
}

/*
 * 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++) {
475
        s->coeff_counts[i] = 0;
476 477 478
        s->all_fragments[i].motion_x = 127;
        s->all_fragments[i].motion_y = 127;
        s->all_fragments[i].next_coeff= NULL;
479
        s->all_fragments[i].qpi = 0;
480 481 482
        s->coeffs[i].index=
        s->coeffs[i].coeff=0;
        s->coeffs[i].next= NULL;
483 484 485 486
    }
}

/*
487
 * This function sets up the dequantization tables used for a particular
488 489
 * frame.
 */
490
static void init_dequantizer(Vp3DecodeContext *s, int qpi)
491
{
492 493
    int ac_scale_factor = s->coded_ac_scale_factor[s->qps[qpi]];
    int dc_scale_factor = s->coded_dc_scale_factor[s->qps[qpi]];
494
    int i, plane, inter, qri, bmi, bmj, qistart;
495

496 497 498 499 500
    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];
501
                if(s->qps[qpi] <= sum)
502 503 504 505 506 507
                    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++){
508 509
                int coeff= (  2*(sum    -s->qps[qpi])*s->base_matrix[bmi][i]
                            - 2*(qistart-s->qps[qpi])*s->base_matrix[bmj][i]
510 511 512
                            + s->qr_size[inter][plane][qri])
                           / (2*s->qr_size[inter][plane][qri]);

M
Michael Niedermayer 已提交
513
                int qmin= 8<<(inter + !i);
514 515
                int qscale= i ? ac_scale_factor : dc_scale_factor;

516
                s->qmat[qpi][inter][plane][s->dsp.idct_permutation[i]]= av_clip((qscale * coeff)/100 * 4, qmin, 4096);
517
            }
518 519
            // all DC coefficients use the same quant so as not to interfere with DC prediction
            s->qmat[qpi][inter][plane][0] = s->qmat[0][inter][plane][0];
520
        }
521
    }
522

523
    memset(s->qscale_table, (FFMAX(s->qmat[0][0][0][1], s->qmat[0][0][1][1])+8)/16, 512); //FIXME finetune
524 525
}

526 527 528
/*
 * This function initializes the loop filter boundary limits if the frame's
 * quality index is different from the previous frame's.
529 530
 *
 * The filter_limit_values may not be larger than 127.
531 532 533 534 535 536
 */
static void init_loop_filter(Vp3DecodeContext *s)
{
    int *bounding_values= s->bounding_values_array+127;
    int filter_limit;
    int x;
537
    int value;
538

539
    filter_limit = s->filter_limit_values[s->qps[0]];
540 541 542 543 544 545 546

    /* set up the bounding values */
    memset(s->bounding_values_array, 0, 256 * sizeof(int));
    for (x = 0; x < filter_limit; x++) {
        bounding_values[-x] = -x;
        bounding_values[x] = x;
    }
547 548 549 550 551 552
    for (x = value = filter_limit; x < 128 && value; x++, value--) {
        bounding_values[ x] =  value;
        bounding_values[-x] = -value;
    }
    if (value)
        bounding_values[128] = value;
D
David Conrad 已提交
553
    bounding_values[129] = bounding_values[130] = filter_limit * 0x02020202;
554 555
}

556
/*
557
 * This function unpacks all of the superblock/macroblock/fragment coding
558 559
 * information from the bitstream.
 */
560
static int unpack_superblocks(Vp3DecodeContext *s, GetBitContext *gb)
561 562 563 564 565 566
{
    int bit = 0;
    int current_superblock = 0;
    int current_run = 0;
    int decode_fully_flags = 0;
    int decode_partial_blocks = 0;
567
    int first_c_fragment_seen;
568 569 570 571 572 573 574 575 576 577

    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 */
578
        bit = get_bits1(gb);
579
        /* toggle the bit because as soon as the first run length is
580 581 582
         * fetched the bit will be toggled again */
        bit ^= 1;
        while (current_superblock < s->superblock_count) {
583
            if (current_run-- == 0) {
584
                bit ^= 1;
585
                current_run = get_vlc2(gb,
586 587
                    s->superblock_run_length_vlc.table, 6, 2);
                if (current_run == 33)
588
                    current_run += get_bits(gb, 12);
589 590 591

                /* if any of the superblocks are not partially coded, flag
                 * a boolean to decode the list of fully-coded superblocks */
592
                if (bit == 0) {
593
                    decode_fully_flags = 1;
594
                } else {
595

596 597 598 599
                    /* make a note of the fact that there are partially coded
                     * superblocks */
                    decode_partial_blocks = 1;
                }
600
            }
601
            s->superblock_coding[current_superblock++] = bit;
602 603 604 605 606 607 608 609
        }

        /* 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;
610
            bit = get_bits1(gb);
611
            /* toggle the bit because as soon as the first run length is
612 613 614 615 616 617 618
             * 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) {

619
                    if (current_run-- == 0) {
620
                        bit ^= 1;
621
                        current_run = get_vlc2(gb,
622 623
                            s->superblock_run_length_vlc.table, 6, 2);
                        if (current_run == 33)
624
                            current_run += get_bits(gb, 12);
625
                    }
626
                    s->superblock_coding[current_superblock] = 2*bit;
627 628 629 630 631 632 633 634 635 636
                }
                current_superblock++;
            }
        }

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

            current_run = 0;
637
            bit = get_bits1(gb);
638
            /* toggle the bit because as soon as the first run length is
639 640 641 642 643 644 645 646
             * 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;
647
    s->next_coeff= s->coeffs + s->fragment_count;
648 649
    s->first_coded_y_fragment = s->first_coded_c_fragment = 0;
    s->last_coded_y_fragment = s->last_coded_c_fragment = -1;
650
    first_c_fragment_seen = 0;
651
    memset(s->macroblock_coding, MODE_COPY, s->macroblock_count);
652 653 654 655 656 657 658
    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];
659
            if (current_fragment >= s->fragment_count) {
660
                av_log(s->avctx, AV_LOG_ERROR, "  vp3:unpack_superblocks(): bad fragment number (%d >= %d)\n",
661 662 663
                    current_fragment, s->fragment_count);
                return 1;
            }
664 665 666 667
            if (current_fragment != -1) {
                if (s->superblock_coding[i] == SB_NOT_CODED) {

                    /* copy all the fragments from the prior frame */
668
                    s->all_fragments[current_fragment].coding_method =
669 670 671 672 673 674
                        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 */
675
                    if (current_run-- == 0) {
676
                        bit ^= 1;
677
                        current_run = get_vlc2(gb,
678
                            s->fragment_run_length_vlc.table, 5, 2);
679 680 681
                    }

                    if (bit) {
682
                        /* default mode; actual mode will be decoded in
683
                         * the next phase */
684
                        s->all_fragments[current_fragment].coding_method =
685
                            MODE_INTER_NO_MV;
686
                        s->all_fragments[current_fragment].next_coeff= s->coeffs + current_fragment;
687
                        s->coded_fragment_list[s->coded_fragment_list_index] =
688
                            current_fragment;
M
Michael Niedermayer 已提交
689
                        if ((current_fragment >= s->fragment_start[1]) &&
690 691
                            (s->last_coded_y_fragment == -1) &&
                            (!first_c_fragment_seen)) {
692 693
                            s->first_coded_c_fragment = s->coded_fragment_list_index;
                            s->last_coded_y_fragment = s->first_coded_c_fragment - 1;
694
                            first_c_fragment_seen = 1;
695 696
                        }
                        s->coded_fragment_list_index++;
697
                        s->macroblock_coding[s->all_fragments[current_fragment].macroblock] = MODE_INTER_NO_MV;
698 699 700 701 702 703 704 705 706 707
                    } 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 */
708
                    s->all_fragments[current_fragment].coding_method =
709
                        MODE_INTER_NO_MV;
710
                    s->all_fragments[current_fragment].next_coeff= s->coeffs + current_fragment;
711
                    s->coded_fragment_list[s->coded_fragment_list_index] =
712
                        current_fragment;
M
Michael Niedermayer 已提交
713
                    if ((current_fragment >= s->fragment_start[1]) &&
714 715
                        (s->last_coded_y_fragment == -1) &&
                        (!first_c_fragment_seen)) {
716 717
                        s->first_coded_c_fragment = s->coded_fragment_list_index;
                        s->last_coded_y_fragment = s->first_coded_c_fragment - 1;
718
                        first_c_fragment_seen = 1;
719 720
                    }
                    s->coded_fragment_list_index++;
721
                    s->macroblock_coding[s->all_fragments[current_fragment].macroblock] = MODE_INTER_NO_MV;
722 723 724 725
                }
            }
        }
    }
726

727 728
    if (!first_c_fragment_seen)
        /* only Y fragments coded in this frame */
729
        s->last_coded_y_fragment = s->coded_fragment_list_index - 1;
730
    else
731
        /* end the list of coded C fragments */
732
        s->last_coded_c_fragment = s->coded_fragment_list_index - 1;
733

734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752
    for (i = 0; i < s->fragment_count - 1; i++) {
        s->fast_fragment_list[i] = i + 1;
    }
    s->fast_fragment_list[s->fragment_count - 1] = -1;

    if (s->last_coded_y_fragment == -1)
        s->fragment_list_y_head = -1;
    else {
        s->fragment_list_y_head = s->first_coded_y_fragment;
        s->fast_fragment_list[s->last_coded_y_fragment] = -1;
    }

    if (s->last_coded_c_fragment == -1)
        s->fragment_list_c_head = -1;
    else {
        s->fragment_list_c_head = s->first_coded_c_fragment;
        s->fast_fragment_list[s->last_coded_c_fragment] = -1;
    }

753
    return 0;
754 755 756 757 758 759
}

/*
 * This function unpacks all the coding mode data for individual macroblocks
 * from the bitstream.
 */
760
static int unpack_modes(Vp3DecodeContext *s, GetBitContext *gb)
761 762 763 764 765 766
{
    int i, j, k;
    int scheme;
    int current_macroblock;
    int current_fragment;
    int coding_mode;
767
    int custom_mode_alphabet[CODING_MODE_COUNT];
768 769 770 771 772 773 774 775 776 777 778 779

    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) {
780 781
            for (i = 0; i < 8; i++)
                custom_mode_alphabet[i] = MODE_INTER_NO_MV;
782
            for (i = 0; i < 8; i++)
783
                custom_mode_alphabet[get_bits(gb, 3)] = i;
784 785 786 787 788 789 790 791 792
        }

        /* 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) ||
793
                    (s->macroblock_coding[current_macroblock] == MODE_COPY))
794
                    continue;
795
                if (current_macroblock >= s->macroblock_count) {
796
                    av_log(s->avctx, AV_LOG_ERROR, "  vp3:unpack_modes(): bad macroblock number (%d >= %d)\n",
797 798 799
                        current_macroblock, s->macroblock_count);
                    return 1;
                }
800 801 802 803

                /* mode 7 means get 3 bits for each coding mode */
                if (scheme == 7)
                    coding_mode = get_bits(gb, 3);
804 805 806
                else if(scheme == 0)
                    coding_mode = custom_mode_alphabet
                        [get_vlc2(gb, s->mode_code_vlc.table, 3, 3)];
807
                else
808
                    coding_mode = ModeAlphabet[scheme-1]
809
                        [get_vlc2(gb, s->mode_code_vlc.table, 3, 3)];
810

811
                s->macroblock_coding[current_macroblock] = coding_mode;
812
                for (k = 0; k < 6; k++) {
813
                    current_fragment =
814
                        s->macroblock_fragments[current_macroblock * 6 + k];
815 816 817
                    if (current_fragment == -1)
                        continue;
                    if (current_fragment >= s->fragment_count) {
818
                        av_log(s->avctx, AV_LOG_ERROR, "  vp3:unpack_modes(): bad fragment number (%d >= %d)\n",
819 820 821
                            current_fragment, s->fragment_count);
                        return 1;
                    }
822
                    if (s->all_fragments[current_fragment].coding_method !=
823 824 825 826 827 828 829
                        MODE_COPY)
                        s->all_fragments[current_fragment].coding_method =
                            coding_mode;
                }
            }
        }
    }
830 831

    return 0;
832 833
}

834 835 836 837
/*
 * This function unpacks all the motion vectors for the individual
 * macroblocks from the bitstream.
 */
838
static int unpack_vectors(Vp3DecodeContext *s, GetBitContext *gb)
839
{
840
    int i, j, k, l;
841 842 843 844 845 846 847 848 849 850
    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;

D
David Conrad 已提交
851
    if (s->keyframe)
852
        return 0;
D
David Conrad 已提交
853

D
David Conrad 已提交
854 855
    memset(motion_x, 0, 6 * sizeof(int));
    memset(motion_y, 0, 6 * sizeof(int));
856

D
David Conrad 已提交
857 858
    /* coding mode 0 is the VLC scheme; 1 is the fixed code scheme */
    coding_mode = get_bits1(gb);
859

D
David Conrad 已提交
860 861 862
    /* iterate through all of the macroblocks that contain 1 or more
     * coded fragments */
    for (i = 0; i < s->u_superblock_start; i++) {
863

D
David Conrad 已提交
864 865 866 867 868 869 870 871 872 873
        for (j = 0; j < 4; j++) {
            current_macroblock = s->superblock_macroblocks[i * 4 + j];
            if ((current_macroblock == -1) ||
                (s->macroblock_coding[current_macroblock] == MODE_COPY))
                continue;
            if (current_macroblock >= s->macroblock_count) {
                av_log(s->avctx, AV_LOG_ERROR, "  vp3:unpack_vectors(): bad macroblock number (%d >= %d)\n",
                    current_macroblock, s->macroblock_count);
                return 1;
            }
874

D
David Conrad 已提交
875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891
            current_fragment = s->macroblock_fragments[current_macroblock * 6];
            if (current_fragment >= s->fragment_count) {
                av_log(s->avctx, AV_LOG_ERROR, "  vp3:unpack_vectors(): bad fragment number (%d >= %d\n",
                    current_fragment, s->fragment_count);
                return 1;
            }
            switch (s->macroblock_coding[current_macroblock]) {

            case MODE_INTER_PLUS_MV:
            case MODE_GOLDEN_MV:
                /* all 6 fragments use the same motion vector */
                if (coding_mode == 0) {
                    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)];
                } else {
                    motion_x[0] = fixed_motion_vector_table[get_bits(gb, 6)];
                    motion_y[0] = fixed_motion_vector_table[get_bits(gb, 6)];
892
                }
893

D
David Conrad 已提交
894 895 896
                /* vector maintenance, only on MODE_INTER_PLUS_MV */
                if (s->macroblock_coding[current_macroblock] ==
                    MODE_INTER_PLUS_MV) {
897 898
                    prior_last_motion_x = last_motion_x;
                    prior_last_motion_y = last_motion_y;
D
David Conrad 已提交
899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919
                    last_motion_x = motion_x[0];
                    last_motion_y = motion_y[0];
                }
                break;

            case MODE_INTER_FOURMV:
                /* vector maintenance */
                prior_last_motion_x = last_motion_x;
                prior_last_motion_y = last_motion_y;

                /* 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++) {
                    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) {
                        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)];
920
                        } else {
D
David Conrad 已提交
921 922
                            motion_x[k] = fixed_motion_vector_table[get_bits(gb, 6)];
                            motion_y[k] = fixed_motion_vector_table[get_bits(gb, 6)];
923
                        }
D
David Conrad 已提交
924 925 926 927 928
                        last_motion_x = motion_x[k];
                        last_motion_y = motion_y[k];
                    } else {
                        motion_x[k] = 0;
                        motion_y[k] = 0;
929
                    }
D
David Conrad 已提交
930 931 932
                    motion_x[4] += motion_x[k];
                    motion_y[4] += motion_y[k];
                }
933

D
David Conrad 已提交
934 935 936 937 938 939 940 941 942 943
                motion_x[5]=
                motion_x[4]= RSHIFT(motion_x[4], 2);
                motion_y[5]=
                motion_y[4]= RSHIFT(motion_y[4], 2);
                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;
944

D
David Conrad 已提交
945 946 947 948 949 950 951 952 953
                /* 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;
954

D
David Conrad 已提交
955 956 957 958 959 960
                /* 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;
961

D
David Conrad 已提交
962 963
            default:
                /* covers intra, inter without MV, golden without MV */
964 965
                motion_x[0] = 0;
                motion_y[0] = 0;
966

D
David Conrad 已提交
967 968 969
                /* no vector maintenance */
                break;
            }
970

D
David Conrad 已提交
971 972 973 974 975 976 977 978 979 980
            /* assign the motion vectors to the correct fragments */
            for (k = 0; k < 6; k++) {
                current_fragment =
                    s->macroblock_fragments[current_macroblock * 6 + k];
                if (current_fragment == -1)
                    continue;
                if (current_fragment >= s->fragment_count) {
                    av_log(s->avctx, AV_LOG_ERROR, "  vp3:unpack_vectors(): bad fragment number (%d >= %d)\n",
                        current_fragment, s->fragment_count);
                    return 1;
981
                }
982
                if (s->macroblock_coding[current_macroblock] == MODE_INTER_FOURMV) {
983 984
                    s->all_fragments[current_fragment].motion_x = motion_x[k];
                    s->all_fragments[current_fragment].motion_y = motion_y[k];
985 986 987 988
                } else {
                    s->all_fragments[current_fragment].motion_x = motion_x[0];
                    s->all_fragments[current_fragment].motion_y = motion_y[0];
                }
989 990
            }
        }
D
David Conrad 已提交
991
    }
992 993

    return 0;
994 995
}

996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015
static int unpack_block_qpis(Vp3DecodeContext *s, GetBitContext *gb)
{
    int qpi, i, j, bit, run_length, blocks_decoded, num_blocks_at_qpi;
    int num_blocks = s->coded_fragment_list_index;

    for (qpi = 0; qpi < s->nqps-1 && num_blocks > 0; qpi++) {
        i = blocks_decoded = num_blocks_at_qpi = 0;

        bit = get_bits1(gb);

        do {
            run_length = get_vlc2(gb, s->superblock_run_length_vlc.table, 6, 2) + 1;
            if (run_length == 34)
                run_length += get_bits(gb, 12);
            blocks_decoded += run_length;

            if (!bit)
                num_blocks_at_qpi += run_length;

            for (j = 0; j < run_length; i++) {
1016
                if (i >= s->coded_fragment_list_index)
1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036
                    return -1;

                if (s->all_fragments[s->coded_fragment_list[i]].qpi == qpi) {
                    s->all_fragments[s->coded_fragment_list[i]].qpi += bit;
                    j++;
                }
            }

            if (run_length == 4129)
                bit = get_bits1(gb);
            else
                bit ^= 1;
        } while (blocks_decoded < num_blocks);

        num_blocks -= num_blocks_at_qpi;
    }

    return 0;
}

1037
/*
1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050
 * 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,
1051
                        int y_plane,
1052 1053 1054 1055
                        int eob_run)
{
    int i;
    int token;
1056 1057
    int zero_run = 0;
    DCTELEM coeff = 0;
1058
    Vp3Fragment *fragment;
1059
    int bits_to_get;
1060 1061 1062 1063
    int next_fragment;
    int previous_fragment;
    int fragment_num;
    int *list_head;
1064

1065 1066 1067 1068 1069 1070
    /* local references to structure members to avoid repeated deferences */
    uint8_t *perm= s->scantable.permutated;
    int *coded_fragment_list = s->coded_fragment_list;
    Vp3Fragment *all_fragments = s->all_fragments;
    uint8_t *coeff_counts = s->coeff_counts;
    VLC_TYPE (*vlc_table)[2] = table->table;
1071
    int *fast_fragment_list = s->fast_fragment_list;
1072

1073 1074 1075 1076 1077 1078
    if (y_plane) {
        next_fragment = s->fragment_list_y_head;
        list_head = &s->fragment_list_y_head;
    } else {
        next_fragment = s->fragment_list_c_head;
        list_head = &s->fragment_list_c_head;
1079 1080
    }

1081 1082 1083 1084
    i = next_fragment;
    previous_fragment = -1;  /* this indicates that the previous fragment is actually the list head */
    while (i != -1) {
        fragment_num = coded_fragment_list[i];
1085

1086 1087 1088
        if (coeff_counts[fragment_num] > coeff_index) {
            previous_fragment = i;
            i = fast_fragment_list[i];
1089
            continue;
1090
        }
1091
        fragment = &all_fragments[fragment_num];
1092 1093 1094

        if (!eob_run) {
            /* decode a VLC into a token */
1095
            token = get_vlc2(gb, vlc_table, 5, 3);
1096
            /* use the token to get a zero run, a coefficient, and an eob run */
1097 1098 1099 1100 1101 1102 1103
            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];
1104 1105 1106
                if (bits_to_get)
                    bits_to_get = get_bits(gb, bits_to_get);
                coeff = coeff_tables[token][bits_to_get];
1107 1108 1109 1110 1111

                zero_run = zero_run_base[token];
                if (zero_run_get_bits[token])
                    zero_run += get_bits(gb, zero_run_get_bits[token]);
            }
1112 1113 1114
        }

        if (!eob_run) {
1115 1116
            coeff_counts[fragment_num] += zero_run;
            if (coeff_counts[fragment_num] < 64){
1117
                fragment->next_coeff->coeff= coeff;
1118
                fragment->next_coeff->index= perm[coeff_counts[fragment_num]++]; //FIXME perm here already?
1119 1120 1121 1122
                fragment->next_coeff->next= s->next_coeff;
                s->next_coeff->next=NULL;
                fragment->next_coeff= s->next_coeff++;
            }
1123 1124
            /* previous fragment is now this fragment */
            previous_fragment = i;
1125
        } else {
1126
            coeff_counts[fragment_num] |= 128;
1127
            eob_run--;
1128 1129 1130 1131 1132 1133
            /* remove this fragment from the list */
            if (previous_fragment != -1)
                fast_fragment_list[previous_fragment] = fast_fragment_list[i];
            else
                *list_head = fast_fragment_list[i];
            /* previous fragment remains unchanged */
1134
        }
1135 1136

        i = fast_fragment_list[i];
1137 1138 1139 1140 1141
    }

    return eob_run;
}

1142 1143 1144 1145
static void reverse_dc_prediction(Vp3DecodeContext *s,
                                  int first_fragment,
                                  int fragment_width,
                                  int fragment_height);
1146 1147 1148 1149
/*
 * This function unpacks all of the DCT coefficient data from the
 * bitstream.
 */
1150
static int unpack_dct_coeffs(Vp3DecodeContext *s, GetBitContext *gb)
1151 1152 1153 1154 1155 1156 1157
{
    int i;
    int dc_y_table;
    int dc_c_table;
    int ac_y_table;
    int ac_c_table;
    int residual_eob_run = 0;
1158 1159
    VLC *y_tables[64];
    VLC *c_tables[64];
1160

1161
    /* fetch the DC table indexes */
1162 1163 1164 1165
    dc_y_table = get_bits(gb, 4);
    dc_c_table = get_bits(gb, 4);

    /* unpack the Y plane DC coefficients */
1166
    residual_eob_run = unpack_vlcs(s, gb, &s->dc_vlc[dc_y_table], 0,
1167
        1, residual_eob_run);
1168

1169 1170 1171
    /* reverse prediction of the Y-plane DC coefficients */
    reverse_dc_prediction(s, 0, s->fragment_width, s->fragment_height);

1172 1173
    /* unpack the C plane DC coefficients */
    residual_eob_run = unpack_vlcs(s, gb, &s->dc_vlc[dc_c_table], 0,
1174
        0, residual_eob_run);
1175

1176 1177 1178 1179 1180 1181 1182 1183 1184
    /* reverse prediction of the C-plane DC coefficients */
    if (!(s->avctx->flags & CODEC_FLAG_GRAY))
    {
        reverse_dc_prediction(s, s->fragment_start[1],
            s->fragment_width / 2, s->fragment_height / 2);
        reverse_dc_prediction(s, s->fragment_start[2],
            s->fragment_width / 2, s->fragment_height / 2);
    }

1185
    /* fetch the AC table indexes */
1186 1187 1188
    ac_y_table = get_bits(gb, 4);
    ac_c_table = get_bits(gb, 4);

1189
    /* build tables of AC VLC tables */
1190
    for (i = 1; i <= 5; i++) {
1191 1192
        y_tables[i] = &s->ac_vlc_1[ac_y_table];
        c_tables[i] = &s->ac_vlc_1[ac_c_table];
1193 1194
    }
    for (i = 6; i <= 14; i++) {
1195 1196
        y_tables[i] = &s->ac_vlc_2[ac_y_table];
        c_tables[i] = &s->ac_vlc_2[ac_c_table];
1197 1198
    }
    for (i = 15; i <= 27; i++) {
1199 1200
        y_tables[i] = &s->ac_vlc_3[ac_y_table];
        c_tables[i] = &s->ac_vlc_3[ac_c_table];
1201 1202
    }
    for (i = 28; i <= 63; i++) {
1203 1204 1205 1206 1207 1208 1209 1210 1211
        y_tables[i] = &s->ac_vlc_4[ac_y_table];
        c_tables[i] = &s->ac_vlc_4[ac_c_table];
    }

    /* decode all AC coefficents */
    for (i = 1; i <= 63; i++) {
        if (s->fragment_list_y_head != -1)
            residual_eob_run = unpack_vlcs(s, gb, y_tables[i], i,
                1, residual_eob_run);
1212

1213 1214 1215
        if (s->fragment_list_c_head != -1)
            residual_eob_run = unpack_vlcs(s, gb, c_tables[i], i,
                0, residual_eob_run);
1216
    }
1217 1218

    return 0;
1219 1220 1221 1222
}

/*
 * This function reverses the DC prediction for each coded fragment in
1223
 * the frame. Much of this function is adapted directly from the original
1224 1225 1226 1227
 * VP3 source code.
 */
#define COMPATIBLE_FRAME(x) \
  (compatible_frame[s->all_fragments[x].coding_method] == current_frame_type)
1228
#define DC_COEFF(u) (s->coeffs[u].index ? 0 : s->coeffs[u].coeff) //FIXME do somethin to simplify this
1229 1230 1231 1232

static void reverse_dc_prediction(Vp3DecodeContext *s,
                                  int first_fragment,
                                  int fragment_width,
1233
                                  int fragment_height)
1234 1235 1236 1237 1238 1239 1240 1241 1242 1243
{

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

    int x, y;
    int i = first_fragment;

1244
    int predicted_dc;
1245 1246 1247 1248

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

1249
    /* indexes for the left, up-left, up, and up-right fragments */
1250 1251
    int l, ul, u, ur;

1252
    /*
1253 1254 1255 1256 1257 1258
     * The 6 fields mean:
     *   0: up-left multiplier
     *   1: up multiplier
     *   2: up-right multiplier
     *   3: left multiplier
     */
1259
    static const int predictor_transform[16][4] = {
M
Michael Niedermayer 已提交
1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275
        {  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
1276 1277 1278 1279 1280
    };

    /* 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
1281
     * from other INTRA blocks. There are 2 golden frame coding types;
1282 1283
     * blocks encoding in these modes can only predict from other blocks
     * that were encoded with these 1 of these 2 modes. */
1284
    static const unsigned char compatible_frame[9] = {
1285 1286 1287 1288 1289 1290 1291
        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 */
1292 1293
        1,    /* MODE_INTER_FOUR_MV */
        3     /* MODE_COPY */
1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313
    };
    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) {

1314
                current_frame_type =
1315 1316
                    compatible_frame[s->all_fragments[i].coding_method];

M
Michael Niedermayer 已提交
1317 1318 1319
                transform= 0;
                if(x){
                    l= i-1;
1320
                    vl = DC_COEFF(l);
1321
                    if(COMPATIBLE_FRAME(l))
M
Michael Niedermayer 已提交
1322
                        transform |= PL;
M
Michael Niedermayer 已提交
1323 1324 1325
                }
                if(y){
                    u= i-fragment_width;
1326
                    vu = DC_COEFF(u);
1327
                    if(COMPATIBLE_FRAME(u))
M
Michael Niedermayer 已提交
1328
                        transform |= PU;
M
Michael Niedermayer 已提交
1329 1330 1331
                    if(x){
                        ul= i-fragment_width-1;
                        vul = DC_COEFF(ul);
1332
                        if(COMPATIBLE_FRAME(ul))
M
Michael Niedermayer 已提交
1333
                            transform |= PUL;
M
Michael Niedermayer 已提交
1334 1335 1336 1337
                    }
                    if(x + 1 < fragment_width){
                        ur= i-fragment_width+1;
                        vur = DC_COEFF(ur);
1338
                        if(COMPATIBLE_FRAME(ur))
M
Michael Niedermayer 已提交
1339
                            transform |= PUR;
M
Michael Niedermayer 已提交
1340
                    }
1341 1342 1343 1344 1345 1346
                }

                if (transform == 0) {

                    /* if there were no fragments to predict from, use last
                     * DC saved */
1347
                    predicted_dc = last_dc[current_frame_type];
1348 1349 1350 1351 1352 1353 1354 1355 1356
                } 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 已提交
1357
                    predicted_dc /= 128;
1358 1359 1360

                    /* check for outranging on the [ul u l] and
                     * [ul u ur l] predictors */
1361
                    if ((transform == 15) || (transform == 13)) {
D
Diego Biurrun 已提交
1362
                        if (FFABS(predicted_dc - vu) > 128)
1363
                            predicted_dc = vu;
D
Diego Biurrun 已提交
1364
                        else if (FFABS(predicted_dc - vl) > 128)
1365
                            predicted_dc = vl;
D
Diego Biurrun 已提交
1366
                        else if (FFABS(predicted_dc - vul) > 128)
1367 1368 1369 1370
                            predicted_dc = vul;
                    }
                }

1371 1372 1373 1374 1375 1376 1377 1378
                /* 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;
1379
                /* save the DC */
1380
                last_dc[current_frame_type] = DC_COEFF(i);
1381 1382
                if(DC_COEFF(i) && !(s->coeff_counts[i]&127)){
                    s->coeff_counts[i]= 129;
1383 1384 1385 1386
//                    s->all_fragments[i].next_coeff= s->next_coeff;
                    s->coeffs[i].next= s->next_coeff;
                    (s->next_coeff++)->next=NULL;
                }
1387 1388 1389 1390 1391
            }
        }
    }
}

1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455
static void apply_loop_filter(Vp3DecodeContext *s)
{
    int plane;
    int x, y;
    int *bounding_values= s->bounding_values_array+127;

    for (plane = 0; plane < 3; plane++) {
        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];
        if (!s->flipped_image) stride = -stride;

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

            for (x = 0; x < width; x++) {
                /* This code basically just deblocks on the edges of coded blocks.
                 * However, it has to be much more complicated because of the
                 * braindamaged deblock ordering used in VP3/Theora. Order matters
                 * because some pixels get filtered twice. */
                if( s->all_fragments[fragment].coding_method != MODE_COPY )
                {
                    /* do not perform left edge filter for left columns frags */
                    if (x > 0) {
                        s->dsp.vp3_h_loop_filter(
                            plane_data + s->all_fragments[fragment].first_pixel,
                            stride, bounding_values);
                    }

                    /* do not perform top edge filter for top row fragments */
                    if (y > 0) {
                        s->dsp.vp3_v_loop_filter(
                            plane_data + s->all_fragments[fragment].first_pixel,
                            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 + 1].coding_method == MODE_COPY)) {
                        s->dsp.vp3_h_loop_filter(
                            plane_data + s->all_fragments[fragment + 1].first_pixel,
                            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 + width].coding_method == MODE_COPY)) {
                        s->dsp.vp3_v_loop_filter(
                            plane_data + s->all_fragments[fragment + width].first_pixel,
                            stride, bounding_values);
                    }
                }

                fragment++;
            }
        }
    }
}

1456 1457 1458 1459 1460 1461
/*
 * 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 已提交
1462
    int x;
1463
    int16_t *dequantizer;
1464
    DECLARE_ALIGNED_16(DCTELEM, block)[64];
1465 1466 1467 1468 1469 1470 1471 1472 1473 1474
    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 已提交
1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485
        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;
1486

1487

D
Diego Biurrun 已提交
1488
        if(FFABS(stride) > 2048)
1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508
            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;
1509
                    else
1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546
                        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;
                        }
                    }
1547

1548 1549 1550 1551

                    /* first, take care of copying a block from either the
                     * previous or the golden frame */
                    if (s->all_fragments[i].coding_method != MODE_INTRA) {
1552 1553 1554
                        /* 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
1555 1556 1557 1558 1559 1560 1561 1562 1563
                           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,
1564 1565
                                motion_source - d,
                                motion_source + stride + 1 + d,
1566 1567
                                stride, 8);
                        }
1568
                        dequantizer = s->qmat[s->all_fragments[i].qpi][1][plane];
1569
                    }else{
1570
                        dequantizer = s->qmat[s->all_fragments[i].qpi][0][plane];
1571 1572 1573 1574 1575
                    }

                    /* dequantize the DCT coefficients */
                    if(s->avctx->idct_algo==FF_IDCT_VP3){
                        Coeff *coeff= s->coeffs + i;
L
Loren Merritt 已提交
1576
                        s->dsp.clear_block(block);
1577 1578 1579 1580 1581 1582
                        while(coeff->next){
                            block[coeff->index]= coeff->coeff * dequantizer[coeff->index];
                            coeff= coeff->next;
                        }
                    }else{
                        Coeff *coeff= s->coeffs + i;
L
Loren Merritt 已提交
1583
                        s->dsp.clear_block(block);
1584 1585 1586 1587 1588 1589 1590
                        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 */
1591

1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620
                    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);

                }
            }
        }
    }

     /* this looks like a good place for slice dispatch... */
     /* algorithm:
      *   if (slice == s->macroblock_height - 1)
1621 1622 1623
      *     dispatch (both last slice & 2nd-to-last slice);
      *   else if (slice > 0)
      *     dispatch (slice - 1);
1624 1625 1626 1627 1628
      */

    emms_c();
}

1629
/*
1630 1631 1632 1633
 * 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.
 */
1634
static void vp3_calculate_pixel_addresses(Vp3DecodeContext *s)
1635
{
1636 1637
#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
1638 1639

    int i, x, y;
1640
    const int y_inc = s->flipped_image ? 1 : -1;
1641 1642 1643 1644

    /* figure out the first pixel addresses for each of the fragments */
    /* Y plane */
    i = 0;
1645
    for (y = Y_INITIAL(0); Y_FINISHED(0); y += y_inc) {
1646
        for (x = 0; x < s->fragment_width; x++) {
1647
            s->all_fragments[i++].first_pixel =
1648 1649 1650 1651 1652 1653 1654
                s->golden_frame.linesize[0] * y * FRAGMENT_PIXELS -
                    s->golden_frame.linesize[0] +
                    x * FRAGMENT_PIXELS;
        }
    }

    /* U plane */
M
Michael Niedermayer 已提交
1655
    i = s->fragment_start[1];
1656
    for (y = Y_INITIAL(1); Y_FINISHED(1); y += y_inc) {
1657
        for (x = 0; x < s->fragment_width / 2; x++) {
1658
            s->all_fragments[i++].first_pixel =
1659 1660 1661 1662 1663 1664 1665
                s->golden_frame.linesize[1] * y * FRAGMENT_PIXELS -
                    s->golden_frame.linesize[1] +
                    x * FRAGMENT_PIXELS;
        }
    }

    /* V plane */
M
Michael Niedermayer 已提交
1666
    i = s->fragment_start[2];
1667
    for (y = Y_INITIAL(1); Y_FINISHED(1); y += y_inc) {
1668
        for (x = 0; x < s->fragment_width / 2; x++) {
1669
            s->all_fragments[i++].first_pixel =
1670 1671 1672 1673 1674 1675 1676
                s->golden_frame.linesize[2] * y * FRAGMENT_PIXELS -
                    s->golden_frame.linesize[2] +
                    x * FRAGMENT_PIXELS;
        }
    }
}

1677 1678 1679
/*
 * This is the ffmpeg/libavcodec API init function.
 */
1680
static av_cold int vp3_decode_init(AVCodecContext *avctx)
1681 1682
{
    Vp3DecodeContext *s = avctx->priv_data;
1683
    int i, inter, plane;
1684 1685 1686 1687
    int c_width;
    int c_height;
    int y_superblock_count;
    int c_superblock_count;
1688

A
Alex Beregszaszi 已提交
1689
    if (avctx->codec_tag == MKTAG('V','P','3','0'))
1690
        s->version = 0;
A
Alex Beregszaszi 已提交
1691
    else
1692
        s->version = 1;
A
Alex Beregszaszi 已提交
1693

1694
    s->avctx = avctx;
1695 1696
    s->width = FFALIGN(avctx->width, 16);
    s->height = FFALIGN(avctx->height, 16);
1697
    avctx->pix_fmt = PIX_FMT_YUV420P;
1698
    avctx->chroma_sample_location = AVCHROMA_LOC_CENTER;
1699 1700
    if(avctx->idct_algo==FF_IDCT_AUTO)
        avctx->idct_algo=FF_IDCT_VP3;
1701
    dsputil_init(&s->dsp, avctx);
1702

M
Michael Niedermayer 已提交
1703
    ff_init_scantable(s->dsp.idct_permutation, &s->scantable, ff_zigzag_direct);
1704 1705 1706

    /* initialize to an impossible value which will force a recalculation
     * in the first frame decode */
1707 1708
    for (i = 0; i < 3; i++)
        s->qps[i] = -1;
1709

1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723
    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;
1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734
    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 已提交
1735 1736
    s->fragment_start[1] = s->fragment_width * s->fragment_height;
    s->fragment_start[2] = s->fragment_width * s->fragment_height * 5 / 4;
1737 1738

    s->all_fragments = av_malloc(s->fragment_count * sizeof(Vp3Fragment));
1739
    s->coeff_counts = av_malloc(s->fragment_count * sizeof(*s->coeff_counts));
1740
    s->coeffs = av_malloc(s->fragment_count * sizeof(Coeff) * 65);
1741
    s->coded_fragment_list = av_malloc(s->fragment_count * sizeof(int));
1742
    s->fast_fragment_list = av_malloc(s->fragment_count * sizeof(int));
D
Diego Biurrun 已提交
1743
    s->pixel_addresses_initialized = 0;
1744
    if (!s->superblock_coding || !s->all_fragments || !s->coeff_counts ||
1745
        !s->coeffs || !s->coded_fragment_list || !s->fast_fragment_list) {
1746 1747 1748
        vp3_decode_end(avctx);
        return -1;
    }
1749

1750 1751
    if (!s->theora_tables)
    {
M
cleanup  
Michael Niedermayer 已提交
1752
        for (i = 0; i < 64; i++) {
1753 1754
            s->coded_dc_scale_factor[i] = vp31_dc_scale_factor[i];
            s->coded_ac_scale_factor[i] = vp31_ac_scale_factor[i];
1755 1756 1757
            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];
1758
            s->filter_limit_values[i] = vp31_filter_limit_values[i];
M
cleanup  
Michael Niedermayer 已提交
1759
        }
1760

1761 1762 1763 1764 1765 1766 1767 1768 1769
        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;
            }
        }

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 */
1802
            if (init_vlc(&s->dc_vlc[i], 5, 32,
1803
                &s->huffman_table[i][0][1], 4, 2,
1804 1805
                &s->huffman_table[i][0][0], 4, 2, 0) < 0)
                goto vlc_fail;
1806 1807

            /* group 1 AC histograms */
1808
            if (init_vlc(&s->ac_vlc_1[i], 5, 32,
1809
                &s->huffman_table[i+16][0][1], 4, 2,
1810 1811
                &s->huffman_table[i+16][0][0], 4, 2, 0) < 0)
                goto vlc_fail;
1812 1813

            /* group 2 AC histograms */
1814
            if (init_vlc(&s->ac_vlc_2[i], 5, 32,
1815
                &s->huffman_table[i+16*2][0][1], 4, 2,
1816 1817
                &s->huffman_table[i+16*2][0][0], 4, 2, 0) < 0)
                goto vlc_fail;
1818 1819

            /* group 3 AC histograms */
1820
            if (init_vlc(&s->ac_vlc_3[i], 5, 32,
1821
                &s->huffman_table[i+16*3][0][1], 4, 2,
1822 1823
                &s->huffman_table[i+16*3][0][0], 4, 2, 0) < 0)
                goto vlc_fail;
1824 1825

            /* group 4 AC histograms */
1826
            if (init_vlc(&s->ac_vlc_4[i], 5, 32,
1827
                &s->huffman_table[i+16*4][0][1], 4, 2,
1828 1829
                &s->huffman_table[i+16*4][0][0], 4, 2, 0) < 0)
                goto vlc_fail;
1830
        }
1831 1832
    }

1833 1834 1835 1836
    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);

1837
    init_vlc(&s->fragment_run_length_vlc, 5, 30,
1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848
        &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);

1849 1850 1851 1852
    /* 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));
1853
    s->macroblock_coding = av_malloc(s->macroblock_count + 1);
1854 1855 1856 1857 1858
    if (!s->superblock_fragments || !s->superblock_macroblocks ||
        !s->macroblock_fragments || !s->macroblock_coding) {
        vp3_decode_end(avctx);
        return -1;
    }
1859 1860
    init_block_mapping(s);

1861 1862 1863 1864
    for (i = 0; i < 3; i++) {
        s->current_frame.data[i] = NULL;
        s->last_frame.data[i] = NULL;
        s->golden_frame.data[i] = NULL;
1865 1866
    }

1867
    return 0;
1868 1869 1870 1871

vlc_fail:
    av_log(avctx, AV_LOG_FATAL, "Invalid huffman table\n");
    return -1;
1872 1873 1874 1875 1876
}

/*
 * This is the ffmpeg/libavcodec API frame decode function.
 */
1877
static int vp3_decode_frame(AVCodecContext *avctx,
1878
                            void *data, int *data_size,
1879
                            AVPacket *avpkt)
1880
{
1881 1882
    const uint8_t *buf = avpkt->data;
    int buf_size = avpkt->size;
1883 1884 1885
    Vp3DecodeContext *s = avctx->priv_data;
    GetBitContext gb;
    static int counter = 0;
1886
    int i;
1887 1888

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

1890 1891
    if (s->theora && get_bits1(&gb))
    {
1892 1893
        av_log(avctx, AV_LOG_ERROR, "Header packet passed to frame decoder, skipping\n");
        return -1;
1894
    }
A
Alex Beregszaszi 已提交
1895 1896 1897

    s->keyframe = !get_bits1(&gb);
    if (!s->theora)
1898
        skip_bits(&gb, 1);
1899 1900
    for (i = 0; i < 3; i++)
        s->last_qps[i] = s->qps[i];
1901

1902
    s->nqps=0;
1903
    do{
1904 1905 1906 1907
        s->qps[s->nqps++]= get_bits(&gb, 6);
    } while(s->theora >= 0x030200 && s->nqps<3 && get_bits1(&gb));
    for (i = s->nqps; i < 3; i++)
        s->qps[i] = -1;
1908

1909
    if (s->avctx->debug & FF_DEBUG_PICT_INFO)
1910
        av_log(s->avctx, AV_LOG_INFO, " VP3 %sframe #%d: Q index = %d\n",
1911
            s->keyframe?"key":"", counter, s->qps[0]);
1912 1913
    counter++;

1914
    if (s->qps[0] != s->last_qps[0])
1915
        init_loop_filter(s);
1916 1917 1918 1919 1920 1921

    for (i = 0; i < s->nqps; i++)
        // reinit all dequantizers if the first one changed, because
        // the DC of the first quantizer must be used for all matrices
        if (s->qps[i] != s->last_qps[i] || s->qps[0] != s->last_qps[0])
            init_dequantizer(s, i);
1922

1923 1924 1925
    if (avctx->skip_frame >= AVDISCARD_NONKEY && !s->keyframe)
        return buf_size;

1926
    if (s->keyframe) {
1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943
        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 已提交
1944

1945 1946 1947
        if (s->last_frame.data[0] == s->golden_frame.data[0]) {
            if (s->golden_frame.data[0])
                avctx->release_buffer(avctx, &s->golden_frame);
1948
            s->last_frame= s->golden_frame; /* ensure that we catch any access to this released frame */
1949 1950 1951 1952 1953 1954
        } 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);
        }
1955

1956
        s->golden_frame.reference = 3;
1957
        if(avctx->get_buffer(avctx, &s->golden_frame) < 0) {
1958
            av_log(s->avctx, AV_LOG_ERROR, "vp3: get_buffer() failed\n");
1959 1960 1961 1962
            return -1;
        }

        /* golden frame is also the current frame */
M
Michael Niedermayer 已提交
1963
        s->current_frame= s->golden_frame;
1964 1965

        /* time to figure out pixel addresses? */
D
Diego Biurrun 已提交
1966
        if (!s->pixel_addresses_initialized)
1967
        {
D
David Conrad 已提交
1968
            vp3_calculate_pixel_addresses(s);
D
Diego Biurrun 已提交
1969
            s->pixel_addresses_initialized = 1;
1970
        }
1971 1972
    } else {
        /* allocate a new current frame */
1973
        s->current_frame.reference = 3;
D
Diego Biurrun 已提交
1974
        if (!s->pixel_addresses_initialized) {
1975 1976 1977
            av_log(s->avctx, AV_LOG_ERROR, "vp3: first frame not a keyframe\n");
            return -1;
        }
1978
        if(avctx->get_buffer(avctx, &s->current_frame) < 0) {
1979
            av_log(s->avctx, AV_LOG_ERROR, "vp3: get_buffer() failed\n");
1980 1981 1982 1983
            return -1;
        }
    }

M
Michael Niedermayer 已提交
1984 1985 1986
    s->current_frame.qscale_table= s->qscale_table; //FIXME allocate individual tables per AVFrame
    s->current_frame.qstride= 0;

1987 1988
    init_frame(s, &gb);

M
Michael Niedermayer 已提交
1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000
    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;
    }
2001 2002 2003 2004
    if (unpack_block_qpis(s, &gb)){
        av_log(s->avctx, AV_LOG_ERROR, "error in unpack_block_qpis\n");
        return -1;
    }
M
Michael Niedermayer 已提交
2005 2006
    if (unpack_dct_coeffs(s, &gb)){
        av_log(s->avctx, AV_LOG_ERROR, "error in unpack_dct_coeffs\n");
2007 2008
        return -1;
    }
2009

2010 2011
    for (i = 0; i < s->macroblock_height; i++)
        render_slice(s, i);
2012

2013
    apply_loop_filter(s);
2014

2015 2016 2017
    *data_size=sizeof(AVFrame);
    *(AVFrame*)data= s->current_frame;

2018 2019 2020 2021 2022
    /* 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);
2023

2024
    /* shuffle frames (last = current) */
M
Michael Niedermayer 已提交
2025
    s->last_frame= s->current_frame;
2026
    s->current_frame.data[0]= NULL; /* ensure that we catch any access to this released frame */
2027 2028 2029 2030 2031 2032 2033

    return buf_size;
}

/*
 * This is the ffmpeg/libavcodec API module cleanup function.
 */
2034
static av_cold int vp3_decode_end(AVCodecContext *avctx)
2035 2036
{
    Vp3DecodeContext *s = avctx->priv_data;
2037
    int i;
2038

2039
    av_free(s->superblock_coding);
2040
    av_free(s->all_fragments);
2041
    av_free(s->coeff_counts);
2042
    av_free(s->coeffs);
2043
    av_free(s->coded_fragment_list);
2044
    av_free(s->fast_fragment_list);
2045 2046 2047
    av_free(s->superblock_fragments);
    av_free(s->superblock_macroblocks);
    av_free(s->macroblock_fragments);
2048
    av_free(s->macroblock_coding);
2049

2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062
    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);

2063
    /* release all frames */
2064
    if (s->golden_frame.data[0] && s->golden_frame.data[0] != s->last_frame.data[0])
2065 2066 2067 2068 2069
        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 */
2070 2071 2072 2073

    return 0;
}

2074 2075 2076 2077
static int read_huffman_tree(AVCodecContext *avctx, GetBitContext *gb)
{
    Vp3DecodeContext *s = avctx->priv_data;

2078
    if (get_bits1(gb)) {
2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096
        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;
2097 2098
        if (read_huffman_tree(avctx, gb))
            return -1;
2099
        s->hbits |= 1;
2100 2101
        if (read_huffman_tree(avctx, gb))
            return -1;
2102 2103 2104 2105 2106 2107
        s->hbits >>= 1;
        s->huff_code_size--;
    }
    return 0;
}

2108
#if CONFIG_THEORA_DECODER
2109
static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb)
2110 2111
{
    Vp3DecodeContext *s = avctx->priv_data;
2112
    int visible_width, visible_height, colorspace;
2113

2114
    s->theora = get_bits_long(gb, 24);
2115
    av_log(avctx, AV_LOG_DEBUG, "Theora bitstream version %X\n", s->theora);
2116

M
Matthieu Castet 已提交
2117
    /* 3.2.0 aka alpha3 has the same frame orientation as original vp3 */
2118
    /* but previous versions have the image flipped relative to vp3 */
M
Matthieu Castet 已提交
2119
    if (s->theora < 0x030200)
2120
    {
2121
        s->flipped_image = 1;
2122 2123
        av_log(avctx, AV_LOG_DEBUG, "Old (<alpha3) Theora bitstream, flipped image\n");
    }
2124

2125 2126
    visible_width  = s->width  = get_bits(gb, 16) << 4;
    visible_height = s->height = get_bits(gb, 16) << 4;
2127

2128
    if(avcodec_check_dimensions(avctx, s->width, s->height)){
2129
        av_log(avctx, AV_LOG_ERROR, "Invalid dimensions (%dx%d)\n", s->width, s->height);
2130 2131 2132
        s->width= s->height= 0;
        return -1;
    }
2133

2134
    if (s->theora >= 0x030200) {
D
David Conrad 已提交
2135 2136
        visible_width  = get_bits_long(gb, 24);
        visible_height = get_bits_long(gb, 24);
2137

2138 2139 2140
        skip_bits(gb, 8); /* offset x */
        skip_bits(gb, 8); /* offset y */
    }
2141

2142 2143 2144 2145
    skip_bits(gb, 32); /* fps numerator */
    skip_bits(gb, 32); /* fps denumerator */
    skip_bits(gb, 24); /* aspect numerator */
    skip_bits(gb, 24); /* aspect denumerator */
2146

M
Matthieu Castet 已提交
2147
    if (s->theora < 0x030200)
2148
        skip_bits(gb, 5); /* keyframe frequency force */
2149
    colorspace = get_bits(gb, 8);
2150
    skip_bits(gb, 24); /* bitrate */
2151

2152
    skip_bits(gb, 6); /* quality hint */
2153

M
Matthieu Castet 已提交
2154
    if (s->theora >= 0x030200)
2155
    {
2156
        skip_bits(gb, 5); /* keyframe frequency force */
2157 2158
        skip_bits(gb, 2); /* pixel format: 420,res,422,444 */
        skip_bits(gb, 3); /* reserved */
2159
    }
2160

2161
//    align_get_bits(gb);
2162

2163 2164 2165 2166 2167
    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);
2168

2169 2170 2171 2172 2173 2174 2175 2176 2177 2178
    if (colorspace == 1) {
        avctx->color_primaries = AVCOL_PRI_BT470M;
    } else if (colorspace == 2) {
        avctx->color_primaries = AVCOL_PRI_BT470BG;
    }
    if (colorspace == 1 || colorspace == 2) {
        avctx->colorspace = AVCOL_SPC_BT470BG;
        avctx->color_trc  = AVCOL_TRC_BT709;
    }

2179 2180 2181
    return 0;
}

2182
static int theora_decode_tables(AVCodecContext *avctx, GetBitContext *gb)
2183 2184
{
    Vp3DecodeContext *s = avctx->priv_data;
2185
    int i, n, matrices, inter, plane;
M
Matthieu Castet 已提交
2186 2187

    if (s->theora >= 0x030200) {
2188
        n = get_bits(gb, 3);
2189
        /* loop filter limit values table */
2190
        for (i = 0; i < 64; i++) {
2191
            s->filter_limit_values[i] = get_bits(gb, n);
2192 2193 2194 2195 2196
            if (s->filter_limit_values[i] > 127) {
                av_log(avctx, AV_LOG_ERROR, "filter limit value too large (%i > 127), clamping\n", s->filter_limit_values[i]);
                s->filter_limit_values[i] = 127;
            }
        }
M
Matthieu Castet 已提交
2197
    }
2198

M
Matthieu Castet 已提交
2199
    if (s->theora >= 0x030200)
2200
        n = get_bits(gb, 4) + 1;
M
Matthieu Castet 已提交
2201 2202
    else
        n = 16;
2203 2204
    /* quality threshold table */
    for (i = 0; i < 64; i++)
2205
        s->coded_ac_scale_factor[i] = get_bits(gb, n);
2206

M
Matthieu Castet 已提交
2207
    if (s->theora >= 0x030200)
2208
        n = get_bits(gb, 4) + 1;
M
Matthieu Castet 已提交
2209 2210
    else
        n = 16;
2211 2212
    /* dc scale factor table */
    for (i = 0; i < 64; i++)
2213
        s->coded_dc_scale_factor[i] = get_bits(gb, n);
2214

M
Matthieu Castet 已提交
2215
    if (s->theora >= 0x030200)
2216
        matrices = get_bits(gb, 9) + 1;
M
Matthieu Castet 已提交
2217
    else
2218
        matrices = 3;
2219

2220 2221 2222 2223
    if(matrices > 384){
        av_log(avctx, AV_LOG_ERROR, "invalid number of base matrixes\n");
        return -1;
    }
A
Alex Beregszaszi 已提交
2224

2225
    for(n=0; n<matrices; n++){
2226
        for (i = 0; i < 64; i++)
2227 2228
            s->base_matrix[n][i]= get_bits(gb, 8);
    }
2229

2230 2231 2232 2233
    for (inter = 0; inter <= 1; inter++) {
        for (plane = 0; plane <= 2; plane++) {
            int newqr= 1;
            if (inter || plane > 0)
2234
                newqr = get_bits1(gb);
2235
            if (!newqr) {
2236
                int qtj, plj;
2237
                if(inter && get_bits1(gb)){
2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248
                    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;
2249
                int qi = 0;
2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262

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

2265
                if (qi > 63) {
2266
                    av_log(avctx, AV_LOG_ERROR, "invalid qi %d > 63\n", qi);
2267 2268
                    return -1;
                }
2269
                s->qr_count[inter][plane]= qri;
2270 2271 2272 2273
            }
        }
    }

2274
    /* Huffman tables */
2275 2276 2277
    for (s->hti = 0; s->hti < 80; s->hti++) {
        s->entries = 0;
        s->huff_code_size = 1;
2278
        if (!get_bits1(gb)) {
2279
            s->hbits = 0;
2280 2281
            if(read_huffman_tree(avctx, gb))
                return -1;
2282
            s->hbits = 1;
2283 2284
            if(read_huffman_tree(avctx, gb))
                return -1;
2285 2286
        }
    }
2287

2288
    s->theora_tables = 1;
2289

2290 2291 2292
    return 0;
}

2293
static av_cold int theora_decode_init(AVCodecContext *avctx)
2294 2295 2296 2297
{
    Vp3DecodeContext *s = avctx->priv_data;
    GetBitContext gb;
    int ptype;
2298 2299 2300
    uint8_t *header_start[3];
    int header_len[3];
    int i;
2301

2302 2303 2304
    s->theora = 1;

    if (!avctx->extradata_size)
2305 2306
    {
        av_log(avctx, AV_LOG_ERROR, "Missing extradata!\n");
2307
        return -1;
2308
    }
2309

2310 2311 2312 2313 2314
    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;
    }
2315

2316
  for(i=0;i<3;i++) {
G
Google Chrome 已提交
2317
    init_get_bits(&gb, header_start[i], header_len[i] * 8);
2318 2319

    ptype = get_bits(&gb, 8);
2320

2321 2322 2323
     if (!(ptype & 0x80))
     {
        av_log(avctx, AV_LOG_ERROR, "Invalid extradata!\n");
2324
//        return -1;
2325
     }
2326

2327
    // FIXME: Check for this as well.
2328
    skip_bits_long(&gb, 6*8); /* "theora" */
2329

2330 2331 2332
    switch(ptype)
    {
        case 0x80:
2333
            theora_decode_header(avctx, &gb);
2334 2335
                break;
        case 0x81:
2336
// FIXME: is this needed? it breaks sometimes
2337 2338 2339
//            theora_decode_comments(avctx, gb);
            break;
        case 0x82:
2340 2341
            if (theora_decode_tables(avctx, &gb))
                return -1;
2342 2343 2344 2345
            break;
        default:
            av_log(avctx, AV_LOG_ERROR, "Unknown Theora config packet: %d\n", ptype&~0x80);
            break;
2346
    }
2347 2348
    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);
2349 2350
    if (s->theora < 0x030200)
        break;
2351
  }
2352

2353
    return vp3_decode_init(avctx);
2354 2355
}

2356 2357
AVCodec theora_decoder = {
    "theora",
2358
    CODEC_TYPE_VIDEO,
2359
    CODEC_ID_THEORA,
2360
    sizeof(Vp3DecodeContext),
2361
    theora_decode_init,
2362 2363 2364
    NULL,
    vp3_decode_end,
    vp3_decode_frame,
2365
    CODEC_CAP_DR1,
2366
    NULL,
2367
    .long_name = NULL_IF_CONFIG_SMALL("Theora"),
2368
};
2369
#endif
2370

2371 2372
AVCodec vp3_decoder = {
    "vp3",
2373
    CODEC_TYPE_VIDEO,
2374
    CODEC_ID_VP3,
2375
    sizeof(Vp3DecodeContext),
2376
    vp3_decode_init,
2377 2378 2379
    NULL,
    vp3_decode_end,
    vp3_decode_frame,
2380
    CODEC_CAP_DR1,
2381
    NULL,
2382
    .long_name = NULL_IF_CONFIG_SMALL("On2 VP3"),
2383
};