annotate vp3.c @ 11151:d649b7f938c8 libavcodec

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