annotate vp3.c @ 9923:ba58c3abf832 libavcodec

Make decode_init fail if the huffman tables are invalid and thus init_vlc fails. Otherwise this will crash during decoding because the vlc tables are NULL. Partially fixes ogv/smclock.ogv.1.101.ogv from issue 1240.
author reimar
date Mon, 06 Jul 2009 09:22:39 +0000
parents ffdd1d32c40c
children 5739147b9fc0
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1 /*
1867
7f7aa6ac3723 cut over to using new VP3 DSP functions and remove the old ones; bring
melanson
parents: 1864
diff changeset
2 * Copyright (C) 2003-2004 the ffmpeg project
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
3 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3940
diff changeset
4 * This file is part of FFmpeg.
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3940
diff changeset
5 *
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3940
diff changeset
6 * FFmpeg is free software; you can redistribute it and/or
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
7 * modify it under the terms of the GNU Lesser General Public
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
8 * License as published by the Free Software Foundation; either
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3940
diff changeset
9 * version 2.1 of the License, or (at your option) any later version.
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
10 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3940
diff changeset
11 * FFmpeg is distributed in the hope that it will be useful,
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
14 * Lesser General Public License for more details.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
15 *
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
16 * You should have received a copy of the GNU Lesser General Public
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3940
diff changeset
17 * License along with FFmpeg; if not, write to the Free Software
3036
0b546eab515d Update licensing information: The FSF changed postal address.
diego
parents: 2979
diff changeset
18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
19 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
20
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
21 /**
8718
e9d9d946f213 Use full internal pathname in doxygen @file directives.
diego
parents: 8590
diff changeset
22 * @file libavcodec/vp3.c
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
23 * On2 VP3 Video Decoder
2702
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
24 *
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
25 * VP3 Video Decoder by Mike Melanson (mike at multimedia.cx)
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
26 * For more information about the VP3 coding process, visit:
6747
b9a57d71425d Add complete multimedia Wiki URL, patch by Sisir Koppaka.
diego
parents: 6710
diff changeset
27 * http://wiki.multimedia.cx/index.php?title=On2_VP3
2702
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
28 *
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
29 * Theora decoder by Alex Beregszaszi
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
30 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
31
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
32 #include <stdio.h>
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
33 #include <stdlib.h>
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
34 #include <string.h>
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
35 #include <unistd.h>
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
36
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
37 #include "avcodec.h"
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
38 #include "dsputil.h"
9428
0dce4fe6e6f3 Rename bitstream.h to get_bits.h.
stefano
parents: 9355
diff changeset
39 #include "get_bits.h"
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
40
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
41 #include "vp3data.h"
4723
b62a3a46856c use generic xiph header spliting func to split theora headers
aurel
parents: 4594
diff changeset
42 #include "xiph.h"
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
43
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
44 #define FRAGMENT_PIXELS 8
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
45
2714
b008c78467e6 use O(number of non zero coeffs) instead of O(number of coeffs) storage for the coefficient colleting/reordering
michael
parents: 2712
diff changeset
46 typedef struct Coeff {
b008c78467e6 use O(number of non zero coeffs) instead of O(number of coeffs) storage for the coefficient colleting/reordering
michael
parents: 2712
diff changeset
47 struct Coeff *next;
b008c78467e6 use O(number of non zero coeffs) instead of O(number of coeffs) storage for the coefficient colleting/reordering
michael
parents: 2712
diff changeset
48 DCTELEM coeff;
b008c78467e6 use O(number of non zero coeffs) instead of O(number of coeffs) storage for the coefficient colleting/reordering
michael
parents: 2712
diff changeset
49 uint8_t index;
b008c78467e6 use O(number of non zero coeffs) instead of O(number of coeffs) storage for the coefficient colleting/reordering
michael
parents: 2712
diff changeset
50 } Coeff;
b008c78467e6 use O(number of non zero coeffs) instead of O(number of coeffs) storage for the coefficient colleting/reordering
michael
parents: 2712
diff changeset
51
b008c78467e6 use O(number of non zero coeffs) instead of O(number of coeffs) storage for the coefficient colleting/reordering
michael
parents: 2712
diff changeset
52 //FIXME split things out into their own arrays
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
53 typedef struct Vp3Fragment {
2714
b008c78467e6 use O(number of non zero coeffs) instead of O(number of coeffs) storage for the coefficient colleting/reordering
michael
parents: 2712
diff changeset
54 Coeff *next_coeff;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
55 /* address of first pixel taking into account which plane the fragment
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
56 * lives on as well as the plane stride */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
57 int first_pixel;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
58 /* this is the macroblock that the fragment belongs to */
2706
a23c44f7ed60 reduce size of Vp3Fragment from 32byte to 16byte
michael
parents: 2705
diff changeset
59 uint16_t macroblock;
a23c44f7ed60 reduce size of Vp3Fragment from 32byte to 16byte
michael
parents: 2705
diff changeset
60 uint8_t coding_method;
a23c44f7ed60 reduce size of Vp3Fragment from 32byte to 16byte
michael
parents: 2705
diff changeset
61 int8_t motion_x;
a23c44f7ed60 reduce size of Vp3Fragment from 32byte to 16byte
michael
parents: 2705
diff changeset
62 int8_t motion_y;
9731
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
63 uint8_t qpi;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
64 } Vp3Fragment;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
65
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
66 #define SB_NOT_CODED 0
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
67 #define SB_PARTIALLY_CODED 1
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
68 #define SB_FULLY_CODED 2
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
69
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
70 #define MODE_INTER_NO_MV 0
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
71 #define MODE_INTRA 1
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
72 #define MODE_INTER_PLUS_MV 2
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
73 #define MODE_INTER_LAST_MV 3
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
74 #define MODE_INTER_PRIOR_LAST 4
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
75 #define MODE_USING_GOLDEN 5
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
76 #define MODE_GOLDEN_MV 6
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
77 #define MODE_INTER_FOURMV 7
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
78 #define CODING_MODE_COUNT 8
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
79
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
80 /* special internal mode */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
81 #define MODE_COPY 8
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
82
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
83 /* There are 6 preset schemes, plus a free-form scheme */
7139
03fe3194eff7 make ModeAlphabet read-only and use a custom mode alphabet
stefang
parents: 7040
diff changeset
84 static const int ModeAlphabet[6][CODING_MODE_COUNT] =
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
85 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
86 /* scheme 1: Last motion vector dominates */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
87 { MODE_INTER_LAST_MV, MODE_INTER_PRIOR_LAST,
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
88 MODE_INTER_PLUS_MV, MODE_INTER_NO_MV,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
89 MODE_INTRA, MODE_USING_GOLDEN,
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
90 MODE_GOLDEN_MV, MODE_INTER_FOURMV },
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
91
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
92 /* scheme 2 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
93 { MODE_INTER_LAST_MV, MODE_INTER_PRIOR_LAST,
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
94 MODE_INTER_NO_MV, MODE_INTER_PLUS_MV,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
95 MODE_INTRA, MODE_USING_GOLDEN,
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
96 MODE_GOLDEN_MV, MODE_INTER_FOURMV },
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
97
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
98 /* scheme 3 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
99 { MODE_INTER_LAST_MV, MODE_INTER_PLUS_MV,
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
100 MODE_INTER_PRIOR_LAST, MODE_INTER_NO_MV,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
101 MODE_INTRA, MODE_USING_GOLDEN,
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
102 MODE_GOLDEN_MV, MODE_INTER_FOURMV },
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
103
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
104 /* scheme 4 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
105 { MODE_INTER_LAST_MV, MODE_INTER_PLUS_MV,
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
106 MODE_INTER_NO_MV, MODE_INTER_PRIOR_LAST,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
107 MODE_INTRA, MODE_USING_GOLDEN,
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
108 MODE_GOLDEN_MV, MODE_INTER_FOURMV },
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
109
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
110 /* scheme 5: No motion vector dominates */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
111 { MODE_INTER_NO_MV, MODE_INTER_LAST_MV,
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
112 MODE_INTER_PRIOR_LAST, MODE_INTER_PLUS_MV,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
113 MODE_INTRA, MODE_USING_GOLDEN,
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
114 MODE_GOLDEN_MV, MODE_INTER_FOURMV },
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
115
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
116 /* scheme 6 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
117 { MODE_INTER_NO_MV, MODE_USING_GOLDEN,
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
118 MODE_INTER_LAST_MV, MODE_INTER_PRIOR_LAST,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
119 MODE_INTER_PLUS_MV, MODE_INTRA,
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
120 MODE_GOLDEN_MV, MODE_INTER_FOURMV },
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
121
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
122 };
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
123
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
124 #define MIN_DEQUANT_VAL 2
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
125
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
126 typedef struct Vp3DecodeContext {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
127 AVCodecContext *avctx;
1516
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
128 int theora, theora_tables;
1664
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
129 int version;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
130 int width, height;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
131 AVFrame golden_frame;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
132 AVFrame last_frame;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
133 AVFrame current_frame;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
134 int keyframe;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
135 DSPContext dsp;
1626
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
136 int flipped_image;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
137
9731
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
138 int qps[3];
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
139 int nqps;
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
140 int last_qps[3];
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
141
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
142 int superblock_count;
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
143 int y_superblock_width;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
144 int y_superblock_height;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
145 int c_superblock_width;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
146 int c_superblock_height;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
147 int u_superblock_start;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
148 int v_superblock_start;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
149 unsigned char *superblock_coding;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
150
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
151 int macroblock_count;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
152 int macroblock_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
153 int macroblock_height;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
154
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
155 int fragment_count;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
156 int fragment_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
157 int fragment_height;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
158
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
159 Vp3Fragment *all_fragments;
7037
480faa9f79dd Almost-cosmetics: split out coeff_count from all_fragments struct into
reimar
parents: 6903
diff changeset
160 uint8_t *coeff_counts;
2714
b008c78467e6 use O(number of non zero coeffs) instead of O(number of coeffs) storage for the coefficient colleting/reordering
michael
parents: 2712
diff changeset
161 Coeff *coeffs;
b008c78467e6 use O(number of non zero coeffs) instead of O(number of coeffs) storage for the coefficient colleting/reordering
michael
parents: 2712
diff changeset
162 Coeff *next_coeff;
3498
4b040103da35 simplify
michael
parents: 3497
diff changeset
163 int fragment_start[3];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
164
2694
0d229cf036b9 fix idct permutation
michael
parents: 2693
diff changeset
165 ScanTable scantable;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
166
1516
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
167 /* tables */
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
168 uint16_t coded_dc_scale_factor[64];
1867
7f7aa6ac3723 cut over to using new VP3 DSP functions and remove the old ones; bring
melanson
parents: 1864
diff changeset
169 uint32_t coded_ac_scale_factor[64];
3489
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
170 uint8_t base_matrix[384][64];
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
171 uint8_t qr_count[2][3];
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
172 uint8_t qr_size [2][3][64];
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
173 uint16_t qr_base[2][3][64];
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
174
6903
0f63fc62ea8b consistency cosmetics: indices --> indexes
diego
parents: 6747
diff changeset
175 /* this is a list of indexes into the all_fragments array indicating
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
176 * which of the fragments are coded */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
177 int *coded_fragment_list;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
178 int coded_fragment_list_index;
6350
8e63d869a904 typo fix: inited --> initialized
diego
parents: 6349
diff changeset
179 int pixel_addresses_initialized;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
180
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
181 VLC dc_vlc[16];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
182 VLC ac_vlc_1[16];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
183 VLC ac_vlc_2[16];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
184 VLC ac_vlc_3[16];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
185 VLC ac_vlc_4[16];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
186
2702
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
187 VLC superblock_run_length_vlc;
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
188 VLC fragment_run_length_vlc;
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
189 VLC mode_code_vlc;
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
190 VLC motion_vector_vlc;
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
191
1972
8a556283601d hook up support for SSE2-optimized VP3 IDCT
melanson
parents: 1867
diff changeset
192 /* these arrays need to be on 16-byte boundaries since SSE2 operations
8a556283601d hook up support for SSE2-optimized VP3 IDCT
melanson
parents: 1867
diff changeset
193 * index into them */
9731
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
194 DECLARE_ALIGNED_16(int16_t, qmat[3][2][3][64]); //<qmat[qpi][is_inter][plane]
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
195
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
196 /* This table contains superblock_count * 16 entries. Each set of 16
6903
0f63fc62ea8b consistency cosmetics: indices --> indexes
diego
parents: 6747
diff changeset
197 * numbers corresponds to the fragment indexes 0..15 of the superblock.
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
198 * An entry will be -1 to indicate that no entry corresponds to that
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
199 * index. */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
200 int *superblock_fragments;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
201
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
202 /* This table contains superblock_count * 4 entries. Each set of 4
6903
0f63fc62ea8b consistency cosmetics: indices --> indexes
diego
parents: 6747
diff changeset
203 * numbers corresponds to the macroblock indexes 0..3 of the superblock.
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
204 * An entry will be -1 to indicate that no entry corresponds to that
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
205 * index. */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
206 int *superblock_macroblocks;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
207
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
208 /* This table contains macroblock_count * 6 entries. Each set of 6
6903
0f63fc62ea8b consistency cosmetics: indices --> indexes
diego
parents: 6747
diff changeset
209 * numbers corresponds to the fragment indexes 0..5 which comprise
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
210 * the macroblock (4 Y fragments and 2 C fragments). */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
211 int *macroblock_fragments;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
212 /* This is an array that indicates how a particular macroblock
1244
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
213 * is coded. */
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
214 unsigned char *macroblock_coding;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
215
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
216 int first_coded_y_fragment;
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
217 int first_coded_c_fragment;
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
218 int last_coded_y_fragment;
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
219 int last_coded_c_fragment;
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
220
1406
ae5524a3cd08 MC rounding fixed?
michaelni
parents: 1405
diff changeset
221 uint8_t edge_emu_buffer[9*2048]; //FIXME dynamic alloc
3776
1843a85123b7 fix some signedness warnings
mru
parents: 3585
diff changeset
222 int8_t qscale_table[2048]; //FIXME dynamic alloc (width+15)/16
2718
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
223
2723
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
224 /* Huffman decode */
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
225 int hti;
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
226 unsigned int hbits;
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
227 int entries;
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
228 int huff_code_size;
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
229 uint16_t huffman_table[80][32][2];
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
230
7966
14a49e087126 filter_limit_values only needs 7 bits, make its tables smaller
conrad
parents: 7961
diff changeset
231 uint8_t filter_limit_values[64];
8032
0839f325edb5 MMX VP3 Loop Filter
conrad
parents: 8020
diff changeset
232 DECLARE_ALIGNED_8(int, bounding_values_array[256+2]);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
233 } Vp3DecodeContext;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
234
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
235 /************************************************************************
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
236 * VP3 specific functions
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
237 ************************************************************************/
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
238
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
239 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
240 * This function sets up all of the various blocks mappings:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
241 * superblocks <-> fragments, macroblocks <-> fragments,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
242 * superblocks <-> macroblocks
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
243 *
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
244 * Returns 0 is successful; returns 1 if *anything* went wrong.
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
245 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
246 static int init_block_mapping(Vp3DecodeContext *s)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
247 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
248 int i, j;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
249 signed int hilbert_walk_mb[4];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
250
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
251 int current_fragment = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
252 int current_width = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
253 int current_height = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
254 int right_edge = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
255 int bottom_edge = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
256 int superblock_row_inc = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
257 int mapping_index = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
258
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
259 int current_macroblock;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
260 int c_fragment;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
261
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
262 signed char travel_width[16] = {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
263 1, 1, 0, -1,
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
264 0, 0, 1, 0,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
265 1, 0, 1, 0,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
266 0, -1, 0, 1
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
267 };
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
268
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
269 signed char travel_height[16] = {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
270 0, 0, 1, 0,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
271 1, 1, 0, -1,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
272 0, 1, 0, -1,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
273 -1, 0, -1, 0
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
274 };
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
275
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
276 signed char travel_width_mb[4] = {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
277 1, 0, 1, 0
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
278 };
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
279
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
280 signed char travel_height_mb[4] = {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
281 0, 1, 0, -1
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
282 };
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
283
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
284 hilbert_walk_mb[0] = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
285 hilbert_walk_mb[1] = s->macroblock_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
286 hilbert_walk_mb[2] = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
287 hilbert_walk_mb[3] = -s->macroblock_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
288
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
289 /* iterate through each superblock (all planes) and map the fragments */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
290 for (i = 0; i < s->superblock_count; i++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
291 /* time to re-assign the limits? */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
292 if (i == 0) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
293
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
294 /* start of Y superblocks */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
295 right_edge = s->fragment_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
296 bottom_edge = s->fragment_height;
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
297 current_width = -1;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
298 current_height = 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
299 superblock_row_inc = 3 * s->fragment_width -
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
300 (s->y_superblock_width * 4 - s->fragment_width);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
301
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
302 /* the first operation for this variable is to advance by 1 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
303 current_fragment = -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
304
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
305 } else if (i == s->u_superblock_start) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
306
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
307 /* start of U superblocks */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
308 right_edge = s->fragment_width / 2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
309 bottom_edge = s->fragment_height / 2;
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
310 current_width = -1;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
311 current_height = 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
312 superblock_row_inc = 3 * (s->fragment_width / 2) -
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
313 (s->c_superblock_width * 4 - s->fragment_width / 2);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
314
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
315 /* the first operation for this variable is to advance by 1 */
3498
4b040103da35 simplify
michael
parents: 3497
diff changeset
316 current_fragment = s->fragment_start[1] - 1;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
317
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
318 } else if (i == s->v_superblock_start) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
319
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
320 /* start of V superblocks */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
321 right_edge = s->fragment_width / 2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
322 bottom_edge = s->fragment_height / 2;
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
323 current_width = -1;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
324 current_height = 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
325 superblock_row_inc = 3 * (s->fragment_width / 2) -
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
326 (s->c_superblock_width * 4 - s->fragment_width / 2);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
327
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
328 /* the first operation for this variable is to advance by 1 */
3498
4b040103da35 simplify
michael
parents: 3497
diff changeset
329 current_fragment = s->fragment_start[2] - 1;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
330
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
331 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
332
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
333 if (current_width >= right_edge - 1) {
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
334 /* reset width and move to next superblock row */
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
335 current_width = -1;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
336 current_height += 4;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
337
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
338 /* fragment is now at the start of a new superblock row */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
339 current_fragment += superblock_row_inc;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
340 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
341
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
342 /* iterate through all 16 fragments in a superblock */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
343 for (j = 0; j < 16; j++) {
3502
47c9a225c4d4 simplify
michael
parents: 3501
diff changeset
344 current_fragment += travel_width[j] + right_edge * travel_height[j];
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
345 current_width += travel_width[j];
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
346 current_height += travel_height[j];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
347
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
348 /* check if the fragment is in bounds */
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
349 if ((current_width < right_edge) &&
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
350 (current_height < bottom_edge)) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
351 s->superblock_fragments[mapping_index] = current_fragment;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
352 } else {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
353 s->superblock_fragments[mapping_index] = -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
354 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
355
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
356 mapping_index++;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
357 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
358 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
359
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
360 /* initialize the superblock <-> macroblock mapping; iterate through
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
361 * all of the Y plane superblocks to build this mapping */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
362 right_edge = s->macroblock_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
363 bottom_edge = s->macroblock_height;
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
364 current_width = -1;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
365 current_height = 0;
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
366 superblock_row_inc = s->macroblock_width -
6377
michael
parents: 6350
diff changeset
367 (s->y_superblock_width * 2 - s->macroblock_width);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
368 mapping_index = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
369 current_macroblock = -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
370 for (i = 0; i < s->u_superblock_start; i++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
371
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
372 if (current_width >= right_edge - 1) {
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
373 /* reset width and move to next superblock row */
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
374 current_width = -1;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
375 current_height += 2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
376
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
377 /* macroblock is now at the start of a new superblock row */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
378 current_macroblock += superblock_row_inc;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
379 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
380
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
381 /* iterate through each potential macroblock in the superblock */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
382 for (j = 0; j < 4; j++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
383 current_macroblock += hilbert_walk_mb[j];
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
384 current_width += travel_width_mb[j];
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
385 current_height += travel_height_mb[j];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
386
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
387 /* check if the macroblock is in bounds */
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
388 if ((current_width < right_edge) &&
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
389 (current_height < bottom_edge)) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
390 s->superblock_macroblocks[mapping_index] = current_macroblock;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
391 } else {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
392 s->superblock_macroblocks[mapping_index] = -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
393 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
394
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
395 mapping_index++;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
396 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
397 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
398
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
399 /* initialize the macroblock <-> fragment mapping */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
400 current_fragment = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
401 current_macroblock = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
402 mapping_index = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
403 for (i = 0; i < s->fragment_height; i += 2) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
404
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
405 for (j = 0; j < s->fragment_width; j += 2) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
406
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
407 s->all_fragments[current_fragment].macroblock = current_macroblock;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
408 s->macroblock_fragments[mapping_index++] = current_fragment;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
409
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
410 if (j + 1 < s->fragment_width) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
411 s->all_fragments[current_fragment + 1].macroblock = current_macroblock;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
412 s->macroblock_fragments[mapping_index++] = current_fragment + 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
413 } else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
414 s->macroblock_fragments[mapping_index++] = -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
415
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
416 if (i + 1 < s->fragment_height) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
417 s->all_fragments[current_fragment + s->fragment_width].macroblock =
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
418 current_macroblock;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
419 s->macroblock_fragments[mapping_index++] =
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
420 current_fragment + s->fragment_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
421 } else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
422 s->macroblock_fragments[mapping_index++] = -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
423
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
424 if ((j + 1 < s->fragment_width) && (i + 1 < s->fragment_height)) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
425 s->all_fragments[current_fragment + s->fragment_width + 1].macroblock =
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
426 current_macroblock;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
427 s->macroblock_fragments[mapping_index++] =
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
428 current_fragment + s->fragment_width + 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
429 } else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
430 s->macroblock_fragments[mapping_index++] = -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
431
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
432 /* C planes */
3498
4b040103da35 simplify
michael
parents: 3497
diff changeset
433 c_fragment = s->fragment_start[1] +
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
434 (i * s->fragment_width / 4) + (j / 2);
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
435 s->all_fragments[c_fragment].macroblock = s->macroblock_count;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
436 s->macroblock_fragments[mapping_index++] = c_fragment;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
437
3498
4b040103da35 simplify
michael
parents: 3497
diff changeset
438 c_fragment = s->fragment_start[2] +
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
439 (i * s->fragment_width / 4) + (j / 2);
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
440 s->all_fragments[c_fragment].macroblock = s->macroblock_count;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
441 s->macroblock_fragments[mapping_index++] = c_fragment;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
442
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
443 if (j + 2 <= s->fragment_width)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
444 current_fragment += 2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
445 else
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
446 current_fragment++;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
447 current_macroblock++;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
448 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
449
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
450 current_fragment += s->fragment_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
451 }
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
452
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
453 return 0; /* successful path out */
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
454 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
455
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
456 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
457 * This function wipes out all of the fragment data.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
458 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
459 static void init_frame(Vp3DecodeContext *s, GetBitContext *gb)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
460 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
461 int i;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
462
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
463 /* zero out all of the fragment information */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
464 s->coded_fragment_list_index = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
465 for (i = 0; i < s->fragment_count; i++) {
7037
480faa9f79dd Almost-cosmetics: split out coeff_count from all_fragments struct into
reimar
parents: 6903
diff changeset
466 s->coeff_counts[i] = 0;
2721
7a6db2f4e6c0 clean up some warnings and dead code
melanson
parents: 2719
diff changeset
467 s->all_fragments[i].motion_x = 127;
7a6db2f4e6c0 clean up some warnings and dead code
melanson
parents: 2719
diff changeset
468 s->all_fragments[i].motion_y = 127;
7a6db2f4e6c0 clean up some warnings and dead code
melanson
parents: 2719
diff changeset
469 s->all_fragments[i].next_coeff= NULL;
9731
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
470 s->all_fragments[i].qpi = 0;
2714
b008c78467e6 use O(number of non zero coeffs) instead of O(number of coeffs) storage for the coefficient colleting/reordering
michael
parents: 2712
diff changeset
471 s->coeffs[i].index=
b008c78467e6 use O(number of non zero coeffs) instead of O(number of coeffs) storage for the coefficient colleting/reordering
michael
parents: 2712
diff changeset
472 s->coeffs[i].coeff=0;
b008c78467e6 use O(number of non zero coeffs) instead of O(number of coeffs) storage for the coefficient colleting/reordering
michael
parents: 2712
diff changeset
473 s->coeffs[i].next= NULL;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
474 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
475 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
476
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
477 /*
2723
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
478 * This function sets up the dequantization tables used for a particular
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
479 * frame.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
480 */
9731
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
481 static void init_dequantizer(Vp3DecodeContext *s, int qpi)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
482 {
9731
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
483 int ac_scale_factor = s->coded_ac_scale_factor[s->qps[qpi]];
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
484 int dc_scale_factor = s->coded_dc_scale_factor[s->qps[qpi]];
3920
3a151ccc6ed7 Remove unused variables and the corresponding warnings along with them.
diego
parents: 3776
diff changeset
485 int i, plane, inter, qri, bmi, bmj, qistart;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
486
3489
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
487 for(inter=0; inter<2; inter++){
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
488 for(plane=0; plane<3; plane++){
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
489 int sum=0;
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
490 for(qri=0; qri<s->qr_count[inter][plane]; qri++){
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
491 sum+= s->qr_size[inter][plane][qri];
9731
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
492 if(s->qps[qpi] <= sum)
3489
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
493 break;
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
494 }
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
495 qistart= sum - s->qr_size[inter][plane][qri];
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
496 bmi= s->qr_base[inter][plane][qri ];
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
497 bmj= s->qr_base[inter][plane][qri+1];
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
498 for(i=0; i<64; i++){
9731
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
499 int coeff= ( 2*(sum -s->qps[qpi])*s->base_matrix[bmi][i]
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
500 - 2*(qistart-s->qps[qpi])*s->base_matrix[bmj][i]
3489
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
501 + s->qr_size[inter][plane][qri])
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
502 / (2*s->qr_size[inter][plane][qri]);
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
503
3491
6eadb7c9f569 100l for me
michael
parents: 3490
diff changeset
504 int qmin= 8<<(inter + !i);
3489
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
505 int qscale= i ? ac_scale_factor : dc_scale_factor;
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
506
9731
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
507 s->qmat[qpi][inter][plane][s->dsp.idct_permutation[i]]= av_clip((qscale * coeff)/100 * 4, qmin, 4096);
3489
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
508 }
9731
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
509 // all DC coefficients use the same quant so as not to interfere with DC prediction
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
510 s->qmat[qpi][inter][plane][0] = s->qmat[0][inter][plane][0];
3489
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
511 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
512 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
513
9731
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
514 memset(s->qscale_table, (FFMAX(s->qmat[0][0][0][1], s->qmat[0][0][1][1])+8)/16, 512); //FIXME finetune
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
515 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
516
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
517 /*
2723
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
518 * This function initializes the loop filter boundary limits if the frame's
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
519 * quality index is different from the previous frame's.
9921
f42402d1778b Extend init_loop_filter to work for filter limit values up to 127 instead
reimar
parents: 9811
diff changeset
520 *
f42402d1778b Extend init_loop_filter to work for filter limit values up to 127 instead
reimar
parents: 9811
diff changeset
521 * The filter_limit_values may not be larger than 127.
2723
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
522 */
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
523 static void init_loop_filter(Vp3DecodeContext *s)
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
524 {
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
525 int *bounding_values= s->bounding_values_array+127;
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
526 int filter_limit;
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
527 int x;
9921
f42402d1778b Extend init_loop_filter to work for filter limit values up to 127 instead
reimar
parents: 9811
diff changeset
528 int value;
2723
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
529
9731
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
530 filter_limit = s->filter_limit_values[s->qps[0]];
2723
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
531
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
532 /* set up the bounding values */
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
533 memset(s->bounding_values_array, 0, 256 * sizeof(int));
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
534 for (x = 0; x < filter_limit; x++) {
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
535 bounding_values[-x] = -x;
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
536 bounding_values[x] = x;
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
537 }
9921
f42402d1778b Extend init_loop_filter to work for filter limit values up to 127 instead
reimar
parents: 9811
diff changeset
538 for (x = value = filter_limit; x < 128 && value; x++, value--) {
f42402d1778b Extend init_loop_filter to work for filter limit values up to 127 instead
reimar
parents: 9811
diff changeset
539 bounding_values[ x] = value;
f42402d1778b Extend init_loop_filter to work for filter limit values up to 127 instead
reimar
parents: 9811
diff changeset
540 bounding_values[-x] = -value;
f42402d1778b Extend init_loop_filter to work for filter limit values up to 127 instead
reimar
parents: 9811
diff changeset
541 }
f42402d1778b Extend init_loop_filter to work for filter limit values up to 127 instead
reimar
parents: 9811
diff changeset
542 if (value)
f42402d1778b Extend init_loop_filter to work for filter limit values up to 127 instead
reimar
parents: 9811
diff changeset
543 bounding_values[128] = value;
8032
0839f325edb5 MMX VP3 Loop Filter
conrad
parents: 8020
diff changeset
544 bounding_values[129] = bounding_values[130] = filter_limit * 0x02020202;
2723
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
545 }
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
546
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
547 /*
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
548 * This function unpacks all of the superblock/macroblock/fragment coding
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
549 * information from the bitstream.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
550 */
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
551 static int unpack_superblocks(Vp3DecodeContext *s, GetBitContext *gb)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
552 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
553 int bit = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
554 int current_superblock = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
555 int current_run = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
556 int decode_fully_flags = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
557 int decode_partial_blocks = 0;
1272
777d4145cdfb fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents: 1244
diff changeset
558 int first_c_fragment_seen;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
559
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
560 int i, j;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
561 int current_fragment;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
562
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
563 if (s->keyframe) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
564 memset(s->superblock_coding, SB_FULLY_CODED, s->superblock_count);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
565
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
566 } else {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
567
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
568 /* unpack the list of partially-coded superblocks */
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5450
diff changeset
569 bit = get_bits1(gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
570 /* toggle the bit because as soon as the first run length is
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
571 * fetched the bit will be toggled again */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
572 bit ^= 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
573 while (current_superblock < s->superblock_count) {
2705
2f9f51297218 optimizing rle decoding loops a little
michael
parents: 2704
diff changeset
574 if (current_run-- == 0) {
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
575 bit ^= 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
576 current_run = get_vlc2(gb,
2705
2f9f51297218 optimizing rle decoding loops a little
michael
parents: 2704
diff changeset
577 s->superblock_run_length_vlc.table, 6, 2);
2f9f51297218 optimizing rle decoding loops a little
michael
parents: 2704
diff changeset
578 if (current_run == 33)
2703
3817945001ce replace get_superblock_run_length() with a VLC table
melanson
parents: 2702
diff changeset
579 current_run += get_bits(gb, 12);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
580
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
581 /* if any of the superblocks are not partially coded, flag
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
582 * a boolean to decode the list of fully-coded superblocks */
1292
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
583 if (bit == 0) {
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
584 decode_fully_flags = 1;
1292
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
585 } else {
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
586
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
587 /* make a note of the fact that there are partially coded
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
588 * superblocks */
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
589 decode_partial_blocks = 1;
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
590 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
591 }
2705
2f9f51297218 optimizing rle decoding loops a little
michael
parents: 2704
diff changeset
592 s->superblock_coding[current_superblock++] = bit;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
593 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
594
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
595 /* unpack the list of fully coded superblocks if any of the blocks were
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
596 * not marked as partially coded in the previous step */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
597 if (decode_fully_flags) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
598
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
599 current_superblock = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
600 current_run = 0;
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5450
diff changeset
601 bit = get_bits1(gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
602 /* toggle the bit because as soon as the first run length is
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
603 * fetched the bit will be toggled again */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
604 bit ^= 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
605 while (current_superblock < s->superblock_count) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
606
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
607 /* skip any superblocks already marked as partially coded */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
608 if (s->superblock_coding[current_superblock] == SB_NOT_CODED) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
609
2705
2f9f51297218 optimizing rle decoding loops a little
michael
parents: 2704
diff changeset
610 if (current_run-- == 0) {
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
611 bit ^= 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
612 current_run = get_vlc2(gb,
2705
2f9f51297218 optimizing rle decoding loops a little
michael
parents: 2704
diff changeset
613 s->superblock_run_length_vlc.table, 6, 2);
2f9f51297218 optimizing rle decoding loops a little
michael
parents: 2704
diff changeset
614 if (current_run == 33)
2703
3817945001ce replace get_superblock_run_length() with a VLC table
melanson
parents: 2702
diff changeset
615 current_run += get_bits(gb, 12);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
616 }
2705
2f9f51297218 optimizing rle decoding loops a little
michael
parents: 2704
diff changeset
617 s->superblock_coding[current_superblock] = 2*bit;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
618 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
619 current_superblock++;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
620 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
621 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
622
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
623 /* if there were partial blocks, initialize bitstream for
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
624 * unpacking fragment codings */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
625 if (decode_partial_blocks) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
626
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
627 current_run = 0;
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5450
diff changeset
628 bit = get_bits1(gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
629 /* toggle the bit because as soon as the first run length is
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
630 * fetched the bit will be toggled again */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
631 bit ^= 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
632 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
633 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
634
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
635 /* figure out which fragments are coded; iterate through each
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
636 * superblock (all planes) */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
637 s->coded_fragment_list_index = 0;
2714
b008c78467e6 use O(number of non zero coeffs) instead of O(number of coeffs) storage for the coefficient colleting/reordering
michael
parents: 2712
diff changeset
638 s->next_coeff= s->coeffs + s->fragment_count;
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
639 s->first_coded_y_fragment = s->first_coded_c_fragment = 0;
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
640 s->last_coded_y_fragment = s->last_coded_c_fragment = -1;
1272
777d4145cdfb fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents: 1244
diff changeset
641 first_c_fragment_seen = 0;
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
642 memset(s->macroblock_coding, MODE_COPY, s->macroblock_count);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
643 for (i = 0; i < s->superblock_count; i++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
644
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
645 /* iterate through all 16 fragments in a superblock */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
646 for (j = 0; j < 16; j++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
647
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
648 /* if the fragment is in bounds, check its coding status */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
649 current_fragment = s->superblock_fragments[i * 16 + j];
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
650 if (current_fragment >= s->fragment_count) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1518
diff changeset
651 av_log(s->avctx, AV_LOG_ERROR, " vp3:unpack_superblocks(): bad fragment number (%d >= %d)\n",
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
652 current_fragment, s->fragment_count);
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
653 return 1;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
654 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
655 if (current_fragment != -1) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
656 if (s->superblock_coding[i] == SB_NOT_CODED) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
657
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
658 /* copy all the fragments from the prior frame */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
659 s->all_fragments[current_fragment].coding_method =
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
660 MODE_COPY;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
661
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
662 } else if (s->superblock_coding[i] == SB_PARTIALLY_CODED) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
663
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
664 /* fragment may or may not be coded; this is the case
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
665 * that cares about the fragment coding runs */
2705
2f9f51297218 optimizing rle decoding loops a little
michael
parents: 2704
diff changeset
666 if (current_run-- == 0) {
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
667 bit ^= 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
668 current_run = get_vlc2(gb,
2705
2f9f51297218 optimizing rle decoding loops a little
michael
parents: 2704
diff changeset
669 s->fragment_run_length_vlc.table, 5, 2);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
670 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
671
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
672 if (bit) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
673 /* default mode; actual mode will be decoded in
1272
777d4145cdfb fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents: 1244
diff changeset
674 * the next phase */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
675 s->all_fragments[current_fragment].coding_method =
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
676 MODE_INTER_NO_MV;
2714
b008c78467e6 use O(number of non zero coeffs) instead of O(number of coeffs) storage for the coefficient colleting/reordering
michael
parents: 2712
diff changeset
677 s->all_fragments[current_fragment].next_coeff= s->coeffs + current_fragment;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
678 s->coded_fragment_list[s->coded_fragment_list_index] =
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
679 current_fragment;
3498
4b040103da35 simplify
michael
parents: 3497
diff changeset
680 if ((current_fragment >= s->fragment_start[1]) &&
1272
777d4145cdfb fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents: 1244
diff changeset
681 (s->last_coded_y_fragment == -1) &&
777d4145cdfb fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents: 1244
diff changeset
682 (!first_c_fragment_seen)) {
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
683 s->first_coded_c_fragment = s->coded_fragment_list_index;
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
684 s->last_coded_y_fragment = s->first_coded_c_fragment - 1;
1272
777d4145cdfb fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents: 1244
diff changeset
685 first_c_fragment_seen = 1;
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
686 }
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
687 s->coded_fragment_list_index++;
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
688 s->macroblock_coding[s->all_fragments[current_fragment].macroblock] = MODE_INTER_NO_MV;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
689 } else {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
690 /* not coded; copy this fragment from the prior frame */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
691 s->all_fragments[current_fragment].coding_method =
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
692 MODE_COPY;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
693 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
694
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
695 } else {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
696
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
697 /* fragments are fully coded in this superblock; actual
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
698 * coding will be determined in next step */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
699 s->all_fragments[current_fragment].coding_method =
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
700 MODE_INTER_NO_MV;
2714
b008c78467e6 use O(number of non zero coeffs) instead of O(number of coeffs) storage for the coefficient colleting/reordering
michael
parents: 2712
diff changeset
701 s->all_fragments[current_fragment].next_coeff= s->coeffs + current_fragment;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
702 s->coded_fragment_list[s->coded_fragment_list_index] =
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
703 current_fragment;
3498
4b040103da35 simplify
michael
parents: 3497
diff changeset
704 if ((current_fragment >= s->fragment_start[1]) &&
1272
777d4145cdfb fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents: 1244
diff changeset
705 (s->last_coded_y_fragment == -1) &&
777d4145cdfb fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents: 1244
diff changeset
706 (!first_c_fragment_seen)) {
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
707 s->first_coded_c_fragment = s->coded_fragment_list_index;
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
708 s->last_coded_y_fragment = s->first_coded_c_fragment - 1;
1272
777d4145cdfb fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents: 1244
diff changeset
709 first_c_fragment_seen = 1;
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
710 }
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
711 s->coded_fragment_list_index++;
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
712 s->macroblock_coding[s->all_fragments[current_fragment].macroblock] = MODE_INTER_NO_MV;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
713 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
714 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
715 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
716 }
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
717
1272
777d4145cdfb fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents: 1244
diff changeset
718 if (!first_c_fragment_seen)
777d4145cdfb fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents: 1244
diff changeset
719 /* only Y fragments coded in this frame */
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
720 s->last_coded_y_fragment = s->coded_fragment_list_index - 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
721 else
1292
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
722 /* end the list of coded C fragments */
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
723 s->last_coded_c_fragment = s->coded_fragment_list_index - 1;
1272
777d4145cdfb fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents: 1244
diff changeset
724
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
725 return 0;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
726 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
727
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
728 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
729 * This function unpacks all the coding mode data for individual macroblocks
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
730 * from the bitstream.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
731 */
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
732 static int unpack_modes(Vp3DecodeContext *s, GetBitContext *gb)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
733 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
734 int i, j, k;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
735 int scheme;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
736 int current_macroblock;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
737 int current_fragment;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
738 int coding_mode;
7139
03fe3194eff7 make ModeAlphabet read-only and use a custom mode alphabet
stefang
parents: 7040
diff changeset
739 int custom_mode_alphabet[CODING_MODE_COUNT];
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
740
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
741 if (s->keyframe) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
742 for (i = 0; i < s->fragment_count; i++)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
743 s->all_fragments[i].coding_method = MODE_INTRA;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
744
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
745 } else {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
746
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
747 /* fetch the mode coding scheme for this frame */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
748 scheme = get_bits(gb, 3);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
749
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
750 /* is it a custom coding scheme? */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
751 if (scheme == 0) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
752 for (i = 0; i < 8; i++)
8736
f973fff63599 VP3: Prevent stack corruption from an unset custom coding method.
alexc
parents: 8718
diff changeset
753 custom_mode_alphabet[i] = MODE_INTER_NO_MV;
f973fff63599 VP3: Prevent stack corruption from an unset custom coding method.
alexc
parents: 8718
diff changeset
754 for (i = 0; i < 8; i++)
7139
03fe3194eff7 make ModeAlphabet read-only and use a custom mode alphabet
stefang
parents: 7040
diff changeset
755 custom_mode_alphabet[get_bits(gb, 3)] = i;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
756 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
757
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
758 /* iterate through all of the macroblocks that contain 1 or more
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
759 * coded fragments */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
760 for (i = 0; i < s->u_superblock_start; i++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
761
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
762 for (j = 0; j < 4; j++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
763 current_macroblock = s->superblock_macroblocks[i * 4 + j];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
764 if ((current_macroblock == -1) ||
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
765 (s->macroblock_coding[current_macroblock] == MODE_COPY))
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
766 continue;
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
767 if (current_macroblock >= s->macroblock_count) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1518
diff changeset
768 av_log(s->avctx, AV_LOG_ERROR, " vp3:unpack_modes(): bad macroblock number (%d >= %d)\n",
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
769 current_macroblock, s->macroblock_count);
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
770 return 1;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
771 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
772
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
773 /* mode 7 means get 3 bits for each coding mode */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
774 if (scheme == 7)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
775 coding_mode = get_bits(gb, 3);
7139
03fe3194eff7 make ModeAlphabet read-only and use a custom mode alphabet
stefang
parents: 7040
diff changeset
776 else if(scheme == 0)
03fe3194eff7 make ModeAlphabet read-only and use a custom mode alphabet
stefang
parents: 7040
diff changeset
777 coding_mode = custom_mode_alphabet
03fe3194eff7 make ModeAlphabet read-only and use a custom mode alphabet
stefang
parents: 7040
diff changeset
778 [get_vlc2(gb, s->mode_code_vlc.table, 3, 3)];
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
779 else
7139
03fe3194eff7 make ModeAlphabet read-only and use a custom mode alphabet
stefang
parents: 7040
diff changeset
780 coding_mode = ModeAlphabet[scheme-1]
2702
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
781 [get_vlc2(gb, s->mode_code_vlc.table, 3, 3)];
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
782
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
783 s->macroblock_coding[current_macroblock] = coding_mode;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
784 for (k = 0; k < 6; k++) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
785 current_fragment =
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
786 s->macroblock_fragments[current_macroblock * 6 + k];
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
787 if (current_fragment == -1)
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
788 continue;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
789 if (current_fragment >= s->fragment_count) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1518
diff changeset
790 av_log(s->avctx, AV_LOG_ERROR, " vp3:unpack_modes(): bad fragment number (%d >= %d)\n",
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
791 current_fragment, s->fragment_count);
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
792 return 1;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
793 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
794 if (s->all_fragments[current_fragment].coding_method !=
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
795 MODE_COPY)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
796 s->all_fragments[current_fragment].coding_method =
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
797 coding_mode;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
798 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
799 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
800 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
801 }
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
802
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
803 return 0;
1229
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
804 }
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
805
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
806 /*
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
807 * This function unpacks all the motion vectors for the individual
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
808 * macroblocks from the bitstream.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
809 */
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
810 static int unpack_vectors(Vp3DecodeContext *s, GetBitContext *gb)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
811 {
7778
e31b0b920475 theoradec: skip decoding of uncoded MV in 4MV code
aurel
parents: 7777
diff changeset
812 int i, j, k, l;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
813 int coding_mode;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
814 int motion_x[6];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
815 int motion_y[6];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
816 int last_motion_x = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
817 int last_motion_y = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
818 int prior_last_motion_x = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
819 int prior_last_motion_y = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
820 int current_macroblock;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
821 int current_fragment;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
822
7970
b579f2f9919b Unneeded braces
conrad
parents: 7969
diff changeset
823 if (s->keyframe)
7969
47a22f0850a7 Return if unpacking motion vectors for a keyframe
conrad
parents: 7968
diff changeset
824 return 0;
7971
2d93e4e1358b Unneeded else
conrad
parents: 7970
diff changeset
825
7972
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
826 memset(motion_x, 0, 6 * sizeof(int));
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
827 memset(motion_y, 0, 6 * sizeof(int));
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
828
7972
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
829 /* coding mode 0 is the VLC scheme; 1 is the fixed code scheme */
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
830 coding_mode = get_bits1(gb);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
831
7972
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
832 /* iterate through all of the macroblocks that contain 1 or more
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
833 * coded fragments */
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
834 for (i = 0; i < s->u_superblock_start; i++) {
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
835
7972
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
836 for (j = 0; j < 4; j++) {
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
837 current_macroblock = s->superblock_macroblocks[i * 4 + j];
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
838 if ((current_macroblock == -1) ||
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
839 (s->macroblock_coding[current_macroblock] == MODE_COPY))
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
840 continue;
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
841 if (current_macroblock >= s->macroblock_count) {
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
842 av_log(s->avctx, AV_LOG_ERROR, " vp3:unpack_vectors(): bad macroblock number (%d >= %d)\n",
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
843 current_macroblock, s->macroblock_count);
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
844 return 1;
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
845 }
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
846
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
847 current_fragment = s->macroblock_fragments[current_macroblock * 6];
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
848 if (current_fragment >= s->fragment_count) {
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
849 av_log(s->avctx, AV_LOG_ERROR, " vp3:unpack_vectors(): bad fragment number (%d >= %d\n",
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
850 current_fragment, s->fragment_count);
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
851 return 1;
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
852 }
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
853 switch (s->macroblock_coding[current_macroblock]) {
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
854
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
855 case MODE_INTER_PLUS_MV:
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
856 case MODE_GOLDEN_MV:
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
857 /* all 6 fragments use the same motion vector */
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
858 if (coding_mode == 0) {
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
859 motion_x[0] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)];
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
860 motion_y[0] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)];
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
861 } else {
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
862 motion_x[0] = fixed_motion_vector_table[get_bits(gb, 6)];
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
863 motion_y[0] = fixed_motion_vector_table[get_bits(gb, 6)];
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
864 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
865
7972
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
866 for (k = 1; k < 6; k++) {
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
867 motion_x[k] = motion_x[0];
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
868 motion_y[k] = motion_y[0];
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
869 }
7777
8002605f6aaf theoradec: small 4MV code reorganization to ease future improvements
aurel
parents: 7139
diff changeset
870
7972
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
871 /* vector maintenance, only on MODE_INTER_PLUS_MV */
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
872 if (s->macroblock_coding[current_macroblock] ==
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
873 MODE_INTER_PLUS_MV) {
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
874 prior_last_motion_x = last_motion_x;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
875 prior_last_motion_y = last_motion_y;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
876 last_motion_x = motion_x[0];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
877 last_motion_y = motion_y[0];
7972
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
878 }
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
879 break;
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
880
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
881 case MODE_INTER_FOURMV:
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
882 /* vector maintenance */
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
883 prior_last_motion_x = last_motion_x;
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
884 prior_last_motion_y = last_motion_y;
1229
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
885
7972
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
886 /* fetch 4 vectors from the bitstream, one for each
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
887 * Y fragment, then average for the C fragment vectors */
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
888 motion_x[4] = motion_y[4] = 0;
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
889 for (k = 0; k < 4; k++) {
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
890 for (l = 0; l < s->coded_fragment_list_index; l++)
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
891 if (s->coded_fragment_list[l] == s->macroblock_fragments[6*current_macroblock + k])
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
892 break;
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
893 if (l < s->coded_fragment_list_index) {
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
894 if (coding_mode == 0) {
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
895 motion_x[k] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)];
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
896 motion_y[k] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)];
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
897 } else {
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
898 motion_x[k] = fixed_motion_vector_table[get_bits(gb, 6)];
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
899 motion_y[k] = fixed_motion_vector_table[get_bits(gb, 6)];
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
900 }
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
901 last_motion_x = motion_x[k];
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
902 last_motion_y = motion_y[k];
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
903 } else {
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
904 motion_x[k] = 0;
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
905 motion_y[k] = 0;
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
906 }
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
907 motion_x[4] += motion_x[k];
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
908 motion_y[4] += motion_y[k];
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
909 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
910
7972
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
911 motion_x[5]=
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
912 motion_x[4]= RSHIFT(motion_x[4], 2);
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
913 motion_y[5]=
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
914 motion_y[4]= RSHIFT(motion_y[4], 2);
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
915 break;
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
916
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
917 case MODE_INTER_LAST_MV:
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
918 /* all 6 fragments use the last motion vector */
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
919 motion_x[0] = last_motion_x;
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
920 motion_y[0] = last_motion_y;
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
921 for (k = 1; k < 6; k++) {
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
922 motion_x[k] = motion_x[0];
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
923 motion_y[k] = motion_y[0];
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
924 }
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
925
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
926 /* no vector maintenance (last vector remains the
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
927 * last vector) */
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
928 break;
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
929
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
930 case MODE_INTER_PRIOR_LAST:
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
931 /* all 6 fragments use the motion vector prior to the
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
932 * last motion vector */
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
933 motion_x[0] = prior_last_motion_x;
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
934 motion_y[0] = prior_last_motion_y;
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
935 for (k = 1; k < 6; k++) {
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
936 motion_x[k] = motion_x[0];
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
937 motion_y[k] = motion_y[0];
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
938 }
7972
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
939
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
940 /* vector maintenance */
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
941 prior_last_motion_x = last_motion_x;
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
942 prior_last_motion_y = last_motion_y;
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
943 last_motion_x = motion_x[0];
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
944 last_motion_y = motion_y[0];
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
945 break;
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
946
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
947 default:
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
948 /* covers intra, inter without MV, golden without MV */
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
949 memset(motion_x, 0, 6 * sizeof(int));
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
950 memset(motion_y, 0, 6 * sizeof(int));
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
951
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
952 /* no vector maintenance */
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
953 break;
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
954 }
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
955
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
956 /* assign the motion vectors to the correct fragments */
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
957 for (k = 0; k < 6; k++) {
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
958 current_fragment =
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
959 s->macroblock_fragments[current_macroblock * 6 + k];
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
960 if (current_fragment == -1)
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
961 continue;
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
962 if (current_fragment >= s->fragment_count) {
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
963 av_log(s->avctx, AV_LOG_ERROR, " vp3:unpack_vectors(): bad fragment number (%d >= %d)\n",
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
964 current_fragment, s->fragment_count);
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
965 return 1;
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
966 }
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
967 s->all_fragments[current_fragment].motion_x = motion_x[k];
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
968 s->all_fragments[current_fragment].motion_y = motion_y[k];
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
969 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
970 }
7972
6cf217dad67d Cosmetics: reindent
conrad
parents: 7971
diff changeset
971 }
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
972
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
973 return 0;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
974 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
975
9731
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
976 static int unpack_block_qpis(Vp3DecodeContext *s, GetBitContext *gb)
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
977 {
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
978 int qpi, i, j, bit, run_length, blocks_decoded, num_blocks_at_qpi;
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
979 int num_blocks = s->coded_fragment_list_index;
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
980
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
981 for (qpi = 0; qpi < s->nqps-1 && num_blocks > 0; qpi++) {
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
982 i = blocks_decoded = num_blocks_at_qpi = 0;
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
983
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
984 bit = get_bits1(gb);
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
985
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
986 do {
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
987 run_length = get_vlc2(gb, s->superblock_run_length_vlc.table, 6, 2) + 1;
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
988 if (run_length == 34)
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
989 run_length += get_bits(gb, 12);
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
990 blocks_decoded += run_length;
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
991
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
992 if (!bit)
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
993 num_blocks_at_qpi += run_length;
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
994
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
995 for (j = 0; j < run_length; i++) {
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
996 if (i > s->coded_fragment_list_index)
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
997 return -1;
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
998
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
999 if (s->all_fragments[s->coded_fragment_list[i]].qpi == qpi) {
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
1000 s->all_fragments[s->coded_fragment_list[i]].qpi += bit;
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
1001 j++;
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
1002 }
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
1003 }
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
1004
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
1005 if (run_length == 4129)
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
1006 bit = get_bits1(gb);
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
1007 else
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
1008 bit ^= 1;
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
1009 } while (blocks_decoded < num_blocks);
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
1010
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
1011 num_blocks -= num_blocks_at_qpi;
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
1012 }
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
1013
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
1014 return 0;
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
1015 }
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
1016
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1017 /*
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1018 * This function is called by unpack_dct_coeffs() to extract the VLCs from
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1019 * the bitstream. The VLCs encode tokens which are used to unpack DCT
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1020 * data. This function unpacks all the VLCs for either the Y plane or both
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1021 * C planes, and is called for DC coefficients or different AC coefficient
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1022 * levels (since different coefficient types require different VLC tables.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1023 *
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1024 * This function returns a residual eob run. E.g, if a particular token gave
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1025 * instructions to EOB the next 5 fragments and there were only 2 fragments
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1026 * left in the current fragment range, 3 would be returned so that it could
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1027 * be passed into the next call to this same function.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1028 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1029 static int unpack_vlcs(Vp3DecodeContext *s, GetBitContext *gb,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1030 VLC *table, int coeff_index,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1031 int first_fragment, int last_fragment,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1032 int eob_run)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1033 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1034 int i;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1035 int token;
2712
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1036 int zero_run = 0;
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1037 DCTELEM coeff = 0;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1038 Vp3Fragment *fragment;
2694
0d229cf036b9 fix idct permutation
michael
parents: 2693
diff changeset
1039 uint8_t *perm= s->scantable.permutated;
2712
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1040 int bits_to_get;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1041
1272
777d4145cdfb fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents: 1244
diff changeset
1042 if ((first_fragment >= s->fragment_count) ||
1244
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
1043 (last_fragment >= s->fragment_count)) {
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
1044
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1518
diff changeset
1045 av_log(s->avctx, AV_LOG_ERROR, " vp3:unpack_vlcs(): bad fragment number (%d -> %d ?)\n",
1244
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
1046 first_fragment, last_fragment);
1272
777d4145cdfb fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents: 1244
diff changeset
1047 return 0;
1244
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
1048 }
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
1049
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1050 for (i = first_fragment; i <= last_fragment; i++) {
7037
480faa9f79dd Almost-cosmetics: split out coeff_count from all_fragments struct into
reimar
parents: 6903
diff changeset
1051 int fragment_num = s->coded_fragment_list[i];
480faa9f79dd Almost-cosmetics: split out coeff_count from all_fragments struct into
reimar
parents: 6903
diff changeset
1052
480faa9f79dd Almost-cosmetics: split out coeff_count from all_fragments struct into
reimar
parents: 6903
diff changeset
1053 if (s->coeff_counts[fragment_num] > coeff_index)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1054 continue;
7037
480faa9f79dd Almost-cosmetics: split out coeff_count from all_fragments struct into
reimar
parents: 6903
diff changeset
1055 fragment = &s->all_fragments[fragment_num];
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1056
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1057 if (!eob_run) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1058 /* decode a VLC into a token */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1059 token = get_vlc2(gb, table->table, 5, 3);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1060 /* use the token to get a zero run, a coefficient, and an eob run */
2712
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1061 if (token <= 6) {
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1062 eob_run = eob_run_base[token];
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1063 if (eob_run_get_bits[token])
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1064 eob_run += get_bits(gb, eob_run_get_bits[token]);
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1065 coeff = zero_run = 0;
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1066 } else {
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1067 bits_to_get = coeff_get_bits[token];
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1068 if (!bits_to_get)
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1069 coeff = coeff_tables[token][0];
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1070 else
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1071 coeff = coeff_tables[token][get_bits(gb, bits_to_get)];
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1072
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1073 zero_run = zero_run_base[token];
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1074 if (zero_run_get_bits[token])
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1075 zero_run += get_bits(gb, zero_run_get_bits[token]);
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1076 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1077 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1078
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1079 if (!eob_run) {
7037
480faa9f79dd Almost-cosmetics: split out coeff_count from all_fragments struct into
reimar
parents: 6903
diff changeset
1080 s->coeff_counts[fragment_num] += zero_run;
480faa9f79dd Almost-cosmetics: split out coeff_count from all_fragments struct into
reimar
parents: 6903
diff changeset
1081 if (s->coeff_counts[fragment_num] < 64){
2714
b008c78467e6 use O(number of non zero coeffs) instead of O(number of coeffs) storage for the coefficient colleting/reordering
michael
parents: 2712
diff changeset
1082 fragment->next_coeff->coeff= coeff;
7037
480faa9f79dd Almost-cosmetics: split out coeff_count from all_fragments struct into
reimar
parents: 6903
diff changeset
1083 fragment->next_coeff->index= perm[s->coeff_counts[fragment_num]++]; //FIXME perm here already?
2714
b008c78467e6 use O(number of non zero coeffs) instead of O(number of coeffs) storage for the coefficient colleting/reordering
michael
parents: 2712
diff changeset
1084 fragment->next_coeff->next= s->next_coeff;
b008c78467e6 use O(number of non zero coeffs) instead of O(number of coeffs) storage for the coefficient colleting/reordering
michael
parents: 2712
diff changeset
1085 s->next_coeff->next=NULL;
b008c78467e6 use O(number of non zero coeffs) instead of O(number of coeffs) storage for the coefficient colleting/reordering
michael
parents: 2712
diff changeset
1086 fragment->next_coeff= s->next_coeff++;
b008c78467e6 use O(number of non zero coeffs) instead of O(number of coeffs) storage for the coefficient colleting/reordering
michael
parents: 2712
diff changeset
1087 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1088 } else {
7037
480faa9f79dd Almost-cosmetics: split out coeff_count from all_fragments struct into
reimar
parents: 6903
diff changeset
1089 s->coeff_counts[fragment_num] |= 128;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1090 eob_run--;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1091 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1092 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1093
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1094 return eob_run;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1095 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1096
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1097 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1098 * This function unpacks all of the DCT coefficient data from the
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1099 * bitstream.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1100 */
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1101 static int unpack_dct_coeffs(Vp3DecodeContext *s, GetBitContext *gb)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1102 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1103 int i;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1104 int dc_y_table;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1105 int dc_c_table;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1106 int ac_y_table;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1107 int ac_c_table;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1108 int residual_eob_run = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1109
6903
0f63fc62ea8b consistency cosmetics: indices --> indexes
diego
parents: 6747
diff changeset
1110 /* fetch the DC table indexes */
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1111 dc_y_table = get_bits(gb, 4);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1112 dc_c_table = get_bits(gb, 4);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1113
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1114 /* unpack the Y plane DC coefficients */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1115 residual_eob_run = unpack_vlcs(s, gb, &s->dc_vlc[dc_y_table], 0,
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1116 s->first_coded_y_fragment, s->last_coded_y_fragment, residual_eob_run);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1117
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1118 /* unpack the C plane DC coefficients */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1119 residual_eob_run = unpack_vlcs(s, gb, &s->dc_vlc[dc_c_table], 0,
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1120 s->first_coded_c_fragment, s->last_coded_c_fragment, residual_eob_run);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1121
6903
0f63fc62ea8b consistency cosmetics: indices --> indexes
diego
parents: 6747
diff changeset
1122 /* fetch the AC table indexes */
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1123 ac_y_table = get_bits(gb, 4);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1124 ac_c_table = get_bits(gb, 4);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1125
1233
5d66713e97e2 correct the custom coding mode alphabet, add some validation on the
tmmm
parents: 1230
diff changeset
1126 /* unpack the group 1 AC coefficients (coeffs 1-5) */
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1127 for (i = 1; i <= 5; i++) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1128 residual_eob_run = unpack_vlcs(s, gb, &s->ac_vlc_1[ac_y_table], i,
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1129 s->first_coded_y_fragment, s->last_coded_y_fragment, residual_eob_run);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1130
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1131 residual_eob_run = unpack_vlcs(s, gb, &s->ac_vlc_1[ac_c_table], i,
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1132 s->first_coded_c_fragment, s->last_coded_c_fragment, residual_eob_run);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1133 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1134
1233
5d66713e97e2 correct the custom coding mode alphabet, add some validation on the
tmmm
parents: 1230
diff changeset
1135 /* unpack the group 2 AC coefficients (coeffs 6-14) */
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1136 for (i = 6; i <= 14; i++) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1137 residual_eob_run = unpack_vlcs(s, gb, &s->ac_vlc_2[ac_y_table], i,
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1138 s->first_coded_y_fragment, s->last_coded_y_fragment, residual_eob_run);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1139
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1140 residual_eob_run = unpack_vlcs(s, gb, &s->ac_vlc_2[ac_c_table], i,
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1141 s->first_coded_c_fragment, s->last_coded_c_fragment, residual_eob_run);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1142 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1143
1233
5d66713e97e2 correct the custom coding mode alphabet, add some validation on the
tmmm
parents: 1230
diff changeset
1144 /* unpack the group 3 AC coefficients (coeffs 15-27) */
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1145 for (i = 15; i <= 27; i++) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1146 residual_eob_run = unpack_vlcs(s, gb, &s->ac_vlc_3[ac_y_table], i,
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1147 s->first_coded_y_fragment, s->last_coded_y_fragment, residual_eob_run);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1148
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1149 residual_eob_run = unpack_vlcs(s, gb, &s->ac_vlc_3[ac_c_table], i,
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1150 s->first_coded_c_fragment, s->last_coded_c_fragment, residual_eob_run);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1151 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1152
1233
5d66713e97e2 correct the custom coding mode alphabet, add some validation on the
tmmm
parents: 1230
diff changeset
1153 /* unpack the group 4 AC coefficients (coeffs 28-63) */
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1154 for (i = 28; i <= 63; i++) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1155 residual_eob_run = unpack_vlcs(s, gb, &s->ac_vlc_4[ac_y_table], i,
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1156 s->first_coded_y_fragment, s->last_coded_y_fragment, residual_eob_run);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1157
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1158 residual_eob_run = unpack_vlcs(s, gb, &s->ac_vlc_4[ac_c_table], i,
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1159 s->first_coded_c_fragment, s->last_coded_c_fragment, residual_eob_run);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1160 }
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1161
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1162 return 0;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1163 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1164
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1165 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1166 * This function reverses the DC prediction for each coded fragment in
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1167 * the frame. Much of this function is adapted directly from the original
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1168 * VP3 source code.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1169 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1170 #define COMPATIBLE_FRAME(x) \
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1171 (compatible_frame[s->all_fragments[x].coding_method] == current_frame_type)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1172 #define FRAME_CODED(x) (s->all_fragments[x].coding_method != MODE_COPY)
2714
b008c78467e6 use O(number of non zero coeffs) instead of O(number of coeffs) storage for the coefficient colleting/reordering
michael
parents: 2712
diff changeset
1173 #define DC_COEFF(u) (s->coeffs[u].index ? 0 : s->coeffs[u].coeff) //FIXME do somethin to simplify this
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1174
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1175 static void reverse_dc_prediction(Vp3DecodeContext *s,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1176 int first_fragment,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1177 int fragment_width,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1178 int fragment_height)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1179 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1180
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1181 #define PUL 8
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1182 #define PU 4
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1183 #define PUR 2
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1184 #define PL 1
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1185
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1186 int x, y;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1187 int i = first_fragment;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1188
3940
706df96b36a1 fix decoding of ED-small-sample-file.ogg
michael
parents: 3920
diff changeset
1189 int predicted_dc;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1190
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1191 /* DC values for the left, up-left, up, and up-right fragments */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1192 int vl, vul, vu, vur;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1193
6903
0f63fc62ea8b consistency cosmetics: indices --> indexes
diego
parents: 6747
diff changeset
1194 /* indexes for the left, up-left, up, and up-right fragments */
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1195 int l, ul, u, ur;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1196
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1197 /*
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1198 * The 6 fields mean:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1199 * 0: up-left multiplier
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1200 * 1: up multiplier
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1201 * 2: up-right multiplier
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1202 * 3: left multiplier
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1203 */
3501
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1204 int predictor_transform[16][4] = {
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1205 { 0, 0, 0, 0},
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1206 { 0, 0, 0,128}, // PL
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1207 { 0, 0,128, 0}, // PUR
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1208 { 0, 0, 53, 75}, // PUR|PL
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1209 { 0,128, 0, 0}, // PU
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1210 { 0, 64, 0, 64}, // PU|PL
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1211 { 0,128, 0, 0}, // PU|PUR
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1212 { 0, 0, 53, 75}, // PU|PUR|PL
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1213 {128, 0, 0, 0}, // PUL
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1214 { 0, 0, 0,128}, // PUL|PL
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1215 { 64, 0, 64, 0}, // PUL|PUR
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1216 { 0, 0, 53, 75}, // PUL|PUR|PL
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1217 { 0,128, 0, 0}, // PUL|PU
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1218 {-104,116, 0,116}, // PUL|PU|PL
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1219 { 24, 80, 24, 0}, // PUL|PU|PUR
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1220 {-104,116, 0,116} // PUL|PU|PUR|PL
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1221 };
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1222
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1223 /* This table shows which types of blocks can use other blocks for
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1224 * prediction. For example, INTRA is the only mode in this table to
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1225 * have a frame number of 0. That means INTRA blocks can only predict
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1226 * from other INTRA blocks. There are 2 golden frame coding types;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1227 * blocks encoding in these modes can only predict from other blocks
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1228 * that were encoded with these 1 of these 2 modes. */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1229 unsigned char compatible_frame[8] = {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1230 1, /* MODE_INTER_NO_MV */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1231 0, /* MODE_INTRA */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1232 1, /* MODE_INTER_PLUS_MV */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1233 1, /* MODE_INTER_LAST_MV */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1234 1, /* MODE_INTER_PRIOR_MV */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1235 2, /* MODE_USING_GOLDEN */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1236 2, /* MODE_GOLDEN_MV */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1237 1 /* MODE_INTER_FOUR_MV */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1238 };
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1239 int current_frame_type;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1240
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1241 /* there is a last DC predictor for each of the 3 frame types */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1242 short last_dc[3];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1243
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1244 int transform = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1245
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1246 vul = vu = vur = vl = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1247 last_dc[0] = last_dc[1] = last_dc[2] = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1248
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1249 /* for each fragment row... */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1250 for (y = 0; y < fragment_height; y++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1251
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1252 /* for each fragment in a row... */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1253 for (x = 0; x < fragment_width; x++, i++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1254
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1255 /* reverse prediction if this block was coded */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1256 if (s->all_fragments[i].coding_method != MODE_COPY) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1257
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1258 current_frame_type =
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1259 compatible_frame[s->all_fragments[i].coding_method];
3500
2ff5efa33e3a simplification
michael
parents: 3499
diff changeset
1260
2ff5efa33e3a simplification
michael
parents: 3499
diff changeset
1261 transform= 0;
2ff5efa33e3a simplification
michael
parents: 3499
diff changeset
1262 if(x){
2ff5efa33e3a simplification
michael
parents: 3499
diff changeset
1263 l= i-1;
2714
b008c78467e6 use O(number of non zero coeffs) instead of O(number of coeffs) storage for the coefficient colleting/reordering
michael
parents: 2712
diff changeset
1264 vl = DC_COEFF(l);
3501
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1265 if(FRAME_CODED(l) && COMPATIBLE_FRAME(l))
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1266 transform |= PL;
3500
2ff5efa33e3a simplification
michael
parents: 3499
diff changeset
1267 }
2ff5efa33e3a simplification
michael
parents: 3499
diff changeset
1268 if(y){
2ff5efa33e3a simplification
michael
parents: 3499
diff changeset
1269 u= i-fragment_width;
2714
b008c78467e6 use O(number of non zero coeffs) instead of O(number of coeffs) storage for the coefficient colleting/reordering
michael
parents: 2712
diff changeset
1270 vu = DC_COEFF(u);
3501
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1271 if(FRAME_CODED(u) && COMPATIBLE_FRAME(u))
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1272 transform |= PU;
3500
2ff5efa33e3a simplification
michael
parents: 3499
diff changeset
1273 if(x){
2ff5efa33e3a simplification
michael
parents: 3499
diff changeset
1274 ul= i-fragment_width-1;
2ff5efa33e3a simplification
michael
parents: 3499
diff changeset
1275 vul = DC_COEFF(ul);
3501
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1276 if(FRAME_CODED(ul) && COMPATIBLE_FRAME(ul))
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1277 transform |= PUL;
3500
2ff5efa33e3a simplification
michael
parents: 3499
diff changeset
1278 }
2ff5efa33e3a simplification
michael
parents: 3499
diff changeset
1279 if(x + 1 < fragment_width){
2ff5efa33e3a simplification
michael
parents: 3499
diff changeset
1280 ur= i-fragment_width+1;
2ff5efa33e3a simplification
michael
parents: 3499
diff changeset
1281 vur = DC_COEFF(ur);
3501
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1282 if(FRAME_CODED(ur) && COMPATIBLE_FRAME(ur))
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1283 transform |= PUR;
3500
2ff5efa33e3a simplification
michael
parents: 3499
diff changeset
1284 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1285 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1286
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1287 if (transform == 0) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1288
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1289 /* if there were no fragments to predict from, use last
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1290 * DC saved */
2714
b008c78467e6 use O(number of non zero coeffs) instead of O(number of coeffs) storage for the coefficient colleting/reordering
michael
parents: 2712
diff changeset
1291 predicted_dc = last_dc[current_frame_type];
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1292 } else {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1293
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1294 /* apply the appropriate predictor transform */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1295 predicted_dc =
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1296 (predictor_transform[transform][0] * vul) +
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1297 (predictor_transform[transform][1] * vu) +
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1298 (predictor_transform[transform][2] * vur) +
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1299 (predictor_transform[transform][3] * vl);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1300
3502
47c9a225c4d4 simplify
michael
parents: 3501
diff changeset
1301 predicted_dc /= 128;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1302
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1303 /* check for outranging on the [ul u l] and
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1304 * [ul u ur l] predictors */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1305 if ((transform == 13) || (transform == 15)) {
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1306 if (FFABS(predicted_dc - vu) > 128)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1307 predicted_dc = vu;
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1308 else if (FFABS(predicted_dc - vl) > 128)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1309 predicted_dc = vl;
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1310 else if (FFABS(predicted_dc - vul) > 128)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1311 predicted_dc = vul;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1312 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1313 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1314
2714
b008c78467e6 use O(number of non zero coeffs) instead of O(number of coeffs) storage for the coefficient colleting/reordering
michael
parents: 2712
diff changeset
1315 /* at long last, apply the predictor */
b008c78467e6 use O(number of non zero coeffs) instead of O(number of coeffs) storage for the coefficient colleting/reordering
michael
parents: 2712
diff changeset
1316 if(s->coeffs[i].index){
b008c78467e6 use O(number of non zero coeffs) instead of O(number of coeffs) storage for the coefficient colleting/reordering
michael
parents: 2712
diff changeset
1317 *s->next_coeff= s->coeffs[i];
b008c78467e6 use O(number of non zero coeffs) instead of O(number of coeffs) storage for the coefficient colleting/reordering
michael
parents: 2712
diff changeset
1318 s->coeffs[i].index=0;
b008c78467e6 use O(number of non zero coeffs) instead of O(number of coeffs) storage for the coefficient colleting/reordering
michael
parents: 2712
diff changeset
1319 s->coeffs[i].coeff=0;
b008c78467e6 use O(number of non zero coeffs) instead of O(number of coeffs) storage for the coefficient colleting/reordering
michael
parents: 2712
diff changeset
1320 s->coeffs[i].next= s->next_coeff++;
b008c78467e6 use O(number of non zero coeffs) instead of O(number of coeffs) storage for the coefficient colleting/reordering
michael
parents: 2712
diff changeset
1321 }
b008c78467e6 use O(number of non zero coeffs) instead of O(number of coeffs) storage for the coefficient colleting/reordering
michael
parents: 2712
diff changeset
1322 s->coeffs[i].coeff += predicted_dc;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1323 /* save the DC */
2714
b008c78467e6 use O(number of non zero coeffs) instead of O(number of coeffs) storage for the coefficient colleting/reordering
michael
parents: 2712
diff changeset
1324 last_dc[current_frame_type] = DC_COEFF(i);
7037
480faa9f79dd Almost-cosmetics: split out coeff_count from all_fragments struct into
reimar
parents: 6903
diff changeset
1325 if(DC_COEFF(i) && !(s->coeff_counts[i]&127)){
480faa9f79dd Almost-cosmetics: split out coeff_count from all_fragments struct into
reimar
parents: 6903
diff changeset
1326 s->coeff_counts[i]= 129;
2714
b008c78467e6 use O(number of non zero coeffs) instead of O(number of coeffs) storage for the coefficient colleting/reordering
michael
parents: 2712
diff changeset
1327 // s->all_fragments[i].next_coeff= s->next_coeff;
b008c78467e6 use O(number of non zero coeffs) instead of O(number of coeffs) storage for the coefficient colleting/reordering
michael
parents: 2712
diff changeset
1328 s->coeffs[i].next= s->next_coeff;
b008c78467e6 use O(number of non zero coeffs) instead of O(number of coeffs) storage for the coefficient colleting/reordering
michael
parents: 2712
diff changeset
1329 (s->next_coeff++)->next=NULL;
b008c78467e6 use O(number of non zero coeffs) instead of O(number of coeffs) storage for the coefficient colleting/reordering
michael
parents: 2712
diff changeset
1330 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1331 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1332 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1333 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1334 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1335
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1336 /*
2722
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1337 * Perform the final rendering for a particular slice of data.
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1338 * The slice number ranges from 0..(macroblock_height - 1).
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1339 */
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1340 static void render_slice(Vp3DecodeContext *s, int slice)
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1341 {
3498
4b040103da35 simplify
michael
parents: 3497
diff changeset
1342 int x;
2722
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1343 int16_t *dequantizer;
3089
072dbc669253 MSVC-compatible __align8/__align16 declaration
diego
parents: 3036
diff changeset
1344 DECLARE_ALIGNED_16(DCTELEM, block[64]);
2722
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1345 int motion_x = 0xdeadbeef, motion_y = 0xdeadbeef;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1346 int motion_halfpel_index;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1347 uint8_t *motion_source;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1348 int plane;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1349 int current_macroblock_entry = slice * s->macroblock_width * 6;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1350
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1351 if (slice >= s->macroblock_height)
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1352 return;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1353
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1354 for (plane = 0; plane < 3; plane++) {
3498
4b040103da35 simplify
michael
parents: 3497
diff changeset
1355 uint8_t *output_plane = s->current_frame.data [plane];
4b040103da35 simplify
michael
parents: 3497
diff changeset
1356 uint8_t * last_plane = s-> last_frame.data [plane];
4b040103da35 simplify
michael
parents: 3497
diff changeset
1357 uint8_t *golden_plane = s-> golden_frame.data [plane];
4b040103da35 simplify
michael
parents: 3497
diff changeset
1358 int stride = s->current_frame.linesize[plane];
4b040103da35 simplify
michael
parents: 3497
diff changeset
1359 int plane_width = s->width >> !!plane;
4b040103da35 simplify
michael
parents: 3497
diff changeset
1360 int plane_height = s->height >> !!plane;
4b040103da35 simplify
michael
parents: 3497
diff changeset
1361 int y = slice * FRAGMENT_PIXELS << !plane ;
4b040103da35 simplify
michael
parents: 3497
diff changeset
1362 int slice_height = y + (FRAGMENT_PIXELS << !plane);
4b040103da35 simplify
michael
parents: 3497
diff changeset
1363 int i = s->macroblock_fragments[current_macroblock_entry + plane + 3*!!plane];
4b040103da35 simplify
michael
parents: 3497
diff changeset
1364
4b040103da35 simplify
michael
parents: 3497
diff changeset
1365 if (!s->flipped_image) stride = -stride;
4b040103da35 simplify
michael
parents: 3497
diff changeset
1366
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1367
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1368 if(FFABS(stride) > 2048)
2722
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1369 return; //various tables are fixed size
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1370
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1371 /* for each fragment row in the slice (both of them)... */
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1372 for (; y < slice_height; y += 8) {
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1373
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1374 /* for each fragment in a row... */
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1375 for (x = 0; x < plane_width; x += 8, i++) {
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1376
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1377 if ((i < 0) || (i >= s->fragment_count)) {
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1378 av_log(s->avctx, AV_LOG_ERROR, " vp3:render_slice(): bad fragment number (%d)\n", i);
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1379 return;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1380 }
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1381
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1382 /* transform if this block was coded */
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1383 if ((s->all_fragments[i].coding_method != MODE_COPY) &&
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1384 !((s->avctx->flags & CODEC_FLAG_GRAY) && plane)) {
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1385
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1386 if ((s->all_fragments[i].coding_method == MODE_USING_GOLDEN) ||
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1387 (s->all_fragments[i].coding_method == MODE_GOLDEN_MV))
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1388 motion_source= golden_plane;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1389 else
2722
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1390 motion_source= last_plane;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1391
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1392 motion_source += s->all_fragments[i].first_pixel;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1393 motion_halfpel_index = 0;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1394
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1395 /* sort out the motion vector if this fragment is coded
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1396 * using a motion vector method */
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1397 if ((s->all_fragments[i].coding_method > MODE_INTRA) &&
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1398 (s->all_fragments[i].coding_method != MODE_USING_GOLDEN)) {
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1399 int src_x, src_y;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1400 motion_x = s->all_fragments[i].motion_x;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1401 motion_y = s->all_fragments[i].motion_y;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1402 if(plane){
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1403 motion_x= (motion_x>>1) | (motion_x&1);
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1404 motion_y= (motion_y>>1) | (motion_y&1);
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1405 }
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1406
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1407 src_x= (motion_x>>1) + x;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1408 src_y= (motion_y>>1) + y;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1409 if ((motion_x == 127) || (motion_y == 127))
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1410 av_log(s->avctx, AV_LOG_ERROR, " help! got invalid motion vector! (%X, %X)\n", motion_x, motion_y);
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1411
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1412 motion_halfpel_index = motion_x & 0x01;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1413 motion_source += (motion_x >> 1);
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1414
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1415 motion_halfpel_index |= (motion_y & 0x01) << 1;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1416 motion_source += ((motion_y >> 1) * stride);
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1417
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1418 if(src_x<0 || src_y<0 || src_x + 9 >= plane_width || src_y + 9 >= plane_height){
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1419 uint8_t *temp= s->edge_emu_buffer;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1420 if(stride<0) temp -= 9*stride;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1421 else temp += 9*stride;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1422
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1423 ff_emulated_edge_mc(temp, motion_source, stride, 9, 9, src_x, src_y, plane_width, plane_height);
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1424 motion_source= temp;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1425 }
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1426 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1427
2722
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1428
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1429 /* first, take care of copying a block from either the
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1430 * previous or the golden frame */
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1431 if (s->all_fragments[i].coding_method != MODE_INTRA) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1432 /* Note, it is possible to implement all MC cases with
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1433 put_no_rnd_pixels_l2 which would look more like the
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1434 VP3 source but this would be slower as
2722
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1435 put_no_rnd_pixels_tab is better optimzed */
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1436 if(motion_halfpel_index != 3){
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1437 s->dsp.put_no_rnd_pixels_tab[1][motion_halfpel_index](
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1438 output_plane + s->all_fragments[i].first_pixel,
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1439 motion_source, stride, 8);
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1440 }else{
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1441 int d= (motion_x ^ motion_y)>>31; // d is 0 if motion_x and _y have the same sign, else -1
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1442 s->dsp.put_no_rnd_pixels_l2[1](
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1443 output_plane + s->all_fragments[i].first_pixel,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1444 motion_source - d,
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1445 motion_source + stride + 1 + d,
2722
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1446 stride, 8);
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1447 }
9731
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
1448 dequantizer = s->qmat[s->all_fragments[i].qpi][1][plane];
2722
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1449 }else{
9731
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
1450 dequantizer = s->qmat[s->all_fragments[i].qpi][0][plane];
2722
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1451 }
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1452
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1453 /* dequantize the DCT coefficients */
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1454 if(s->avctx->idct_algo==FF_IDCT_VP3){
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1455 Coeff *coeff= s->coeffs + i;
8288
800444234375 clear_block mmx
lorenm
parents: 8032
diff changeset
1456 s->dsp.clear_block(block);
2722
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1457 while(coeff->next){
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1458 block[coeff->index]= coeff->coeff * dequantizer[coeff->index];
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1459 coeff= coeff->next;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1460 }
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1461 }else{
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1462 Coeff *coeff= s->coeffs + i;
8288
800444234375 clear_block mmx
lorenm
parents: 8032
diff changeset
1463 s->dsp.clear_block(block);
2722
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1464 while(coeff->next){
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1465 block[coeff->index]= (coeff->coeff * dequantizer[coeff->index] + 2)>>2;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1466 coeff= coeff->next;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1467 }
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1468 }
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1469
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1470 /* invert DCT and place (or add) in final output */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1471
2722
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1472 if (s->all_fragments[i].coding_method == MODE_INTRA) {
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1473 if(s->avctx->idct_algo!=FF_IDCT_VP3)
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1474 block[0] += 128<<3;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1475 s->dsp.idct_put(
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1476 output_plane + s->all_fragments[i].first_pixel,
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1477 stride,
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1478 block);
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1479 } else {
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1480 s->dsp.idct_add(
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1481 output_plane + s->all_fragments[i].first_pixel,
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1482 stride,
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1483 block);
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1484 }
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1485 } else {
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1486
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1487 /* copy directly from the previous frame */
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1488 s->dsp.put_pixels_tab[1][0](
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1489 output_plane + s->all_fragments[i].first_pixel,
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1490 last_plane + s->all_fragments[i].first_pixel,
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1491 stride, 8);
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1492
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1493 }
2724
546993e42dbc disable broken loop filter optimization
michael
parents: 2723
diff changeset
1494 #if 0
2726
77ba1f653619 fix bugs in new loop filter code; also, refrain from filtering against
melanson
parents: 2724
diff changeset
1495 /* perform the left edge filter if:
77ba1f653619 fix bugs in new loop filter code; also, refrain from filtering against
melanson
parents: 2724
diff changeset
1496 * - the fragment is not on the left column
77ba1f653619 fix bugs in new loop filter code; also, refrain from filtering against
melanson
parents: 2724
diff changeset
1497 * - the fragment is coded in this frame
77ba1f653619 fix bugs in new loop filter code; also, refrain from filtering against
melanson
parents: 2724
diff changeset
1498 * - the fragment is not coded in this frame but the left
77ba1f653619 fix bugs in new loop filter code; also, refrain from filtering against
melanson
parents: 2724
diff changeset
1499 * fragment is coded in this frame (this is done instead
77ba1f653619 fix bugs in new loop filter code; also, refrain from filtering against
melanson
parents: 2724
diff changeset
1500 * of a right edge filter when rendering the left fragment
77ba1f653619 fix bugs in new loop filter code; also, refrain from filtering against
melanson
parents: 2724
diff changeset
1501 * since this fragment is not available yet) */
2723
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
1502 if ((x > 0) &&
2726
77ba1f653619 fix bugs in new loop filter code; also, refrain from filtering against
melanson
parents: 2724
diff changeset
1503 ((s->all_fragments[i].coding_method != MODE_COPY) ||
77ba1f653619 fix bugs in new loop filter code; also, refrain from filtering against
melanson
parents: 2724
diff changeset
1504 ((s->all_fragments[i].coding_method == MODE_COPY) &&
77ba1f653619 fix bugs in new loop filter code; also, refrain from filtering against
melanson
parents: 2724
diff changeset
1505 (s->all_fragments[i - 1].coding_method != MODE_COPY)) )) {
2723
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
1506 horizontal_filter(
2726
77ba1f653619 fix bugs in new loop filter code; also, refrain from filtering against
melanson
parents: 2724
diff changeset
1507 output_plane + s->all_fragments[i].first_pixel + 7*stride,
3497
3a7844f83df4 fix loop filter
michael
parents: 3492
diff changeset
1508 -stride, s->bounding_values_array + 127);
2723
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
1509 }
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
1510
2726
77ba1f653619 fix bugs in new loop filter code; also, refrain from filtering against
melanson
parents: 2724
diff changeset
1511 /* perform the top edge filter if:
77ba1f653619 fix bugs in new loop filter code; also, refrain from filtering against
melanson
parents: 2724
diff changeset
1512 * - the fragment is not on the top row
77ba1f653619 fix bugs in new loop filter code; also, refrain from filtering against
melanson
parents: 2724
diff changeset
1513 * - the fragment is coded in this frame
77ba1f653619 fix bugs in new loop filter code; also, refrain from filtering against
melanson
parents: 2724
diff changeset
1514 * - the fragment is not coded in this frame but the above
77ba1f653619 fix bugs in new loop filter code; also, refrain from filtering against
melanson
parents: 2724
diff changeset
1515 * fragment is coded in this frame (this is done instead
77ba1f653619 fix bugs in new loop filter code; also, refrain from filtering against
melanson
parents: 2724
diff changeset
1516 * of a bottom edge filter when rendering the above
77ba1f653619 fix bugs in new loop filter code; also, refrain from filtering against
melanson
parents: 2724
diff changeset
1517 * fragment since this fragment is not available yet) */
77ba1f653619 fix bugs in new loop filter code; also, refrain from filtering against
melanson
parents: 2724
diff changeset
1518 if ((y > 0) &&
77ba1f653619 fix bugs in new loop filter code; also, refrain from filtering against
melanson
parents: 2724
diff changeset
1519 ((s->all_fragments[i].coding_method != MODE_COPY) ||
77ba1f653619 fix bugs in new loop filter code; also, refrain from filtering against
melanson
parents: 2724
diff changeset
1520 ((s->all_fragments[i].coding_method == MODE_COPY) &&
77ba1f653619 fix bugs in new loop filter code; also, refrain from filtering against
melanson
parents: 2724
diff changeset
1521 (s->all_fragments[i - fragment_width].coding_method != MODE_COPY)) )) {
2723
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
1522 vertical_filter(
2726
77ba1f653619 fix bugs in new loop filter code; also, refrain from filtering against
melanson
parents: 2724
diff changeset
1523 output_plane + s->all_fragments[i].first_pixel - stride,
3497
3a7844f83df4 fix loop filter
michael
parents: 3492
diff changeset
1524 -stride, s->bounding_values_array + 127);
2723
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
1525 }
2724
546993e42dbc disable broken loop filter optimization
michael
parents: 2723
diff changeset
1526 #endif
2722
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1527 }
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1528 }
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1529 }
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1530
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1531 /* this looks like a good place for slice dispatch... */
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1532 /* algorithm:
2723
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
1533 * if (slice == s->macroblock_height - 1)
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
1534 * dispatch (both last slice & 2nd-to-last slice);
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
1535 * else if (slice > 0)
2722
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1536 * dispatch (slice - 1);
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1537 */
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1538
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1539 emms_c();
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1540 }
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1541
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1542 static void apply_loop_filter(Vp3DecodeContext *s)
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1543 {
3498
4b040103da35 simplify
michael
parents: 3497
diff changeset
1544 int plane;
4b040103da35 simplify
michael
parents: 3497
diff changeset
1545 int x, y;
2723
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
1546 int *bounding_values= s->bounding_values_array+127;
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
1547
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
1548 #if 0
2686
979a847cb943 various 10l fixes for the loop filter
michael
parents: 2684
diff changeset
1549 int bounding_values_array[256];
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1550 int filter_limit;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1551
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1552 /* find the right loop limit value */
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1553 for (x = 63; x >= 0; x--) {
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1554 if (vp31_ac_scale_factor[x] >= s->quality_index)
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1555 break;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1556 }
2686
979a847cb943 various 10l fixes for the loop filter
michael
parents: 2684
diff changeset
1557 filter_limit = vp31_filter_limit_values[s->quality_index];
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1558
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1559 /* set up the bounding values */
2686
979a847cb943 various 10l fixes for the loop filter
michael
parents: 2684
diff changeset
1560 memset(bounding_values_array, 0, 256 * sizeof(int));
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1561 for (x = 0; x < filter_limit; x++) {
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1562 bounding_values[-x - filter_limit] = -filter_limit + x;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1563 bounding_values[-x] = -x;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1564 bounding_values[x] = x;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1565 bounding_values[x + filter_limit] = filter_limit - x;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1566 }
2723
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
1567 #endif
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1568
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1569 for (plane = 0; plane < 3; plane++) {
3498
4b040103da35 simplify
michael
parents: 3497
diff changeset
1570 int width = s->fragment_width >> !!plane;
4b040103da35 simplify
michael
parents: 3497
diff changeset
1571 int height = s->fragment_height >> !!plane;
4b040103da35 simplify
michael
parents: 3497
diff changeset
1572 int fragment = s->fragment_start [plane];
4b040103da35 simplify
michael
parents: 3497
diff changeset
1573 int stride = s->current_frame.linesize[plane];
4b040103da35 simplify
michael
parents: 3497
diff changeset
1574 uint8_t *plane_data = s->current_frame.data [plane];
3497
3a7844f83df4 fix loop filter
michael
parents: 3492
diff changeset
1575 if (!s->flipped_image) stride = -stride;
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1576
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1577 for (y = 0; y < height; y++) {
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1578
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1579 for (x = 0; x < width; x++) {
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1580 /* do not perform left edge filter for left columns frags */
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1581 if ((x > 0) &&
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1582 (s->all_fragments[fragment].coding_method != MODE_COPY)) {
7995
1fbfce20cb79 Move VP3 loop filter to DSPContext
conrad
parents: 7972
diff changeset
1583 s->dsp.vp3_h_loop_filter(
3497
3a7844f83df4 fix loop filter
michael
parents: 3492
diff changeset
1584 plane_data + s->all_fragments[fragment].first_pixel,
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1585 stride, bounding_values);
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1586 }
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1587
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1588 /* do not perform top edge filter for top row fragments */
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1589 if ((y > 0) &&
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1590 (s->all_fragments[fragment].coding_method != MODE_COPY)) {
7995
1fbfce20cb79 Move VP3 loop filter to DSPContext
conrad
parents: 7972
diff changeset
1591 s->dsp.vp3_v_loop_filter(
3497
3a7844f83df4 fix loop filter
michael
parents: 3492
diff changeset
1592 plane_data + s->all_fragments[fragment].first_pixel,
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1593 stride, bounding_values);
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1594 }
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1595
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1596 /* do not perform right edge filter for right column
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1597 * fragments or if right fragment neighbor is also coded
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1598 * in this frame (it will be filtered in next iteration) */
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1599 if ((x < width - 1) &&
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1600 (s->all_fragments[fragment].coding_method != MODE_COPY) &&
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1601 (s->all_fragments[fragment + 1].coding_method == MODE_COPY)) {
7995
1fbfce20cb79 Move VP3 loop filter to DSPContext
conrad
parents: 7972
diff changeset
1602 s->dsp.vp3_h_loop_filter(
3497
3a7844f83df4 fix loop filter
michael
parents: 3492
diff changeset
1603 plane_data + s->all_fragments[fragment + 1].first_pixel,
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1604 stride, bounding_values);
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1605 }
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1606
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1607 /* do not perform bottom edge filter for bottom row
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1608 * fragments or if bottom fragment neighbor is also coded
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1609 * in this frame (it will be filtered in the next row) */
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1610 if ((y < height - 1) &&
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1611 (s->all_fragments[fragment].coding_method != MODE_COPY) &&
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1612 (s->all_fragments[fragment + width].coding_method == MODE_COPY)) {
7995
1fbfce20cb79 Move VP3 loop filter to DSPContext
conrad
parents: 7972
diff changeset
1613 s->dsp.vp3_v_loop_filter(
3497
3a7844f83df4 fix loop filter
michael
parents: 3492
diff changeset
1614 plane_data + s->all_fragments[fragment + width].first_pixel,
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1615 stride, bounding_values);
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1616 }
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1617
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1618 fragment++;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1619 }
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1620 }
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1621 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1622 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1623
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1624 /*
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1625 * This function computes the first pixel addresses for each fragment.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1626 * This function needs to be invoked after the first frame is allocated
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1627 * so that it has access to the plane strides.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1628 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1629 static void vp3_calculate_pixel_addresses(Vp3DecodeContext *s)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1630 {
7960
050d235f40b6 Merge (vp3|theora)_calculate_pixel_addresses
conrad
parents: 7959
diff changeset
1631 #define Y_INITIAL(chroma_shift) s->flipped_image ? 1 : s->fragment_height >> chroma_shift
050d235f40b6 Merge (vp3|theora)_calculate_pixel_addresses
conrad
parents: 7959
diff changeset
1632 #define Y_FINISHED(chroma_shift) s->flipped_image ? y <= s->fragment_height >> chroma_shift : y > 0
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1633
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1634 int i, x, y;
7960
050d235f40b6 Merge (vp3|theora)_calculate_pixel_addresses
conrad
parents: 7959
diff changeset
1635 const int y_inc = s->flipped_image ? 1 : -1;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1636
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1637 /* figure out the first pixel addresses for each of the fragments */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1638 /* Y plane */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1639 i = 0;
7960
050d235f40b6 Merge (vp3|theora)_calculate_pixel_addresses
conrad
parents: 7959
diff changeset
1640 for (y = Y_INITIAL(0); Y_FINISHED(0); y += y_inc) {
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1641 for (x = 0; x < s->fragment_width; x++) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1642 s->all_fragments[i++].first_pixel =
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1643 s->golden_frame.linesize[0] * y * FRAGMENT_PIXELS -
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1644 s->golden_frame.linesize[0] +
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1645 x * FRAGMENT_PIXELS;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1646 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1647 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1648
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1649 /* U plane */
3498
4b040103da35 simplify
michael
parents: 3497
diff changeset
1650 i = s->fragment_start[1];
7960
050d235f40b6 Merge (vp3|theora)_calculate_pixel_addresses
conrad
parents: 7959
diff changeset
1651 for (y = Y_INITIAL(1); Y_FINISHED(1); y += y_inc) {
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1652 for (x = 0; x < s->fragment_width / 2; x++) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1653 s->all_fragments[i++].first_pixel =
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1654 s->golden_frame.linesize[1] * y * FRAGMENT_PIXELS -
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1655 s->golden_frame.linesize[1] +
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1656 x * FRAGMENT_PIXELS;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1657 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1658 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1659
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1660 /* V plane */
3498
4b040103da35 simplify
michael
parents: 3497
diff changeset
1661 i = s->fragment_start[2];
7960
050d235f40b6 Merge (vp3|theora)_calculate_pixel_addresses
conrad
parents: 7959
diff changeset
1662 for (y = Y_INITIAL(1); Y_FINISHED(1); y += y_inc) {
1626
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
1663 for (x = 0; x < s->fragment_width / 2; x++) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1664 s->all_fragments[i++].first_pixel =
1626
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
1665 s->golden_frame.linesize[2] * y * FRAGMENT_PIXELS -
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
1666 s->golden_frame.linesize[2] +
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
1667 x * FRAGMENT_PIXELS;
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
1668 }
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
1669 }
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
1670 }
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
1671
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1672 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1673 * This is the ffmpeg/libavcodec API init function.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1674 */
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6448
diff changeset
1675 static av_cold int vp3_decode_init(AVCodecContext *avctx)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1676 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1677 Vp3DecodeContext *s = avctx->priv_data;
3489
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
1678 int i, inter, plane;
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1679 int c_width;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1680 int c_height;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1681 int y_superblock_count;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1682 int c_superblock_count;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1683
1664
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
1684 if (avctx->codec_tag == MKTAG('V','P','3','0'))
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1685 s->version = 0;
1664
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
1686 else
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1687 s->version = 1;
1664
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
1688
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1689 s->avctx = avctx;
9686
bc32976d6d9d Move ALIGN macro to libavutil/common.h and use it in various places
conrad
parents: 9637
diff changeset
1690 s->width = FFALIGN(avctx->width, 16);
bc32976d6d9d Move ALIGN macro to libavutil/common.h and use it in various places
conrad
parents: 9637
diff changeset
1691 s->height = FFALIGN(avctx->height, 16);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1692 avctx->pix_fmt = PIX_FMT_YUV420P;
9626
bd3e11b60ccd Add a chroma_sample_location field to define positioning of chroma samples
conrad
parents: 9591
diff changeset
1693 avctx->chroma_sample_location = AVCHROMA_LOC_CENTER;
2693
02925a3903b6 porting vp3 idct over to lavc idct api
michael
parents: 2692
diff changeset
1694 if(avctx->idct_algo==FF_IDCT_AUTO)
02925a3903b6 porting vp3 idct over to lavc idct api
michael
parents: 2692
diff changeset
1695 avctx->idct_algo=FF_IDCT_VP3;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1696 dsputil_init(&s->dsp, avctx);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1697
2694
0d229cf036b9 fix idct permutation
michael
parents: 2693
diff changeset
1698 ff_init_scantable(s->dsp.idct_permutation, &s->scantable, ff_zigzag_direct);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1699
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1700 /* initialize to an impossible value which will force a recalculation
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1701 * in the first frame decode */
9731
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
1702 for (i = 0; i < 3; i++)
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
1703 s->qps[i] = -1;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1704
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1705 s->y_superblock_width = (s->width + 31) / 32;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1706 s->y_superblock_height = (s->height + 31) / 32;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1707 y_superblock_count = s->y_superblock_width * s->y_superblock_height;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1708
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1709 /* work out the dimensions for the C planes */
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1710 c_width = s->width / 2;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1711 c_height = s->height / 2;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1712 s->c_superblock_width = (c_width + 31) / 32;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1713 s->c_superblock_height = (c_height + 31) / 32;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1714 c_superblock_count = s->c_superblock_width * s->c_superblock_height;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1715
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1716 s->superblock_count = y_superblock_count + (c_superblock_count * 2);
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1717 s->u_superblock_start = y_superblock_count;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1718 s->v_superblock_start = s->u_superblock_start + c_superblock_count;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1719 s->superblock_coding = av_malloc(s->superblock_count);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1720
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1721 s->macroblock_width = (s->width + 15) / 16;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1722 s->macroblock_height = (s->height + 15) / 16;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1723 s->macroblock_count = s->macroblock_width * s->macroblock_height;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1724
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1725 s->fragment_width = s->width / FRAGMENT_PIXELS;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1726 s->fragment_height = s->height / FRAGMENT_PIXELS;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1727
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1728 /* fragment count covers all 8x8 blocks for all 3 planes */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1729 s->fragment_count = s->fragment_width * s->fragment_height * 3 / 2;
3498
4b040103da35 simplify
michael
parents: 3497
diff changeset
1730 s->fragment_start[1] = s->fragment_width * s->fragment_height;
4b040103da35 simplify
michael
parents: 3497
diff changeset
1731 s->fragment_start[2] = s->fragment_width * s->fragment_height * 5 / 4;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1732
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1733 s->all_fragments = av_malloc(s->fragment_count * sizeof(Vp3Fragment));
7037
480faa9f79dd Almost-cosmetics: split out coeff_count from all_fragments struct into
reimar
parents: 6903
diff changeset
1734 s->coeff_counts = av_malloc(s->fragment_count * sizeof(*s->coeff_counts));
2714
b008c78467e6 use O(number of non zero coeffs) instead of O(number of coeffs) storage for the coefficient colleting/reordering
michael
parents: 2712
diff changeset
1735 s->coeffs = av_malloc(s->fragment_count * sizeof(Coeff) * 65);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1736 s->coded_fragment_list = av_malloc(s->fragment_count * sizeof(int));
6350
8e63d869a904 typo fix: inited --> initialized
diego
parents: 6349
diff changeset
1737 s->pixel_addresses_initialized = 0;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1738
1516
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
1739 if (!s->theora_tables)
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
1740 {
3585
6506f95498dc cleanup
michael
parents: 3512
diff changeset
1741 for (i = 0; i < 64; i++) {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1742 s->coded_dc_scale_factor[i] = vp31_dc_scale_factor[i];
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1743 s->coded_ac_scale_factor[i] = vp31_ac_scale_factor[i];
3489
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
1744 s->base_matrix[0][i] = vp31_intra_y_dequant[i];
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
1745 s->base_matrix[1][i] = vp31_intra_c_dequant[i];
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
1746 s->base_matrix[2][i] = vp31_inter_dequant[i];
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1747 s->filter_limit_values[i] = vp31_filter_limit_values[i];
3585
6506f95498dc cleanup
michael
parents: 3512
diff changeset
1748 }
2718
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1749
3489
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
1750 for(inter=0; inter<2; inter++){
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
1751 for(plane=0; plane<3; plane++){
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
1752 s->qr_count[inter][plane]= 1;
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
1753 s->qr_size [inter][plane][0]= 63;
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
1754 s->qr_base [inter][plane][0]=
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
1755 s->qr_base [inter][plane][1]= 2*inter + (!!plane)*!inter;
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
1756 }
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
1757 }
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
1758
2718
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1759 /* init VLC tables */
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1760 for (i = 0; i < 16; i++) {
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1761
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1762 /* DC histograms */
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1763 init_vlc(&s->dc_vlc[i], 5, 32,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1764 &dc_bias[i][0][1], 4, 2,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1765 &dc_bias[i][0][0], 4, 2, 0);
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1766
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1767 /* group 1 AC histograms */
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1768 init_vlc(&s->ac_vlc_1[i], 5, 32,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1769 &ac_bias_0[i][0][1], 4, 2,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1770 &ac_bias_0[i][0][0], 4, 2, 0);
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1771
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1772 /* group 2 AC histograms */
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1773 init_vlc(&s->ac_vlc_2[i], 5, 32,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1774 &ac_bias_1[i][0][1], 4, 2,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1775 &ac_bias_1[i][0][0], 4, 2, 0);
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1776
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1777 /* group 3 AC histograms */
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1778 init_vlc(&s->ac_vlc_3[i], 5, 32,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1779 &ac_bias_2[i][0][1], 4, 2,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1780 &ac_bias_2[i][0][0], 4, 2, 0);
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1781
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1782 /* group 4 AC histograms */
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1783 init_vlc(&s->ac_vlc_4[i], 5, 32,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1784 &ac_bias_3[i][0][1], 4, 2,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1785 &ac_bias_3[i][0][0], 4, 2, 0);
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1786 }
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1787 } else {
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1788 for (i = 0; i < 16; i++) {
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1789
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1790 /* DC histograms */
9923
ba58c3abf832 Make decode_init fail if the huffman tables are invalid and thus init_vlc fails.
reimar
parents: 9922
diff changeset
1791 if (init_vlc(&s->dc_vlc[i], 5, 32,
2718
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1792 &s->huffman_table[i][0][1], 4, 2,
9923
ba58c3abf832 Make decode_init fail if the huffman tables are invalid and thus init_vlc fails.
reimar
parents: 9922
diff changeset
1793 &s->huffman_table[i][0][0], 4, 2, 0) < 0)
ba58c3abf832 Make decode_init fail if the huffman tables are invalid and thus init_vlc fails.
reimar
parents: 9922
diff changeset
1794 goto vlc_fail;
2718
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1795
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1796 /* group 1 AC histograms */
9923
ba58c3abf832 Make decode_init fail if the huffman tables are invalid and thus init_vlc fails.
reimar
parents: 9922
diff changeset
1797 if (init_vlc(&s->ac_vlc_1[i], 5, 32,
2718
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1798 &s->huffman_table[i+16][0][1], 4, 2,
9923
ba58c3abf832 Make decode_init fail if the huffman tables are invalid and thus init_vlc fails.
reimar
parents: 9922
diff changeset
1799 &s->huffman_table[i+16][0][0], 4, 2, 0) < 0)
ba58c3abf832 Make decode_init fail if the huffman tables are invalid and thus init_vlc fails.
reimar
parents: 9922
diff changeset
1800 goto vlc_fail;
2718
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1801
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1802 /* group 2 AC histograms */
9923
ba58c3abf832 Make decode_init fail if the huffman tables are invalid and thus init_vlc fails.
reimar
parents: 9922
diff changeset
1803 if (init_vlc(&s->ac_vlc_2[i], 5, 32,
2718
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1804 &s->huffman_table[i+16*2][0][1], 4, 2,
9923
ba58c3abf832 Make decode_init fail if the huffman tables are invalid and thus init_vlc fails.
reimar
parents: 9922
diff changeset
1805 &s->huffman_table[i+16*2][0][0], 4, 2, 0) < 0)
ba58c3abf832 Make decode_init fail if the huffman tables are invalid and thus init_vlc fails.
reimar
parents: 9922
diff changeset
1806 goto vlc_fail;
2718
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1807
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1808 /* group 3 AC histograms */
9923
ba58c3abf832 Make decode_init fail if the huffman tables are invalid and thus init_vlc fails.
reimar
parents: 9922
diff changeset
1809 if (init_vlc(&s->ac_vlc_3[i], 5, 32,
2718
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1810 &s->huffman_table[i+16*3][0][1], 4, 2,
9923
ba58c3abf832 Make decode_init fail if the huffman tables are invalid and thus init_vlc fails.
reimar
parents: 9922
diff changeset
1811 &s->huffman_table[i+16*3][0][0], 4, 2, 0) < 0)
ba58c3abf832 Make decode_init fail if the huffman tables are invalid and thus init_vlc fails.
reimar
parents: 9922
diff changeset
1812 goto vlc_fail;
2718
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1813
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1814 /* group 4 AC histograms */
9923
ba58c3abf832 Make decode_init fail if the huffman tables are invalid and thus init_vlc fails.
reimar
parents: 9922
diff changeset
1815 if (init_vlc(&s->ac_vlc_4[i], 5, 32,
2718
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1816 &s->huffman_table[i+16*4][0][1], 4, 2,
9923
ba58c3abf832 Make decode_init fail if the huffman tables are invalid and thus init_vlc fails.
reimar
parents: 9922
diff changeset
1817 &s->huffman_table[i+16*4][0][0], 4, 2, 0) < 0)
ba58c3abf832 Make decode_init fail if the huffman tables are invalid and thus init_vlc fails.
reimar
parents: 9922
diff changeset
1818 goto vlc_fail;
2718
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
1819 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1820 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1821
2703
3817945001ce replace get_superblock_run_length() with a VLC table
melanson
parents: 2702
diff changeset
1822 init_vlc(&s->superblock_run_length_vlc, 6, 34,
3817945001ce replace get_superblock_run_length() with a VLC table
melanson
parents: 2702
diff changeset
1823 &superblock_run_length_vlc_table[0][1], 4, 2,
3817945001ce replace get_superblock_run_length() with a VLC table
melanson
parents: 2702
diff changeset
1824 &superblock_run_length_vlc_table[0][0], 4, 2, 0);
3817945001ce replace get_superblock_run_length() with a VLC table
melanson
parents: 2702
diff changeset
1825
2942
868c48736d1c fixed long standing off-by-one bug (fixes playback on ppc)
alex
parents: 2866
diff changeset
1826 init_vlc(&s->fragment_run_length_vlc, 5, 30,
2702
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
1827 &fragment_run_length_vlc_table[0][1], 4, 2,
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
1828 &fragment_run_length_vlc_table[0][0], 4, 2, 0);
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
1829
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
1830 init_vlc(&s->mode_code_vlc, 3, 8,
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
1831 &mode_code_vlc_table[0][1], 2, 1,
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
1832 &mode_code_vlc_table[0][0], 2, 1, 0);
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
1833
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
1834 init_vlc(&s->motion_vector_vlc, 6, 63,
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
1835 &motion_vector_vlc_table[0][1], 2, 1,
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
1836 &motion_vector_vlc_table[0][0], 2, 1, 0);
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
1837
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1838 /* work out the block mapping tables */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1839 s->superblock_fragments = av_malloc(s->superblock_count * 16 * sizeof(int));
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1840 s->superblock_macroblocks = av_malloc(s->superblock_count * 4 * sizeof(int));
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1841 s->macroblock_fragments = av_malloc(s->macroblock_count * 6 * sizeof(int));
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
1842 s->macroblock_coding = av_malloc(s->macroblock_count + 1);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1843 init_block_mapping(s);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1844
1229
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
1845 for (i = 0; i < 3; i++) {
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
1846 s->current_frame.data[i] = NULL;
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
1847 s->last_frame.data[i] = NULL;
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
1848 s->golden_frame.data[i] = NULL;
1227
184c480cefc3 fix decoder so that ffmpeg does not crash, at least not right away
tmmm
parents: 1224
diff changeset
1849 }
184c480cefc3 fix decoder so that ffmpeg does not crash, at least not right away
tmmm
parents: 1224
diff changeset
1850
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1851 return 0;
9923
ba58c3abf832 Make decode_init fail if the huffman tables are invalid and thus init_vlc fails.
reimar
parents: 9922
diff changeset
1852
ba58c3abf832 Make decode_init fail if the huffman tables are invalid and thus init_vlc fails.
reimar
parents: 9922
diff changeset
1853 vlc_fail:
ba58c3abf832 Make decode_init fail if the huffman tables are invalid and thus init_vlc fails.
reimar
parents: 9922
diff changeset
1854 av_log(avctx, AV_LOG_FATAL, "Invalid huffman table\n");
ba58c3abf832 Make decode_init fail if the huffman tables are invalid and thus init_vlc fails.
reimar
parents: 9922
diff changeset
1855 return -1;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1856 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1857
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1858 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1859 * This is the ffmpeg/libavcodec API frame decode function.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1860 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1861 static int vp3_decode_frame(AVCodecContext *avctx,
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1862 void *data, int *data_size,
9355
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9007
diff changeset
1863 AVPacket *avpkt)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1864 {
9355
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9007
diff changeset
1865 const uint8_t *buf = avpkt->data;
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9007
diff changeset
1866 int buf_size = avpkt->size;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1867 Vp3DecodeContext *s = avctx->priv_data;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1868 GetBitContext gb;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1869 static int counter = 0;
2722
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1870 int i;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1871
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1872 init_get_bits(&gb, buf, buf_size * 8);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1873
1516
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
1874 if (s->theora && get_bits1(&gb))
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
1875 {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1876 av_log(avctx, AV_LOG_ERROR, "Header packet passed to frame decoder, skipping\n");
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1877 return -1;
1516
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
1878 }
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
1879
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
1880 s->keyframe = !get_bits1(&gb);
1664
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
1881 if (!s->theora)
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1882 skip_bits(&gb, 1);
9731
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
1883 for (i = 0; i < 3; i++)
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
1884 s->last_qps[i] = s->qps[i];
3492
fa3794c46f21 parse all QIS values (we still ignore them though ...)
michael
parents: 3491
diff changeset
1885
9731
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
1886 s->nqps=0;
3492
fa3794c46f21 parse all QIS values (we still ignore them though ...)
michael
parents: 3491
diff changeset
1887 do{
9731
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
1888 s->qps[s->nqps++]= get_bits(&gb, 6);
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
1889 } while(s->theora >= 0x030200 && s->nqps<3 && get_bits1(&gb));
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
1890 for (i = s->nqps; i < 3; i++)
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
1891 s->qps[i] = -1;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1892
1667
720c073661a1 FF_DEBUG_PICT_INFO and CODEC_FLAG_GRAY support
alex
parents: 1664
diff changeset
1893 if (s->avctx->debug & FF_DEBUG_PICT_INFO)
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1894 av_log(s->avctx, AV_LOG_INFO, " VP3 %sframe #%d: Q index = %d\n",
9731
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
1895 s->keyframe?"key":"", counter, s->qps[0]);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1896 counter++;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1897
9731
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
1898 if (s->qps[0] != s->last_qps[0])
2723
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
1899 init_loop_filter(s);
9731
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
1900
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
1901 for (i = 0; i < s->nqps; i++)
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
1902 // reinit all dequantizers if the first one changed, because
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
1903 // the DC of the first quantizer must be used for all matrices
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
1904 if (s->qps[i] != s->last_qps[i] || s->qps[0] != s->last_qps[0])
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
1905 init_dequantizer(s, i);
1292
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
1906
7938
66226ee647a4 Use skip_frame for keyframe-only decoding rather than #ifdef
conrad
parents: 7875
diff changeset
1907 if (avctx->skip_frame >= AVDISCARD_NONKEY && !s->keyframe)
66226ee647a4 Use skip_frame for keyframe-only decoding rather than #ifdef
conrad
parents: 7875
diff changeset
1908 return buf_size;
66226ee647a4 Use skip_frame for keyframe-only decoding rather than #ifdef
conrad
parents: 7875
diff changeset
1909
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1910 if (s->keyframe) {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1911 if (!s->theora)
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1912 {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1913 skip_bits(&gb, 4); /* width code */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1914 skip_bits(&gb, 4); /* height code */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1915 if (s->version)
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1916 {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1917 s->version = get_bits(&gb, 5);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1918 if (counter == 1)
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1919 av_log(s->avctx, AV_LOG_DEBUG, "VP version: %d\n", s->version);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1920 }
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1921 }
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1922 if (s->version || s->theora)
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1923 {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1924 if (get_bits1(&gb))
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1925 av_log(s->avctx, AV_LOG_ERROR, "Warning, unsupported keyframe coding type?!\n");
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1926 skip_bits(&gb, 2); /* reserved? */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1927 }
1664
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
1928
1244
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
1929 if (s->last_frame.data[0] == s->golden_frame.data[0]) {
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
1930 if (s->golden_frame.data[0])
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
1931 avctx->release_buffer(avctx, &s->golden_frame);
1405
e69f99ade5b0 fix AVFrame.reference (the frames are used for decoding future frames so it should be !=0)
michaelni
parents: 1355
diff changeset
1932 s->last_frame= s->golden_frame; /* ensure that we catch any access to this released frame */
1244
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
1933 } else {
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
1934 if (s->golden_frame.data[0])
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
1935 avctx->release_buffer(avctx, &s->golden_frame);
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
1936 if (s->last_frame.data[0])
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
1937 avctx->release_buffer(avctx, &s->last_frame);
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
1938 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1939
1405
e69f99ade5b0 fix AVFrame.reference (the frames are used for decoding future frames so it should be !=0)
michaelni
parents: 1355
diff changeset
1940 s->golden_frame.reference = 3;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1941 if(avctx->get_buffer(avctx, &s->golden_frame) < 0) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1518
diff changeset
1942 av_log(s->avctx, AV_LOG_ERROR, "vp3: get_buffer() failed\n");
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1943 return -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1944 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1945
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1946 /* golden frame is also the current frame */
3486
5ee0e924432f useless memcpy
michael
parents: 3485
diff changeset
1947 s->current_frame= s->golden_frame;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1948
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1949 /* time to figure out pixel addresses? */
6350
8e63d869a904 typo fix: inited --> initialized
diego
parents: 6349
diff changeset
1950 if (!s->pixel_addresses_initialized)
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1951 {
7961
ef0616549c16 Cosmetics: indentation
conrad
parents: 7960
diff changeset
1952 vp3_calculate_pixel_addresses(s);
6350
8e63d869a904 typo fix: inited --> initialized
diego
parents: 6349
diff changeset
1953 s->pixel_addresses_initialized = 1;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1954 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1955 } else {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1956 /* allocate a new current frame */
1405
e69f99ade5b0 fix AVFrame.reference (the frames are used for decoding future frames so it should be !=0)
michaelni
parents: 1355
diff changeset
1957 s->current_frame.reference = 3;
6350
8e63d869a904 typo fix: inited --> initialized
diego
parents: 6349
diff changeset
1958 if (!s->pixel_addresses_initialized) {
3512
feace06d4184 Do not crash when the first frame is not a keyframe (and thus none of the
reimar
parents: 3502
diff changeset
1959 av_log(s->avctx, AV_LOG_ERROR, "vp3: first frame not a keyframe\n");
feace06d4184 Do not crash when the first frame is not a keyframe (and thus none of the
reimar
parents: 3502
diff changeset
1960 return -1;
feace06d4184 Do not crash when the first frame is not a keyframe (and thus none of the
reimar
parents: 3502
diff changeset
1961 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1962 if(avctx->get_buffer(avctx, &s->current_frame) < 0) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1518
diff changeset
1963 av_log(s->avctx, AV_LOG_ERROR, "vp3: get_buffer() failed\n");
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1964 return -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1965 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1966 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1967
1407
69f4f4fb8a50 fixing chroma MC
michaelni
parents: 1406
diff changeset
1968 s->current_frame.qscale_table= s->qscale_table; //FIXME allocate individual tables per AVFrame
69f4f4fb8a50 fixing chroma MC
michaelni
parents: 1406
diff changeset
1969 s->current_frame.qstride= 0;
69f4f4fb8a50 fixing chroma MC
michaelni
parents: 1406
diff changeset
1970
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1971 init_frame(s, &gb);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1972
2687
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
1973 if (unpack_superblocks(s, &gb)){
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
1974 av_log(s->avctx, AV_LOG_ERROR, "error in unpack_superblocks\n");
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
1975 return -1;
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
1976 }
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
1977 if (unpack_modes(s, &gb)){
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
1978 av_log(s->avctx, AV_LOG_ERROR, "error in unpack_modes\n");
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1979 return -1;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1980 }
2687
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
1981 if (unpack_vectors(s, &gb)){
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
1982 av_log(s->avctx, AV_LOG_ERROR, "error in unpack_vectors\n");
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
1983 return -1;
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
1984 }
9731
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
1985 if (unpack_block_qpis(s, &gb)){
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
1986 av_log(s->avctx, AV_LOG_ERROR, "error in unpack_block_qpis\n");
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
1987 return -1;
5b1b3c4a1f17 Support block-level quantization in Theora
conrad
parents: 9686
diff changeset
1988 }
2687
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
1989 if (unpack_dct_coeffs(s, &gb)){
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
1990 av_log(s->avctx, AV_LOG_ERROR, "error in unpack_dct_coeffs\n");
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
1991 return -1;
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
1992 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1993
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1994 reverse_dc_prediction(s, 0, s->fragment_width, s->fragment_height);
1355
1c05f4290517 added the official VP3 IDCT (C implementation) as well as a grayscale
tmmm
parents: 1292
diff changeset
1995 if ((avctx->flags & CODEC_FLAG_GRAY) == 0) {
3498
4b040103da35 simplify
michael
parents: 3497
diff changeset
1996 reverse_dc_prediction(s, s->fragment_start[1],
1355
1c05f4290517 added the official VP3 IDCT (C implementation) as well as a grayscale
tmmm
parents: 1292
diff changeset
1997 s->fragment_width / 2, s->fragment_height / 2);
3498
4b040103da35 simplify
michael
parents: 3497
diff changeset
1998 reverse_dc_prediction(s, s->fragment_start[2],
1355
1c05f4290517 added the official VP3 IDCT (C implementation) as well as a grayscale
tmmm
parents: 1292
diff changeset
1999 s->fragment_width / 2, s->fragment_height / 2);
2722
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
2000 }
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
2001
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
2002 for (i = 0; i < s->macroblock_height; i++)
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
2003 render_slice(s, i);
7038
110080ab2391 Remove the START_TIMER/STOP_TIMER from vp3.c, they clutter the output and
reimar
parents: 7037
diff changeset
2004
2724
546993e42dbc disable broken loop filter optimization
michael
parents: 2723
diff changeset
2005 apply_loop_filter(s);
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2006
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2007 *data_size=sizeof(AVFrame);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2008 *(AVFrame*)data= s->current_frame;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2009
1229
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2010 /* release the last frame, if it is allocated and if it is not the
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2011 * golden frame */
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2012 if ((s->last_frame.data[0]) &&
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2013 (s->last_frame.data[0] != s->golden_frame.data[0]))
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2014 avctx->release_buffer(avctx, &s->last_frame);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2015
1227
184c480cefc3 fix decoder so that ffmpeg does not crash, at least not right away
tmmm
parents: 1224
diff changeset
2016 /* shuffle frames (last = current) */
3486
5ee0e924432f useless memcpy
michael
parents: 3485
diff changeset
2017 s->last_frame= s->current_frame;
1405
e69f99ade5b0 fix AVFrame.reference (the frames are used for decoding future frames so it should be !=0)
michaelni
parents: 1355
diff changeset
2018 s->current_frame.data[0]= NULL; /* ensure that we catch any access to this released frame */
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2019
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2020 return buf_size;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2021 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2022
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2023 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2024 * This is the ffmpeg/libavcodec API module cleanup function.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2025 */
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6448
diff changeset
2026 static av_cold int vp3_decode_end(AVCodecContext *avctx)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2027 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2028 Vp3DecodeContext *s = avctx->priv_data;
6393
eaa18f140fb7 fix memory leaks in vp3 decoder
mru
parents: 6377
diff changeset
2029 int i;
eaa18f140fb7 fix memory leaks in vp3 decoder
mru
parents: 6377
diff changeset
2030
eaa18f140fb7 fix memory leaks in vp3 decoder
mru
parents: 6377
diff changeset
2031 av_free(s->superblock_coding);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2032 av_free(s->all_fragments);
7037
480faa9f79dd Almost-cosmetics: split out coeff_count from all_fragments struct into
reimar
parents: 6903
diff changeset
2033 av_free(s->coeff_counts);
2689
ed0ab6f82167 clear blocks after each idct instead of per picture
michael
parents: 2687
diff changeset
2034 av_free(s->coeffs);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2035 av_free(s->coded_fragment_list);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2036 av_free(s->superblock_fragments);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2037 av_free(s->superblock_macroblocks);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2038 av_free(s->macroblock_fragments);
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
2039 av_free(s->macroblock_coding);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
2040
6393
eaa18f140fb7 fix memory leaks in vp3 decoder
mru
parents: 6377
diff changeset
2041 for (i = 0; i < 16; i++) {
eaa18f140fb7 fix memory leaks in vp3 decoder
mru
parents: 6377
diff changeset
2042 free_vlc(&s->dc_vlc[i]);
eaa18f140fb7 fix memory leaks in vp3 decoder
mru
parents: 6377
diff changeset
2043 free_vlc(&s->ac_vlc_1[i]);
eaa18f140fb7 fix memory leaks in vp3 decoder
mru
parents: 6377
diff changeset
2044 free_vlc(&s->ac_vlc_2[i]);
eaa18f140fb7 fix memory leaks in vp3 decoder
mru
parents: 6377
diff changeset
2045 free_vlc(&s->ac_vlc_3[i]);
eaa18f140fb7 fix memory leaks in vp3 decoder
mru
parents: 6377
diff changeset
2046 free_vlc(&s->ac_vlc_4[i]);
eaa18f140fb7 fix memory leaks in vp3 decoder
mru
parents: 6377
diff changeset
2047 }
eaa18f140fb7 fix memory leaks in vp3 decoder
mru
parents: 6377
diff changeset
2048
eaa18f140fb7 fix memory leaks in vp3 decoder
mru
parents: 6377
diff changeset
2049 free_vlc(&s->superblock_run_length_vlc);
eaa18f140fb7 fix memory leaks in vp3 decoder
mru
parents: 6377
diff changeset
2050 free_vlc(&s->fragment_run_length_vlc);
eaa18f140fb7 fix memory leaks in vp3 decoder
mru
parents: 6377
diff changeset
2051 free_vlc(&s->mode_code_vlc);
eaa18f140fb7 fix memory leaks in vp3 decoder
mru
parents: 6377
diff changeset
2052 free_vlc(&s->motion_vector_vlc);
eaa18f140fb7 fix memory leaks in vp3 decoder
mru
parents: 6377
diff changeset
2053
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2054 /* release all frames */
1405
e69f99ade5b0 fix AVFrame.reference (the frames are used for decoding future frames so it should be !=0)
michaelni
parents: 1355
diff changeset
2055 if (s->golden_frame.data[0] && s->golden_frame.data[0] != s->last_frame.data[0])
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2056 avctx->release_buffer(avctx, &s->golden_frame);
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2057 if (s->last_frame.data[0])
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2058 avctx->release_buffer(avctx, &s->last_frame);
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2059 /* no need to release the current_frame since it will always be pointing
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2060 * to the same frame as either the golden or last frame */
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2061
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2062 return 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2063 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2064
2718
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2065 static int read_huffman_tree(AVCodecContext *avctx, GetBitContext *gb)
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2066 {
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2067 Vp3DecodeContext *s = avctx->priv_data;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2068
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5450
diff changeset
2069 if (get_bits1(gb)) {
2718
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2070 int token;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2071 if (s->entries >= 32) { /* overflow */
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2072 av_log(avctx, AV_LOG_ERROR, "huffman tree overflow\n");
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2073 return -1;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2074 }
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2075 token = get_bits(gb, 5);
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2076 //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);
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2077 s->huffman_table[s->hti][token][0] = s->hbits;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2078 s->huffman_table[s->hti][token][1] = s->huff_code_size;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2079 s->entries++;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2080 }
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2081 else {
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2082 if (s->huff_code_size >= 32) {/* overflow */
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2083 av_log(avctx, AV_LOG_ERROR, "huffman tree overflow\n");
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2084 return -1;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2085 }
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2086 s->huff_code_size++;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2087 s->hbits <<= 1;
8770
f14d50df103f VP3: Do not ignore error from read_huffman_tree().
alexc
parents: 8736
diff changeset
2088 if (read_huffman_tree(avctx, gb))
f14d50df103f VP3: Do not ignore error from read_huffman_tree().
alexc
parents: 8736
diff changeset
2089 return -1;
2718
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2090 s->hbits |= 1;
8770
f14d50df103f VP3: Do not ignore error from read_huffman_tree().
alexc
parents: 8736
diff changeset
2091 if (read_huffman_tree(avctx, gb))
f14d50df103f VP3: Do not ignore error from read_huffman_tree().
alexc
parents: 8736
diff changeset
2092 return -1;
2718
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2093 s->hbits >>= 1;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2094 s->huff_code_size--;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2095 }
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2096 return 0;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2097 }
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2098
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8288
diff changeset
2099 #if CONFIG_THEORA_DECODER
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2100 static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb)
1516
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2101 {
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2102 Vp3DecodeContext *s = avctx->priv_data;
4935
b34f448e1a12 fix display of theora videos with visible size smaller than encoded size
aurel
parents: 4826
diff changeset
2103 int visible_width, visible_height;
3483
26b0ce29f5f5 cleanup
michael
parents: 3145
diff changeset
2104
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2105 s->theora = get_bits_long(gb, 24);
6349
aed237dd11d8 Print Theora bitstream version at DEBUG, not at VERBOSE level.
diego
parents: 6282
diff changeset
2106 av_log(avctx, AV_LOG_DEBUG, "Theora bitstream version %X\n", s->theora);
1627
a80b15c0b9d5 theora alpha3 support (with maintaining backward compatibility, maybe we should remove all backward compatibility codes after final theora release?)
alex
parents: 1626
diff changeset
2107
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2108 /* 3.2.0 aka alpha3 has the same frame orientation as original vp3 */
1626
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2109 /* but previous versions have the image flipped relative to vp3 */
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2110 if (s->theora < 0x030200)
1626
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2111 {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2112 s->flipped_image = 1;
1626
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2113 av_log(avctx, AV_LOG_DEBUG, "Old (<alpha3) Theora bitstream, flipped image\n");
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2114 }
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2115
7967
6ac2c8312a2b Visible width/height fields were added in Theora 3.2
conrad
parents: 7966
diff changeset
2116 visible_width = s->width = get_bits(gb, 16) << 4;
6ac2c8312a2b Visible width/height fields were added in Theora 3.2
conrad
parents: 7966
diff changeset
2117 visible_height = s->height = get_bits(gb, 16) << 4;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
2118
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2370
diff changeset
2119 if(avcodec_check_dimensions(avctx, s->width, s->height)){
2943
6bf62c1cf1b6 Fixing theora _again_. DONT BOTHER BREAKING THIS AGAIN. Added support for Theora 3.4 and stream created by Elphel cameras are decodable.
alex
parents: 2942
diff changeset
2120 av_log(avctx, AV_LOG_ERROR, "Invalid dimensions (%dx%d)\n", s->width, s->height);
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2370
diff changeset
2121 s->width= s->height= 0;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2370
diff changeset
2122 return -1;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2370
diff changeset
2123 }
2943
6bf62c1cf1b6 Fixing theora _again_. DONT BOTHER BREAKING THIS AGAIN. Added support for Theora 3.4 and stream created by Elphel cameras are decodable.
alex
parents: 2942
diff changeset
2124
6bf62c1cf1b6 Fixing theora _again_. DONT BOTHER BREAKING THIS AGAIN. Added support for Theora 3.4 and stream created by Elphel cameras are decodable.
alex
parents: 2942
diff changeset
2125 if (s->theora >= 0x030400)
6bf62c1cf1b6 Fixing theora _again_. DONT BOTHER BREAKING THIS AGAIN. Added support for Theora 3.4 and stream created by Elphel cameras are decodable.
alex
parents: 2942
diff changeset
2126 {
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2127 skip_bits(gb, 32); /* total number of superblocks in a frame */
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2128 // fixme, the next field is 36bits long
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2129 skip_bits(gb, 32); /* total number of blocks in a frame */
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2130 skip_bits(gb, 4); /* total number of blocks in a frame */
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2131 skip_bits(gb, 32); /* total number of macroblocks in a frame */
2943
6bf62c1cf1b6 Fixing theora _again_. DONT BOTHER BREAKING THIS AGAIN. Added support for Theora 3.4 and stream created by Elphel cameras are decodable.
alex
parents: 2942
diff changeset
2132 }
4935
b34f448e1a12 fix display of theora videos with visible size smaller than encoded size
aurel
parents: 4826
diff changeset
2133
7967
6ac2c8312a2b Visible width/height fields were added in Theora 3.2
conrad
parents: 7966
diff changeset
2134 if (s->theora >= 0x030200) {
7968
5ed5f94b9a97 Cosmetics: indentation
conrad
parents: 7967
diff changeset
2135 visible_width = get_bits_long(gb, 24);
5ed5f94b9a97 Cosmetics: indentation
conrad
parents: 7967
diff changeset
2136 visible_height = get_bits_long(gb, 24);
1516
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2137
4936
2e400c0e99f6 cosmetics: fix inconsistent indentation
aurel
parents: 4935
diff changeset
2138 skip_bits(gb, 8); /* offset x */
2e400c0e99f6 cosmetics: fix inconsistent indentation
aurel
parents: 4935
diff changeset
2139 skip_bits(gb, 8); /* offset y */
2e400c0e99f6 cosmetics: fix inconsistent indentation
aurel
parents: 4935
diff changeset
2140 }
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2141
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2142 skip_bits(gb, 32); /* fps numerator */
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2143 skip_bits(gb, 32); /* fps denumerator */
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2144 skip_bits(gb, 24); /* aspect numerator */
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2145 skip_bits(gb, 24); /* aspect denumerator */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
2146
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2147 if (s->theora < 0x030200)
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2148 skip_bits(gb, 5); /* keyframe frequency force */
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2149 skip_bits(gb, 8); /* colorspace */
2943
6bf62c1cf1b6 Fixing theora _again_. DONT BOTHER BREAKING THIS AGAIN. Added support for Theora 3.4 and stream created by Elphel cameras are decodable.
alex
parents: 2942
diff changeset
2150 if (s->theora >= 0x030400)
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2151 skip_bits(gb, 2); /* pixel format: 420,res,422,444 */
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2152 skip_bits(gb, 24); /* bitrate */
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2153
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2154 skip_bits(gb, 6); /* quality hint */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
2155
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2156 if (s->theora >= 0x030200)
1627
a80b15c0b9d5 theora alpha3 support (with maintaining backward compatibility, maybe we should remove all backward compatibility codes after final theora release?)
alex
parents: 1626
diff changeset
2157 {
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2158 skip_bits(gb, 5); /* keyframe frequency force */
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2159
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2160 if (s->theora < 0x030400)
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2161 skip_bits(gb, 5); /* spare bits */
1627
a80b15c0b9d5 theora alpha3 support (with maintaining backward compatibility, maybe we should remove all backward compatibility codes after final theora release?)
alex
parents: 1626
diff changeset
2162 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
2163
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2164 // align_get_bits(gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
2165
4935
b34f448e1a12 fix display of theora videos with visible size smaller than encoded size
aurel
parents: 4826
diff changeset
2166 if ( visible_width <= s->width && visible_width > s->width-16
b34f448e1a12 fix display of theora videos with visible size smaller than encoded size
aurel
parents: 4826
diff changeset
2167 && visible_height <= s->height && visible_height > s->height-16)
b34f448e1a12 fix display of theora videos with visible size smaller than encoded size
aurel
parents: 4826
diff changeset
2168 avcodec_set_dimensions(avctx, visible_width, visible_height);
b34f448e1a12 fix display of theora videos with visible size smaller than encoded size
aurel
parents: 4826
diff changeset
2169 else
b34f448e1a12 fix display of theora videos with visible size smaller than encoded size
aurel
parents: 4826
diff changeset
2170 avcodec_set_dimensions(avctx, s->width, s->height);
1516
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2171
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2172 return 0;
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2173 }
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2174
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2175 static int theora_decode_tables(AVCodecContext *avctx, GetBitContext *gb)
1516
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2176 {
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2177 Vp3DecodeContext *s = avctx->priv_data;
3489
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2178 int i, n, matrices, inter, plane;
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2179
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2180 if (s->theora >= 0x030200) {
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2181 n = get_bits(gb, 3);
2731
0b4b57c4a8f5 read loop filter limit values from Theora header, courtesy of Matthieu
melanson
parents: 2726
diff changeset
2182 /* loop filter limit values table */
9922
ffdd1d32c40c Ensure that the filter limit values do not exceed the maximum allowed value of 127.
reimar
parents: 9921
diff changeset
2183 for (i = 0; i < 64; i++) {
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2184 s->filter_limit_values[i] = get_bits(gb, n);
9922
ffdd1d32c40c Ensure that the filter limit values do not exceed the maximum allowed value of 127.
reimar
parents: 9921
diff changeset
2185 if (s->filter_limit_values[i] > 127) {
ffdd1d32c40c Ensure that the filter limit values do not exceed the maximum allowed value of 127.
reimar
parents: 9921
diff changeset
2186 av_log(avctx, AV_LOG_ERROR, "filter limit value too large (%i > 127), clamping\n", s->filter_limit_values[i]);
ffdd1d32c40c Ensure that the filter limit values do not exceed the maximum allowed value of 127.
reimar
parents: 9921
diff changeset
2187 s->filter_limit_values[i] = 127;
ffdd1d32c40c Ensure that the filter limit values do not exceed the maximum allowed value of 127.
reimar
parents: 9921
diff changeset
2188 }
ffdd1d32c40c Ensure that the filter limit values do not exceed the maximum allowed value of 127.
reimar
parents: 9921
diff changeset
2189 }
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2190 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
2191
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2192 if (s->theora >= 0x030200)
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2193 n = get_bits(gb, 4) + 1;
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2194 else
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2195 n = 16;
1516
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2196 /* quality threshold table */
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2197 for (i = 0; i < 64; i++)
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2198 s->coded_ac_scale_factor[i] = get_bits(gb, n);
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2199
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2200 if (s->theora >= 0x030200)
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2201 n = get_bits(gb, 4) + 1;
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2202 else
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2203 n = 16;
1516
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2204 /* dc scale factor table */
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2205 for (i = 0; i < 64; i++)
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2206 s->coded_dc_scale_factor[i] = get_bits(gb, n);
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2207
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2208 if (s->theora >= 0x030200)
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2209 matrices = get_bits(gb, 9) + 1;
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2210 else
2944
3785497656c9 Correctly skip unknown matrices (patch by Matthieu Castet) and disable comment reading
alex
parents: 2943
diff changeset
2211 matrices = 3;
3489
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2212
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2213 if(matrices > 384){
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2214 av_log(avctx, AV_LOG_ERROR, "invalid number of base matrixes\n");
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2215 return -1;
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2216 }
3489
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2217
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2218 for(n=0; n<matrices; n++){
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2219 for (i = 0; i < 64; i++)
3489
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2220 s->base_matrix[n][i]= get_bits(gb, 8);
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2221 }
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2222
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2223 for (inter = 0; inter <= 1; inter++) {
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2224 for (plane = 0; plane <= 2; plane++) {
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2225 int newqr= 1;
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2226 if (inter || plane > 0)
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5450
diff changeset
2227 newqr = get_bits1(gb);
2718
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2228 if (!newqr) {
3489
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2229 int qtj, plj;
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5450
diff changeset
2230 if(inter && get_bits1(gb)){
3489
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2231 qtj = 0;
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2232 plj = plane;
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2233 }else{
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2234 qtj= (3*inter + plane - 1) / 3;
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2235 plj= (plane + 2) % 3;
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2236 }
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2237 s->qr_count[inter][plane]= s->qr_count[qtj][plj];
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2238 memcpy(s->qr_size[inter][plane], s->qr_size[qtj][plj], sizeof(s->qr_size[0][0]));
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2239 memcpy(s->qr_base[inter][plane], s->qr_base[qtj][plj], sizeof(s->qr_base[0][0]));
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2240 } else {
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2241 int qri= 0;
2718
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2242 int qi = 0;
3489
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2243
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2244 for(;;){
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2245 i= get_bits(gb, av_log2(matrices-1)+1);
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2246 if(i>= matrices){
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2247 av_log(avctx, AV_LOG_ERROR, "invalid base matrix index\n");
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2248 return -1;
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2249 }
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2250 s->qr_base[inter][plane][qri]= i;
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2251 if(qi >= 63)
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2252 break;
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2253 i = get_bits(gb, av_log2(63-qi)+1) + 1;
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2254 s->qr_size[inter][plane][qri++]= i;
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2255 qi += i;
2718
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2256 }
3489
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2257
2944
3785497656c9 Correctly skip unknown matrices (patch by Matthieu Castet) and disable comment reading
alex
parents: 2943
diff changeset
2258 if (qi > 63) {
2943
6bf62c1cf1b6 Fixing theora _again_. DONT BOTHER BREAKING THIS AGAIN. Added support for Theora 3.4 and stream created by Elphel cameras are decodable.
alex
parents: 2942
diff changeset
2259 av_log(avctx, AV_LOG_ERROR, "invalid qi %d > 63\n", qi);
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2260 return -1;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2261 }
3489
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2262 s->qr_count[inter][plane]= qri;
2718
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2263 }
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2264 }
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2265 }
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2266
2944
3785497656c9 Correctly skip unknown matrices (patch by Matthieu Castet) and disable comment reading
alex
parents: 2943
diff changeset
2267 /* Huffman tables */
2718
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2268 for (s->hti = 0; s->hti < 80; s->hti++) {
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2269 s->entries = 0;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2270 s->huff_code_size = 1;
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5450
diff changeset
2271 if (!get_bits1(gb)) {
2718
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2272 s->hbits = 0;
8770
f14d50df103f VP3: Do not ignore error from read_huffman_tree().
alexc
parents: 8736
diff changeset
2273 if(read_huffman_tree(avctx, gb))
f14d50df103f VP3: Do not ignore error from read_huffman_tree().
alexc
parents: 8736
diff changeset
2274 return -1;
2718
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2275 s->hbits = 1;
8770
f14d50df103f VP3: Do not ignore error from read_huffman_tree().
alexc
parents: 8736
diff changeset
2276 if(read_huffman_tree(avctx, gb))
f14d50df103f VP3: Do not ignore error from read_huffman_tree().
alexc
parents: 8736
diff changeset
2277 return -1;
2718
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2278 }
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2279 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
2280
1516
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2281 s->theora_tables = 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
2282
1516
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2283 return 0;
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2284 }
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2285
9007
043574c5c153 Add missing av_cold in static init/close functions.
stefano
parents: 8770
diff changeset
2286 static av_cold int theora_decode_init(AVCodecContext *avctx)
1516
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2287 {
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2288 Vp3DecodeContext *s = avctx->priv_data;
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2289 GetBitContext gb;
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2290 int ptype;
4723
b62a3a46856c use generic xiph header spliting func to split theora headers
aurel
parents: 4594
diff changeset
2291 uint8_t *header_start[3];
b62a3a46856c use generic xiph header spliting func to split theora headers
aurel
parents: 4594
diff changeset
2292 int header_len[3];
b62a3a46856c use generic xiph header spliting func to split theora headers
aurel
parents: 4594
diff changeset
2293 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
2294
1516
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2295 s->theora = 1;
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2296
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2297 if (!avctx->extradata_size)
2943
6bf62c1cf1b6 Fixing theora _again_. DONT BOTHER BREAKING THIS AGAIN. Added support for Theora 3.4 and stream created by Elphel cameras are decodable.
alex
parents: 2942
diff changeset
2298 {
6bf62c1cf1b6 Fixing theora _again_. DONT BOTHER BREAKING THIS AGAIN. Added support for Theora 3.4 and stream created by Elphel cameras are decodable.
alex
parents: 2942
diff changeset
2299 av_log(avctx, AV_LOG_ERROR, "Missing extradata!\n");
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2300 return -1;
2943
6bf62c1cf1b6 Fixing theora _again_. DONT BOTHER BREAKING THIS AGAIN. Added support for Theora 3.4 and stream created by Elphel cameras are decodable.
alex
parents: 2942
diff changeset
2301 }
1516
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2302
4723
b62a3a46856c use generic xiph header spliting func to split theora headers
aurel
parents: 4594
diff changeset
2303 if (ff_split_xiph_headers(avctx->extradata, avctx->extradata_size,
b62a3a46856c use generic xiph header spliting func to split theora headers
aurel
parents: 4594
diff changeset
2304 42, header_start, header_len) < 0) {
b62a3a46856c use generic xiph header spliting func to split theora headers
aurel
parents: 4594
diff changeset
2305 av_log(avctx, AV_LOG_ERROR, "Corrupt extradata\n");
b62a3a46856c use generic xiph header spliting func to split theora headers
aurel
parents: 4594
diff changeset
2306 return -1;
b62a3a46856c use generic xiph header spliting func to split theora headers
aurel
parents: 4594
diff changeset
2307 }
b62a3a46856c use generic xiph header spliting func to split theora headers
aurel
parents: 4594
diff changeset
2308
2533
06985f4138e3 04-vp3 fix(by matthieu castet).patch
michael
parents: 2531
diff changeset
2309 for(i=0;i<3;i++) {
4723
b62a3a46856c use generic xiph header spliting func to split theora headers
aurel
parents: 4594
diff changeset
2310 init_get_bits(&gb, header_start[i], header_len[i]);
1516
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2311
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2312 ptype = get_bits(&gb, 8);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
2313
2943
6bf62c1cf1b6 Fixing theora _again_. DONT BOTHER BREAKING THIS AGAIN. Added support for Theora 3.4 and stream created by Elphel cameras are decodable.
alex
parents: 2942
diff changeset
2314 if (!(ptype & 0x80))
6bf62c1cf1b6 Fixing theora _again_. DONT BOTHER BREAKING THIS AGAIN. Added support for Theora 3.4 and stream created by Elphel cameras are decodable.
alex
parents: 2942
diff changeset
2315 {
6bf62c1cf1b6 Fixing theora _again_. DONT BOTHER BREAKING THIS AGAIN. Added support for Theora 3.4 and stream created by Elphel cameras are decodable.
alex
parents: 2942
diff changeset
2316 av_log(avctx, AV_LOG_ERROR, "Invalid extradata!\n");
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2317 // return -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
2318 }
2943
6bf62c1cf1b6 Fixing theora _again_. DONT BOTHER BREAKING THIS AGAIN. Added support for Theora 3.4 and stream created by Elphel cameras are decodable.
alex
parents: 2942
diff changeset
2319
4561
726deec26122 cosmetics: aswell --> as well typo fix
diego
parents: 4342
diff changeset
2320 // FIXME: Check for this as well.
9637
f1dc62781766 Use skip_bits_long() for large skips
conrad
parents: 9626
diff changeset
2321 skip_bits_long(&gb, 6*8); /* "theora" */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
2322
1516
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2323 switch(ptype)
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2324 {
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2325 case 0x80:
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2326 theora_decode_header(avctx, &gb);
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2327 break;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2328 case 0x81:
2944
3785497656c9 Correctly skip unknown matrices (patch by Matthieu Castet) and disable comment reading
alex
parents: 2943
diff changeset
2329 // FIXME: is this needed? it breaks sometimes
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2330 // theora_decode_comments(avctx, gb);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2331 break;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2332 case 0x82:
8770
f14d50df103f VP3: Do not ignore error from read_huffman_tree().
alexc
parents: 8736
diff changeset
2333 if (theora_decode_tables(avctx, &gb))
f14d50df103f VP3: Do not ignore error from read_huffman_tree().
alexc
parents: 8736
diff changeset
2334 return -1;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2335 break;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2336 default:
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2337 av_log(avctx, AV_LOG_ERROR, "Unknown Theora config packet: %d\n", ptype&~0x80);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2338 break;
1516
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2339 }
7943
3ff31e4454cd Downgrade severity of leftover bits in header packets, and don't check for the comment header
conrad
parents: 7938
diff changeset
2340 if(ptype != 0x81 && 8*header_len[i] != get_bits_count(&gb))
3ff31e4454cd Downgrade severity of leftover bits in header packets, and don't check for the comment header
conrad
parents: 7938
diff changeset
2341 av_log(avctx, AV_LOG_WARNING, "%d bits left in packet %X\n", 8*header_len[i] - get_bits_count(&gb), ptype);
3490
b43d45362038 fix playback of theora.ogg on mphq patch by (matthieu castet %% castet dat matthieu ot free dat fr %%)
michael
parents: 3489
diff changeset
2342 if (s->theora < 0x030200)
b43d45362038 fix playback of theora.ogg on mphq patch by (matthieu castet %% castet dat matthieu ot free dat fr %%)
michael
parents: 3489
diff changeset
2343 break;
2533
06985f4138e3 04-vp3 fix(by matthieu castet).patch
michael
parents: 2531
diff changeset
2344 }
1516
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2345
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2346 vp3_decode_init(avctx);
1516
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2347 return 0;
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2348 }
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2349
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2350 AVCodec theora_decoder = {
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2351 "theora",
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2352 CODEC_TYPE_VIDEO,
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2353 CODEC_ID_THEORA,
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2354 sizeof(Vp3DecodeContext),
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2355 theora_decode_init,
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2356 NULL,
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2357 vp3_decode_end,
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2358 vp3_decode_frame,
9811
87bd4aedc7b1 vp3 and theora decoders use get_buffer, set CODEC_CAP_DR1
bcoudurier
parents: 9731
diff changeset
2359 CODEC_CAP_DR1,
6710
a4104482ceef Add long names to many AVCodec declarations.
diego
parents: 6517
diff changeset
2360 NULL,
7040
e943e1409077 Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents: 7038
diff changeset
2361 .long_name = NULL_IF_CONFIG_SMALL("Theora"),
1516
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2362 };
4823
cff8c7ecac71 Fix compilation when Theora decoder is disabled, but VP3 is enabled.
diego
parents: 4801
diff changeset
2363 #endif
4825
3f32f0e5a77b cosmetics: Move one code block to save an #ifdef in the next commit.
diego
parents: 4824
diff changeset
2364
3f32f0e5a77b cosmetics: Move one code block to save an #ifdef in the next commit.
diego
parents: 4824
diff changeset
2365 AVCodec vp3_decoder = {
3f32f0e5a77b cosmetics: Move one code block to save an #ifdef in the next commit.
diego
parents: 4824
diff changeset
2366 "vp3",
3f32f0e5a77b cosmetics: Move one code block to save an #ifdef in the next commit.
diego
parents: 4824
diff changeset
2367 CODEC_TYPE_VIDEO,
3f32f0e5a77b cosmetics: Move one code block to save an #ifdef in the next commit.
diego
parents: 4824
diff changeset
2368 CODEC_ID_VP3,
3f32f0e5a77b cosmetics: Move one code block to save an #ifdef in the next commit.
diego
parents: 4824
diff changeset
2369 sizeof(Vp3DecodeContext),
3f32f0e5a77b cosmetics: Move one code block to save an #ifdef in the next commit.
diego
parents: 4824
diff changeset
2370 vp3_decode_init,
3f32f0e5a77b cosmetics: Move one code block to save an #ifdef in the next commit.
diego
parents: 4824
diff changeset
2371 NULL,
3f32f0e5a77b cosmetics: Move one code block to save an #ifdef in the next commit.
diego
parents: 4824
diff changeset
2372 vp3_decode_end,
3f32f0e5a77b cosmetics: Move one code block to save an #ifdef in the next commit.
diego
parents: 4824
diff changeset
2373 vp3_decode_frame,
9811
87bd4aedc7b1 vp3 and theora decoders use get_buffer, set CODEC_CAP_DR1
bcoudurier
parents: 9731
diff changeset
2374 CODEC_CAP_DR1,
6710
a4104482ceef Add long names to many AVCodec declarations.
diego
parents: 6517
diff changeset
2375 NULL,
7040
e943e1409077 Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents: 7038
diff changeset
2376 .long_name = NULL_IF_CONFIG_SMALL("On2 VP3"),
4825
3f32f0e5a77b cosmetics: Move one code block to save an #ifdef in the next commit.
diego
parents: 4824
diff changeset
2377 };