annotate vp3.c @ 2718:158dc437c783 libavcodec

read Huffman tables from Theora header (patch courtesy of Matthieu Castet <castet.matthieu at free.fr>)
author melanson
date Thu, 19 May 2005 23:59:10 +0000
parents b008c78467e6
children 5444d77adcbe
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 *
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
4 * This library is free software; you can redistribute it and/or
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
5 * modify it under the terms of the GNU Lesser General Public
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
6 * License as published by the Free Software Foundation; either
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
7 * version 2 of the License, or (at your option) any later version.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
8 *
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
9 * This library is distributed in the hope that it will be useful,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
12 * Lesser General Public License for more details.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
13 *
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
14 * You should have received a copy of the GNU Lesser General Public
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
15 * License along with this library; if not, write to the Free Software
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
16 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
17 *
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
18 */
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 * @file vp3.c
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
22 * 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
23 *
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
24 * 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
25 * For more information about the VP3 coding process, visit:
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
26 * http://multimedia.cx/
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
27 *
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
28 * Theora decoder by Alex Beregszaszi
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
29 */
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 #include <stdio.h>
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
32 #include <stdlib.h>
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
33 #include <string.h>
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
34 #include <unistd.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 "common.h"
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
37 #include "avcodec.h"
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
38 #include "dsputil.h"
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
39 #include "mpegvideo.h"
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
40
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
41 #include "vp3data.h"
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
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
45 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
46 * Debugging Variables
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
47 *
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
48 * Define one or more of the following compile-time variables to 1 to obtain
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
49 * elaborate information about certain aspects of the decoding process.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
50 *
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
51 * KEYFRAMES_ONLY: set this to 1 to only see keyframes (VP3 slideshow mode)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
52 * DEBUG_VP3: high-level decoding flow
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
53 * DEBUG_INIT: initialization parameters
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
54 * DEBUG_DEQUANTIZERS: display how the dequanization tables are built
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
55 * DEBUG_BLOCK_CODING: unpacking the superblock/macroblock/fragment coding
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
56 * DEBUG_MODES: unpacking the coding modes for individual fragments
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
57 * DEBUG_VECTORS: display the motion vectors
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
58 * DEBUG_TOKEN: display exhaustive information about each DCT token
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
59 * DEBUG_VLC: display the VLCs as they are extracted from the stream
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
60 * DEBUG_DC_PRED: display the process of reversing DC prediction
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
61 * DEBUG_IDCT: show every detail of the IDCT process
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
62 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
63
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
64 #define KEYFRAMES_ONLY 0
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
65
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
66 #define DEBUG_VP3 0
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
67 #define DEBUG_INIT 0
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
68 #define DEBUG_DEQUANTIZERS 0
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
69 #define DEBUG_BLOCK_CODING 0
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
70 #define DEBUG_MODES 0
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
71 #define DEBUG_VECTORS 0
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
72 #define DEBUG_TOKEN 0
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
73 #define DEBUG_VLC 0
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
74 #define DEBUG_DC_PRED 0
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
75 #define DEBUG_IDCT 0
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
76
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
77 #if DEBUG_VP3
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
78 #define debug_vp3 printf
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
79 #else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
80 static inline void debug_vp3(const char *format, ...) { }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
81 #endif
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
82
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
83 #if DEBUG_INIT
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
84 #define debug_init printf
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
85 #else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
86 static inline void debug_init(const char *format, ...) { }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
87 #endif
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
88
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
89 #if DEBUG_DEQUANTIZERS
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
90 #define debug_dequantizers printf
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
91 #else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
92 static inline void debug_dequantizers(const char *format, ...) { }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
93 #endif
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
94
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
95 #if DEBUG_BLOCK_CODING
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
96 #define debug_block_coding printf
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
97 #else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
98 static inline void debug_block_coding(const char *format, ...) { }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
99 #endif
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
100
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
101 #if DEBUG_MODES
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
102 #define debug_modes printf
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
103 #else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
104 static inline void debug_modes(const char *format, ...) { }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
105 #endif
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
106
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
107 #if DEBUG_VECTORS
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
108 #define debug_vectors printf
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
109 #else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
110 static inline void debug_vectors(const char *format, ...) { }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
111 #endif
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
112
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
113 #if DEBUG_TOKEN
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
114 #define debug_token printf
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
115 #else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
116 static inline void debug_token(const char *format, ...) { }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
117 #endif
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 #if DEBUG_VLC
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
120 #define debug_vlc printf
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
121 #else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
122 static inline void debug_vlc(const char *format, ...) { }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
123 #endif
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
124
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
125 #if DEBUG_DC_PRED
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
126 #define debug_dc_pred printf
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
127 #else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
128 static inline void debug_dc_pred(const char *format, ...) { }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
129 #endif
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
130
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
131 #if DEBUG_IDCT
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
132 #define debug_idct printf
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
133 #else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
134 static inline void debug_idct(const char *format, ...) { }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
135 #endif
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
136
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
137 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
138 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
139 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
140 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
141 } 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
142
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
143 //FIXME split things out into their own arrays
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
144 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
145 Coeff *next_coeff;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
146 /* address of first pixel taking into account which plane the fragment
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
147 * lives on as well as the plane stride */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
148 int first_pixel;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
149 /* this is the macroblock that the fragment belongs to */
2706
a23c44f7ed60 reduce size of Vp3Fragment from 32byte to 16byte
michael
parents: 2705
diff changeset
150 uint16_t macroblock;
a23c44f7ed60 reduce size of Vp3Fragment from 32byte to 16byte
michael
parents: 2705
diff changeset
151 uint8_t coding_method;
a23c44f7ed60 reduce size of Vp3Fragment from 32byte to 16byte
michael
parents: 2705
diff changeset
152 uint8_t coeff_count;
a23c44f7ed60 reduce size of Vp3Fragment from 32byte to 16byte
michael
parents: 2705
diff changeset
153 int8_t motion_x;
a23c44f7ed60 reduce size of Vp3Fragment from 32byte to 16byte
michael
parents: 2705
diff changeset
154 int8_t motion_y;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
155 } Vp3Fragment;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
156
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
157 #define SB_NOT_CODED 0
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
158 #define SB_PARTIALLY_CODED 1
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
159 #define SB_FULLY_CODED 2
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
160
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
161 #define MODE_INTER_NO_MV 0
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
162 #define MODE_INTRA 1
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
163 #define MODE_INTER_PLUS_MV 2
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
164 #define MODE_INTER_LAST_MV 3
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
165 #define MODE_INTER_PRIOR_LAST 4
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
166 #define MODE_USING_GOLDEN 5
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
167 #define MODE_GOLDEN_MV 6
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
168 #define MODE_INTER_FOURMV 7
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
169 #define CODING_MODE_COUNT 8
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
170
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
171 /* special internal mode */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
172 #define MODE_COPY 8
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
173
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
174 /* There are 6 preset schemes, plus a free-form scheme */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
175 static int ModeAlphabet[7][CODING_MODE_COUNT] =
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
176 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
177 /* this is the custom scheme */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
178 { 0, 0, 0, 0, 0, 0, 0, 0 },
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
179
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
180 /* scheme 1: Last motion vector dominates */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
181 { MODE_INTER_LAST_MV, MODE_INTER_PRIOR_LAST,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
182 MODE_INTER_PLUS_MV, MODE_INTER_NO_MV,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
183 MODE_INTRA, MODE_USING_GOLDEN,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
184 MODE_GOLDEN_MV, MODE_INTER_FOURMV },
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
185
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
186 /* scheme 2 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
187 { MODE_INTER_LAST_MV, MODE_INTER_PRIOR_LAST,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
188 MODE_INTER_NO_MV, MODE_INTER_PLUS_MV,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
189 MODE_INTRA, MODE_USING_GOLDEN,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
190 MODE_GOLDEN_MV, MODE_INTER_FOURMV },
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
191
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
192 /* scheme 3 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
193 { MODE_INTER_LAST_MV, MODE_INTER_PLUS_MV,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
194 MODE_INTER_PRIOR_LAST, MODE_INTER_NO_MV,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
195 MODE_INTRA, MODE_USING_GOLDEN,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
196 MODE_GOLDEN_MV, MODE_INTER_FOURMV },
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
197
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
198 /* scheme 4 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
199 { MODE_INTER_LAST_MV, MODE_INTER_PLUS_MV,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
200 MODE_INTER_NO_MV, MODE_INTER_PRIOR_LAST,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
201 MODE_INTRA, MODE_USING_GOLDEN,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
202 MODE_GOLDEN_MV, MODE_INTER_FOURMV },
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
203
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
204 /* scheme 5: No motion vector dominates */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
205 { MODE_INTER_NO_MV, MODE_INTER_LAST_MV,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
206 MODE_INTER_PRIOR_LAST, MODE_INTER_PLUS_MV,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
207 MODE_INTRA, MODE_USING_GOLDEN,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
208 MODE_GOLDEN_MV, MODE_INTER_FOURMV },
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
209
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
210 /* scheme 6 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
211 { MODE_INTER_NO_MV, MODE_USING_GOLDEN,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
212 MODE_INTER_LAST_MV, MODE_INTER_PRIOR_LAST,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
213 MODE_INTER_PLUS_MV, MODE_INTRA,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
214 MODE_GOLDEN_MV, MODE_INTER_FOURMV },
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
215
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
216 };
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
217
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
218 #define MIN_DEQUANT_VAL 2
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
219
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
220 typedef struct Vp3DecodeContext {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
221 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
222 int theora, theora_tables;
1664
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
223 int version;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
224 int width, height;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
225 AVFrame golden_frame;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
226 AVFrame last_frame;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
227 AVFrame current_frame;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
228 int keyframe;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
229 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
230 int flipped_image;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
231
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
232 int quality_index;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
233 int last_quality_index;
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 int superblock_count;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
236 int superblock_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
237 int superblock_height;
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
238 int y_superblock_width;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
239 int y_superblock_height;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
240 int c_superblock_width;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
241 int c_superblock_height;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
242 int u_superblock_start;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
243 int v_superblock_start;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
244 unsigned char *superblock_coding;
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 macroblock_count;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
247 int macroblock_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
248 int macroblock_height;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
249
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
250 int fragment_count;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
251 int fragment_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
252 int fragment_height;
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 Vp3Fragment *all_fragments;
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
255 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
256 Coeff *next_coeff;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
257 int u_fragment_start;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
258 int v_fragment_start;
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
259
2694
0d229cf036b9 fix idct permutation
michael
parents: 2693
diff changeset
260 ScanTable scantable;
0d229cf036b9 fix idct permutation
michael
parents: 2693
diff changeset
261
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
262 /* 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
263 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
264 uint32_t coded_ac_scale_factor[64];
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
265 uint16_t coded_intra_y_dequant[64];
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
266 uint16_t coded_intra_c_dequant[64];
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
267 uint16_t coded_inter_dequant[64];
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
268
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
269 /* this is a list of indices into the all_fragments array indicating
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
270 * which of the fragments are coded */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
271 int *coded_fragment_list;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
272 int coded_fragment_list_index;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
273 int pixel_addresses_inited;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
274
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
275 VLC dc_vlc[16];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
276 VLC ac_vlc_1[16];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
277 VLC ac_vlc_2[16];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
278 VLC ac_vlc_3[16];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
279 VLC ac_vlc_4[16];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
280
2702
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
281 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
282 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
283 VLC mode_code_vlc;
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
284 VLC motion_vector_vlc;
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
285
1972
8a556283601d hook up support for SSE2-optimized VP3 IDCT
melanson
parents: 1867
diff changeset
286 /* 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
287 * index into them */
8a556283601d hook up support for SSE2-optimized VP3 IDCT
melanson
parents: 1867
diff changeset
288 int16_t __align16 intra_y_dequant[64];
8a556283601d hook up support for SSE2-optimized VP3 IDCT
melanson
parents: 1867
diff changeset
289 int16_t __align16 intra_c_dequant[64];
8a556283601d hook up support for SSE2-optimized VP3 IDCT
melanson
parents: 1867
diff changeset
290 int16_t __align16 inter_dequant[64];
1224
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 /* This table contains superblock_count * 16 entries. Each set of 16
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
293 * numbers corresponds to the fragment indices 0..15 of the superblock.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
294 * 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
295 * index. */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
296 int *superblock_fragments;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
297
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
298 /* This table contains superblock_count * 4 entries. Each set of 4
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
299 * numbers corresponds to the macroblock indices 0..3 of the superblock.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
300 * 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
301 * index. */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
302 int *superblock_macroblocks;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
303
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
304 /* This table contains macroblock_count * 6 entries. Each set of 6
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
305 * numbers corresponds to the fragment indices 0..5 which comprise
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
306 * the macroblock (4 Y fragments and 2 C fragments). */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
307 int *macroblock_fragments;
1244
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
308 /* This is an array that indicates how a particular macroblock
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
309 * is coded. */
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
310 unsigned char *macroblock_coding;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
311
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
312 int first_coded_y_fragment;
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
313 int first_coded_c_fragment;
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
314 int last_coded_y_fragment;
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
315 int last_coded_c_fragment;
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
316
1406
ae5524a3cd08 MC rounding fixed?
michaelni
parents: 1405
diff changeset
317 uint8_t edge_emu_buffer[9*2048]; //FIXME dynamic alloc
1407
69f4f4fb8a50 fixing chroma MC
michaelni
parents: 1406
diff changeset
318 uint8_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
319
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
320 /* Huffman decode */
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
321 int hti;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
322 unsigned int hbits;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
323 int entries;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
324 int huff_code_size;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
325 uint16_t huffman_table[80][32][2];
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
326 } Vp3DecodeContext;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
327
1664
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
328 static int theora_decode_comments(AVCodecContext *avctx, GetBitContext gb);
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
329 static int theora_decode_tables(AVCodecContext *avctx, GetBitContext gb);
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
330
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
331 /************************************************************************
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
332 * VP3 specific functions
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
333 ************************************************************************/
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 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
336 * This function sets up all of the various blocks mappings:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
337 * superblocks <-> fragments, macroblocks <-> fragments,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
338 * superblocks <-> macroblocks
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
339 *
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
340 * Returns 0 is successful; returns 1 if *anything* went wrong.
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
341 */
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
342 static int init_block_mapping(Vp3DecodeContext *s)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
343 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
344 int i, j;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
345 signed int hilbert_walk_y[16];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
346 signed int hilbert_walk_c[16];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
347 signed int hilbert_walk_mb[4];
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 int current_fragment = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
350 int current_width = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
351 int current_height = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
352 int right_edge = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
353 int bottom_edge = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
354 int superblock_row_inc = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
355 int *hilbert = NULL;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
356 int mapping_index = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
357
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
358 int current_macroblock;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
359 int c_fragment;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
360
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
361 signed char travel_width[16] = {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
362 1, 1, 0, -1,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
363 0, 0, 1, 0,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
364 1, 0, 1, 0,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
365 0, -1, 0, 1
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
366 };
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
367
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
368 signed char travel_height[16] = {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
369 0, 0, 1, 0,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
370 1, 1, 0, -1,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
371 0, 1, 0, -1,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
372 -1, 0, -1, 0
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
373 };
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
374
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
375 signed char travel_width_mb[4] = {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
376 1, 0, 1, 0
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
377 };
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
378
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
379 signed char travel_height_mb[4] = {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
380 0, 1, 0, -1
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
381 };
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
382
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
383 debug_vp3(" vp3: initialize block mapping tables\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
384
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
385 /* figure out hilbert pattern per these frame dimensions */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
386 hilbert_walk_y[0] = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
387 hilbert_walk_y[1] = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
388 hilbert_walk_y[2] = s->fragment_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
389 hilbert_walk_y[3] = -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
390 hilbert_walk_y[4] = s->fragment_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
391 hilbert_walk_y[5] = s->fragment_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
392 hilbert_walk_y[6] = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
393 hilbert_walk_y[7] = -s->fragment_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
394 hilbert_walk_y[8] = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
395 hilbert_walk_y[9] = s->fragment_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
396 hilbert_walk_y[10] = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
397 hilbert_walk_y[11] = -s->fragment_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
398 hilbert_walk_y[12] = -s->fragment_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
399 hilbert_walk_y[13] = -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
400 hilbert_walk_y[14] = -s->fragment_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
401 hilbert_walk_y[15] = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
402
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
403 hilbert_walk_c[0] = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
404 hilbert_walk_c[1] = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
405 hilbert_walk_c[2] = s->fragment_width / 2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
406 hilbert_walk_c[3] = -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
407 hilbert_walk_c[4] = s->fragment_width / 2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
408 hilbert_walk_c[5] = s->fragment_width / 2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
409 hilbert_walk_c[6] = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
410 hilbert_walk_c[7] = -s->fragment_width / 2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
411 hilbert_walk_c[8] = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
412 hilbert_walk_c[9] = s->fragment_width / 2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
413 hilbert_walk_c[10] = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
414 hilbert_walk_c[11] = -s->fragment_width / 2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
415 hilbert_walk_c[12] = -s->fragment_width / 2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
416 hilbert_walk_c[13] = -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
417 hilbert_walk_c[14] = -s->fragment_width / 2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
418 hilbert_walk_c[15] = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
419
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
420 hilbert_walk_mb[0] = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
421 hilbert_walk_mb[1] = s->macroblock_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
422 hilbert_walk_mb[2] = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
423 hilbert_walk_mb[3] = -s->macroblock_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
424
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
425 /* iterate through each superblock (all planes) and map the fragments */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
426 for (i = 0; i < s->superblock_count; i++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
427 debug_init(" superblock %d (u starts @ %d, v starts @ %d)\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
428 i, s->u_superblock_start, s->v_superblock_start);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
429
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
430 /* time to re-assign the limits? */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
431 if (i == 0) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
432
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
433 /* start of Y superblocks */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
434 right_edge = s->fragment_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
435 bottom_edge = s->fragment_height;
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
436 current_width = -1;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
437 current_height = 0;
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
438 superblock_row_inc = 3 * s->fragment_width -
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
439 (s->y_superblock_width * 4 - s->fragment_width);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
440 hilbert = hilbert_walk_y;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
441
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
442 /* the first operation for this variable is to advance by 1 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
443 current_fragment = -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
444
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
445 } else if (i == s->u_superblock_start) {
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 /* start of U superblocks */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
448 right_edge = s->fragment_width / 2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
449 bottom_edge = s->fragment_height / 2;
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
450 current_width = -1;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
451 current_height = 0;
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
452 superblock_row_inc = 3 * (s->fragment_width / 2) -
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
453 (s->c_superblock_width * 4 - s->fragment_width / 2);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
454 hilbert = hilbert_walk_c;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
455
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
456 /* the first operation for this variable is to advance by 1 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
457 current_fragment = s->u_fragment_start - 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
458
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
459 } else if (i == s->v_superblock_start) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
460
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
461 /* start of V superblocks */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
462 right_edge = s->fragment_width / 2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
463 bottom_edge = s->fragment_height / 2;
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
464 current_width = -1;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
465 current_height = 0;
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
466 superblock_row_inc = 3 * (s->fragment_width / 2) -
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
467 (s->c_superblock_width * 4 - s->fragment_width / 2);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
468 hilbert = hilbert_walk_c;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
469
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
470 /* the first operation for this variable is to advance by 1 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
471 current_fragment = s->v_fragment_start - 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
472
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
473 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
474
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
475 if (current_width >= right_edge - 1) {
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
476 /* 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
477 current_width = -1;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
478 current_height += 4;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
479
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
480 /* fragment is now at the start of a new superblock row */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
481 current_fragment += superblock_row_inc;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
482 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
483
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
484 /* iterate through all 16 fragments in a superblock */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
485 for (j = 0; j < 16; j++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
486 current_fragment += hilbert[j];
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
487 current_width += travel_width[j];
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
488 current_height += travel_height[j];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
489
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
490 /* 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
491 if ((current_width < right_edge) &&
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
492 (current_height < bottom_edge)) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
493 s->superblock_fragments[mapping_index] = current_fragment;
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
494 debug_init(" mapping fragment %d to superblock %d, position %d (%d/%d x %d/%d)\n",
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
495 s->superblock_fragments[mapping_index], i, j,
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
496 current_width, right_edge, current_height, bottom_edge);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
497 } else {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
498 s->superblock_fragments[mapping_index] = -1;
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
499 debug_init(" superblock %d, position %d has no fragment (%d/%d x %d/%d)\n",
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
500 i, j,
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
501 current_width, right_edge, current_height, bottom_edge);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
502 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
503
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
504 mapping_index++;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
505 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
506 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
507
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
508 /* initialize the superblock <-> macroblock mapping; iterate through
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
509 * all of the Y plane superblocks to build this mapping */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
510 right_edge = s->macroblock_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
511 bottom_edge = s->macroblock_height;
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
512 current_width = -1;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
513 current_height = 0;
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
514 superblock_row_inc = s->macroblock_width -
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
515 (s->y_superblock_width * 2 - s->macroblock_width);;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
516 hilbert = hilbert_walk_mb;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
517 mapping_index = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
518 current_macroblock = -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
519 for (i = 0; i < s->u_superblock_start; i++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
520
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
521 if (current_width >= right_edge - 1) {
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
522 /* reset width and move to next superblock row */
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
523 current_width = -1;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
524 current_height += 2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
525
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
526 /* macroblock is now at the start of a new superblock row */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
527 current_macroblock += superblock_row_inc;
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
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
530 /* iterate through each potential macroblock in the superblock */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
531 for (j = 0; j < 4; j++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
532 current_macroblock += hilbert_walk_mb[j];
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
533 current_width += travel_width_mb[j];
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
534 current_height += travel_height_mb[j];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
535
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
536 /* check if the macroblock is in bounds */
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
537 if ((current_width < right_edge) &&
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
538 (current_height < bottom_edge)) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
539 s->superblock_macroblocks[mapping_index] = current_macroblock;
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
540 debug_init(" mapping macroblock %d to superblock %d, position %d (%d/%d x %d/%d)\n",
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
541 s->superblock_macroblocks[mapping_index], i, j,
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
542 current_width, right_edge, current_height, bottom_edge);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
543 } else {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
544 s->superblock_macroblocks[mapping_index] = -1;
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
545 debug_init(" superblock %d, position %d has no macroblock (%d/%d x %d/%d)\n",
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
546 i, j,
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
547 current_width, right_edge, current_height, bottom_edge);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
548 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
549
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
550 mapping_index++;
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 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
553
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
554 /* initialize the macroblock <-> fragment mapping */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
555 current_fragment = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
556 current_macroblock = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
557 mapping_index = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
558 for (i = 0; i < s->fragment_height; i += 2) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
559
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
560 for (j = 0; j < s->fragment_width; j += 2) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
561
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
562 debug_init(" macroblock %d contains fragments: ", current_macroblock);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
563 s->all_fragments[current_fragment].macroblock = current_macroblock;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
564 s->macroblock_fragments[mapping_index++] = current_fragment;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
565 debug_init("%d ", current_fragment);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
566
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
567 if (j + 1 < s->fragment_width) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
568 s->all_fragments[current_fragment + 1].macroblock = current_macroblock;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
569 s->macroblock_fragments[mapping_index++] = current_fragment + 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
570 debug_init("%d ", current_fragment + 1);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
571 } else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
572 s->macroblock_fragments[mapping_index++] = -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
573
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
574 if (i + 1 < s->fragment_height) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
575 s->all_fragments[current_fragment + s->fragment_width].macroblock =
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
576 current_macroblock;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
577 s->macroblock_fragments[mapping_index++] =
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
578 current_fragment + s->fragment_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
579 debug_init("%d ", current_fragment + s->fragment_width);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
580 } else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
581 s->macroblock_fragments[mapping_index++] = -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
582
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
583 if ((j + 1 < s->fragment_width) && (i + 1 < s->fragment_height)) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
584 s->all_fragments[current_fragment + s->fragment_width + 1].macroblock =
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
585 current_macroblock;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
586 s->macroblock_fragments[mapping_index++] =
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
587 current_fragment + s->fragment_width + 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
588 debug_init("%d ", current_fragment + s->fragment_width + 1);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
589 } else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
590 s->macroblock_fragments[mapping_index++] = -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
591
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
592 /* C planes */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
593 c_fragment = s->u_fragment_start +
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
594 (i * s->fragment_width / 4) + (j / 2);
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
595 s->all_fragments[c_fragment].macroblock = s->macroblock_count;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
596 s->macroblock_fragments[mapping_index++] = c_fragment;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
597 debug_init("%d ", c_fragment);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
598
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
599 c_fragment = s->v_fragment_start +
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
600 (i * s->fragment_width / 4) + (j / 2);
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
601 s->all_fragments[c_fragment].macroblock = s->macroblock_count;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
602 s->macroblock_fragments[mapping_index++] = c_fragment;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
603 debug_init("%d ", c_fragment);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
604
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
605 debug_init("\n");
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 if (j + 2 <= s->fragment_width)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
608 current_fragment += 2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
609 else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
610 current_fragment++;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
611 current_macroblock++;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
612 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
613
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
614 current_fragment += s->fragment_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
615 }
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
616
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
617 return 0; /* successful path out */
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
618 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
619
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
620 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
621 * This function unpacks a single token (which should be in the range 0..31)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
622 * and returns a zero run (number of zero coefficients in current DCT matrix
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
623 * before next non-zero coefficient), the next DCT coefficient, and the
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
624 * number of consecutive, non-EOB'd DCT blocks to EOB.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
625 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
626 static void unpack_token(GetBitContext *gb, int token, int *zero_run,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
627 DCTELEM *coeff, int *eob_run)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
628 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
629 int sign;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
630
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
631 *zero_run = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
632 *eob_run = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
633 *coeff = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
634
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
635 debug_token(" vp3 token %d: ", token);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
636 switch (token) {
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 case 0:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
639 debug_token("DCT_EOB_TOKEN, EOB next block\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
640 *eob_run = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
641 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
642
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
643 case 1:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
644 debug_token("DCT_EOB_PAIR_TOKEN, EOB next 2 blocks\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
645 *eob_run = 2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
646 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
647
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
648 case 2:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
649 debug_token("DCT_EOB_TRIPLE_TOKEN, EOB next 3 blocks\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
650 *eob_run = 3;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
651 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
652
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
653 case 3:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
654 debug_token("DCT_REPEAT_RUN_TOKEN, ");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
655 *eob_run = get_bits(gb, 2) + 4;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
656 debug_token("EOB the next %d blocks\n", *eob_run);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
657 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
658
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
659 case 4:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
660 debug_token("DCT_REPEAT_RUN2_TOKEN, ");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
661 *eob_run = get_bits(gb, 3) + 8;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
662 debug_token("EOB the next %d blocks\n", *eob_run);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
663 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
664
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
665 case 5:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
666 debug_token("DCT_REPEAT_RUN3_TOKEN, ");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
667 *eob_run = get_bits(gb, 4) + 16;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
668 debug_token("EOB the next %d blocks\n", *eob_run);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
669 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
670
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
671 case 6:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
672 debug_token("DCT_REPEAT_RUN4_TOKEN, ");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
673 *eob_run = get_bits(gb, 12);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
674 debug_token("EOB the next %d blocks\n", *eob_run);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
675 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
676
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
677 case 7:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
678 debug_token("DCT_SHORT_ZRL_TOKEN, ");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
679 /* note that this token actually indicates that (3 extra bits) + 1 0s
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
680 * should be output; this case specifies a run of (3 EBs) 0s and a
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
681 * coefficient of 0. */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
682 *zero_run = get_bits(gb, 3);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
683 *coeff = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
684 debug_token("skip the next %d positions in output matrix\n", *zero_run + 1);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
685 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
686
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
687 case 8:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
688 debug_token("DCT_ZRL_TOKEN, ");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
689 /* note that this token actually indicates that (6 extra bits) + 1 0s
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
690 * should be output; this case specifies a run of (6 EBs) 0s and a
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
691 * coefficient of 0. */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
692 *zero_run = get_bits(gb, 6);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
693 *coeff = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
694 debug_token("skip the next %d positions in output matrix\n", *zero_run + 1);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
695 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
696
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
697 case 9:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
698 debug_token("ONE_TOKEN, output 1\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
699 *coeff = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
700 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
701
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
702 case 10:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
703 debug_token("MINUS_ONE_TOKEN, output -1\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
704 *coeff = -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
705 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
706
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
707 case 11:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
708 debug_token("TWO_TOKEN, output 2\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
709 *coeff = 2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
710 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
711
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
712 case 12:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
713 debug_token("MINUS_TWO_TOKEN, output -2\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
714 *coeff = -2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
715 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
716
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
717 case 13:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
718 case 14:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
719 case 15:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
720 case 16:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
721 debug_token("LOW_VAL_TOKENS, ");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
722 if (get_bits(gb, 1))
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
723 *coeff = -(3 + (token - 13));
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
724 else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
725 *coeff = 3 + (token - 13);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
726 debug_token("output %d\n", *coeff);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
727 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
728
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
729 case 17:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
730 debug_token("DCT_VAL_CATEGORY3, ");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
731 sign = get_bits(gb, 1);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
732 *coeff = 7 + get_bits(gb, 1);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
733 if (sign)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
734 *coeff = -(*coeff);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
735 debug_token("output %d\n", *coeff);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
736 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
737
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
738 case 18:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
739 debug_token("DCT_VAL_CATEGORY4, ");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
740 sign = get_bits(gb, 1);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
741 *coeff = 9 + get_bits(gb, 2);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
742 if (sign)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
743 *coeff = -(*coeff);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
744 debug_token("output %d\n", *coeff);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
745 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
746
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
747 case 19:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
748 debug_token("DCT_VAL_CATEGORY5, ");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
749 sign = get_bits(gb, 1);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
750 *coeff = 13 + get_bits(gb, 3);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
751 if (sign)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
752 *coeff = -(*coeff);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
753 debug_token("output %d\n", *coeff);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
754 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
755
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
756 case 20:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
757 debug_token("DCT_VAL_CATEGORY6, ");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
758 sign = get_bits(gb, 1);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
759 *coeff = 21 + get_bits(gb, 4);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
760 if (sign)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
761 *coeff = -(*coeff);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
762 debug_token("output %d\n", *coeff);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
763 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
764
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
765 case 21:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
766 debug_token("DCT_VAL_CATEGORY7, ");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
767 sign = get_bits(gb, 1);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
768 *coeff = 37 + get_bits(gb, 5);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
769 if (sign)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
770 *coeff = -(*coeff);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
771 debug_token("output %d\n", *coeff);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
772 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
773
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
774 case 22:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
775 debug_token("DCT_VAL_CATEGORY8, ");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
776 sign = get_bits(gb, 1);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
777 *coeff = 69 + get_bits(gb, 9);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
778 if (sign)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
779 *coeff = -(*coeff);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
780 debug_token("output %d\n", *coeff);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
781 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
782
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
783 case 23:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
784 case 24:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
785 case 25:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
786 case 26:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
787 case 27:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
788 debug_token("DCT_RUN_CATEGORY1, ");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
789 *zero_run = token - 22;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
790 if (get_bits(gb, 1))
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
791 *coeff = -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
792 else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
793 *coeff = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
794 debug_token("output %d 0s, then %d\n", *zero_run, *coeff);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
795 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
796
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
797 case 28:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
798 debug_token("DCT_RUN_CATEGORY1B, ");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
799 if (get_bits(gb, 1))
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
800 *coeff = -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
801 else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
802 *coeff = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
803 *zero_run = 6 + get_bits(gb, 2);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
804 debug_token("output %d 0s, then %d\n", *zero_run, *coeff);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
805 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
806
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
807 case 29:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
808 debug_token("DCT_RUN_CATEGORY1C, ");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
809 if (get_bits(gb, 1))
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
810 *coeff = -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
811 else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
812 *coeff = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
813 *zero_run = 10 + get_bits(gb, 3);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
814 debug_token("output %d 0s, then %d\n", *zero_run, *coeff);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
815 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
816
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
817 case 30:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
818 debug_token("DCT_RUN_CATEGORY2, ");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
819 sign = get_bits(gb, 1);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
820 *coeff = 2 + get_bits(gb, 1);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
821 if (sign)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
822 *coeff = -(*coeff);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
823 *zero_run = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
824 debug_token("output %d 0s, then %d\n", *zero_run, *coeff);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
825 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
826
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
827 case 31:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
828 debug_token("DCT_RUN_CATEGORY2, ");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
829 sign = get_bits(gb, 1);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
830 *coeff = 2 + get_bits(gb, 1);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
831 if (sign)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
832 *coeff = -(*coeff);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
833 *zero_run = 2 + get_bits(gb, 1);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
834 debug_token("output %d 0s, then %d\n", *zero_run, *coeff);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
835 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
836
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
837 default:
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1518
diff changeset
838 av_log(NULL, AV_LOG_ERROR, " vp3: help! Got a bad token: %d > 31\n", token);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
839 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
840
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
841 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
842 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
843
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
844 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
845 * This function wipes out all of the fragment data.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
846 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
847 static void init_frame(Vp3DecodeContext *s, GetBitContext *gb)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
848 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
849 int i;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
850
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
851 /* zero out all of the fragment information */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
852 s->coded_fragment_list_index = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
853 for (i = 0; i < s->fragment_count; i++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
854 s->all_fragments[i].coeff_count = 0;
1292
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
855 s->all_fragments[i].motion_x = 0xbeef;
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
856 s->all_fragments[i].motion_y = 0xbeef;
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
857 s->all_fragments[i].next_coeff= 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
858 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
859 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
860 s->coeffs[i].next= NULL;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
861 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
862 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
863
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
864 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
865 * This function sets of the dequantization tables used for a particular
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
866 * frame.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
867 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
868 static void init_dequantizer(Vp3DecodeContext *s)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
869 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
870
1867
7f7aa6ac3723 cut over to using new VP3 DSP functions and remove the old ones; bring
melanson
parents: 1864
diff changeset
871 int ac_scale_factor = s->coded_ac_scale_factor[s->quality_index];
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
872 int dc_scale_factor = s->coded_dc_scale_factor[s->quality_index];
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
873 int i, j;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
874
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
875 debug_vp3(" vp3: initializing dequantization tables\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
876
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
877 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
878 * Scale dequantizers:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
879 *
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
880 * quantizer * sf
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
881 * --------------
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
882 * 100
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
883 *
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
884 * where sf = dc_scale_factor for DC quantizer
1867
7f7aa6ac3723 cut over to using new VP3 DSP functions and remove the old ones; bring
melanson
parents: 1864
diff changeset
885 * or ac_scale_factor for AC quantizer
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
886 *
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
887 * Then, saturate the result to a lower limit of MIN_DEQUANT_VAL.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
888 */
1355
1c05f4290517 added the official VP3 IDCT (C implementation) as well as a grayscale
tmmm
parents: 1292
diff changeset
889 #define SCALER 4
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
890
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
891 /* scale DC quantizers */
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
892 s->intra_y_dequant[0] = s->coded_intra_y_dequant[0] * dc_scale_factor / 100;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
893 if (s->intra_y_dequant[0] < MIN_DEQUANT_VAL * 2)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
894 s->intra_y_dequant[0] = MIN_DEQUANT_VAL * 2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
895 s->intra_y_dequant[0] *= SCALER;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
896
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
897 s->intra_c_dequant[0] = s->coded_intra_c_dequant[0] * dc_scale_factor / 100;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
898 if (s->intra_c_dequant[0] < MIN_DEQUANT_VAL * 2)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
899 s->intra_c_dequant[0] = MIN_DEQUANT_VAL * 2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
900 s->intra_c_dequant[0] *= SCALER;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
901
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
902 s->inter_dequant[0] = s->coded_inter_dequant[0] * dc_scale_factor / 100;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
903 if (s->inter_dequant[0] < MIN_DEQUANT_VAL * 4)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
904 s->inter_dequant[0] = MIN_DEQUANT_VAL * 4;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
905 s->inter_dequant[0] *= SCALER;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
906
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
907 /* scale AC quantizers, zigzag at the same time in preparation for
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
908 * the dequantization phase */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
909 for (i = 1; i < 64; i++) {
2694
0d229cf036b9 fix idct permutation
michael
parents: 2693
diff changeset
910 int k= s->scantable.scantable[i];
0d229cf036b9 fix idct permutation
michael
parents: 2693
diff changeset
911 j = s->scantable.permutated[i];
0d229cf036b9 fix idct permutation
michael
parents: 2693
diff changeset
912
0d229cf036b9 fix idct permutation
michael
parents: 2693
diff changeset
913 s->intra_y_dequant[j] = s->coded_intra_y_dequant[k] * ac_scale_factor / 100;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
914 if (s->intra_y_dequant[j] < MIN_DEQUANT_VAL)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
915 s->intra_y_dequant[j] = MIN_DEQUANT_VAL;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
916 s->intra_y_dequant[j] *= SCALER;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
917
2694
0d229cf036b9 fix idct permutation
michael
parents: 2693
diff changeset
918 s->intra_c_dequant[j] = s->coded_intra_c_dequant[k] * ac_scale_factor / 100;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
919 if (s->intra_c_dequant[j] < MIN_DEQUANT_VAL)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
920 s->intra_c_dequant[j] = MIN_DEQUANT_VAL;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
921 s->intra_c_dequant[j] *= SCALER;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
922
2694
0d229cf036b9 fix idct permutation
michael
parents: 2693
diff changeset
923 s->inter_dequant[j] = s->coded_inter_dequant[k] * ac_scale_factor / 100;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
924 if (s->inter_dequant[j] < MIN_DEQUANT_VAL * 2)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
925 s->inter_dequant[j] = MIN_DEQUANT_VAL * 2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
926 s->inter_dequant[j] *= SCALER;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
927 }
1407
69f4f4fb8a50 fixing chroma MC
michaelni
parents: 1406
diff changeset
928
69f4f4fb8a50 fixing chroma MC
michaelni
parents: 1406
diff changeset
929 memset(s->qscale_table, (FFMAX(s->intra_y_dequant[1], s->intra_c_dequant[1])+8)/16, 512); //FIXME finetune
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
930
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
931 /* print debug information as requested */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
932 debug_dequantizers("intra Y dequantizers:\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
933 for (i = 0; i < 8; i++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
934 for (j = i * 8; j < i * 8 + 8; j++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
935 debug_dequantizers(" %4d,", s->intra_y_dequant[j]);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
936 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
937 debug_dequantizers("\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
938 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
939 debug_dequantizers("\n");
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 debug_dequantizers("intra C dequantizers:\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
942 for (i = 0; i < 8; i++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
943 for (j = i * 8; j < i * 8 + 8; j++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
944 debug_dequantizers(" %4d,", s->intra_c_dequant[j]);
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 debug_dequantizers("\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
947 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
948 debug_dequantizers("\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
949
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
950 debug_dequantizers("interframe dequantizers:\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
951 for (i = 0; i < 8; i++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
952 for (j = i * 8; j < i * 8 + 8; j++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
953 debug_dequantizers(" %4d,", s->inter_dequant[j]);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
954 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
955 debug_dequantizers("\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
956 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
957 debug_dequantizers("\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
958 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
959
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
960 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
961 * This function is used to fetch runs of 1s or 0s from the bitstream for
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
962 * use in determining which superblocks are fully and partially coded.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
963 *
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
964 * Codeword RunLength
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
965 * 0 1
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
966 * 10x 2-3
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
967 * 110x 4-5
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
968 * 1110xx 6-9
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
969 * 11110xxx 10-17
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
970 * 111110xxxx 18-33
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
971 * 111111xxxxxxxxxxxx 34-4129
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
972 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
973 static int get_superblock_run_length(GetBitContext *gb)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
974 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
975
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
976 if (get_bits(gb, 1) == 0)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
977 return 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
978
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
979 else if (get_bits(gb, 1) == 0)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
980 return (2 + get_bits(gb, 1));
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
981
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
982 else if (get_bits(gb, 1) == 0)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
983 return (4 + get_bits(gb, 1));
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
984
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
985 else if (get_bits(gb, 1) == 0)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
986 return (6 + get_bits(gb, 2));
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
987
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
988 else if (get_bits(gb, 1) == 0)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
989 return (10 + get_bits(gb, 3));
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
990
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
991 else if (get_bits(gb, 1) == 0)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
992 return (18 + get_bits(gb, 4));
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
993
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
994 else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
995 return (34 + get_bits(gb, 12));
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
996
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
997 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
998
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
999 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1000 * This function is used to fetch runs of 1s or 0s from the bitstream for
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1001 * use in determining which particular fragments are coded.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1002 *
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1003 * Codeword RunLength
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1004 * 0x 1-2
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1005 * 10x 3-4
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1006 * 110x 5-6
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1007 * 1110xx 7-10
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1008 * 11110xx 11-14
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1009 * 11111xxxx 15-30
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 static int get_fragment_run_length(GetBitContext *gb)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1012 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1013
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1014 if (get_bits(gb, 1) == 0)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1015 return (1 + get_bits(gb, 1));
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1016
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1017 else if (get_bits(gb, 1) == 0)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1018 return (3 + get_bits(gb, 1));
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1019
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1020 else if (get_bits(gb, 1) == 0)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1021 return (5 + get_bits(gb, 1));
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1022
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1023 else if (get_bits(gb, 1) == 0)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1024 return (7 + get_bits(gb, 2));
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1025
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1026 else if (get_bits(gb, 1) == 0)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1027 return (11 + get_bits(gb, 2));
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1028
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1029 else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1030 return (15 + get_bits(gb, 4));
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1031
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1032 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1033
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1034 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1035 * This function decodes a VLC from the bitstream and returns a number
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1036 * that ranges from 0..7. The number indicates which of the 8 coding
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1037 * modes to use.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1038 *
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1039 * VLC Number
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1040 * 0 0
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1041 * 10 1
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1042 * 110 2
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1043 * 1110 3
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1044 * 11110 4
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1045 * 111110 5
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1046 * 1111110 6
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1047 * 1111111 7
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 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1050 static int get_mode_code(GetBitContext *gb)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1051 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1052
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1053 if (get_bits(gb, 1) == 0)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1054 return 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1055
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1056 else if (get_bits(gb, 1) == 0)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1057 return 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1058
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1059 else if (get_bits(gb, 1) == 0)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1060 return 2;
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 else if (get_bits(gb, 1) == 0)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1063 return 3;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1064
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1065 else if (get_bits(gb, 1) == 0)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1066 return 4;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1067
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1068 else if (get_bits(gb, 1) == 0)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1069 return 5;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1070
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1071 else if (get_bits(gb, 1) == 0)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1072 return 6;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1073
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1074 else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1075 return 7;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1076
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1077 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1078
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1079 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1080 * This function extracts a motion vector from the bitstream using a VLC
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1081 * scheme. 3 bits are fetched from the bitstream and 1 of 8 actions is
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1082 * taken depending on the value on those 3 bits:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1083 *
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1084 * 0: return 0
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1085 * 1: return 1
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1086 * 2: return -1
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1087 * 3: if (next bit is 1) return -2, else return 2
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1088 * 4: if (next bit is 1) return -3, else return 3
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1089 * 5: return 4 + (next 2 bits), next bit is sign
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1090 * 6: return 8 + (next 3 bits), next bit is sign
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1091 * 7: return 16 + (next 4 bits), next bit is sign
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1092 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1093 static int get_motion_vector_vlc(GetBitContext *gb)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1094 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1095 int bits;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1096
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1097 bits = get_bits(gb, 3);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1098
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1099 switch(bits) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1100
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1101 case 0:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1102 bits = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1103 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1104
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1105 case 1:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1106 bits = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1107 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1108
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1109 case 2:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1110 bits = -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1111 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1112
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1113 case 3:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1114 if (get_bits(gb, 1) == 0)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1115 bits = 2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1116 else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1117 bits = -2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1118 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1119
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1120 case 4:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1121 if (get_bits(gb, 1) == 0)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1122 bits = 3;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1123 else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1124 bits = -3;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1125 break;
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 case 5:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1128 bits = 4 + get_bits(gb, 2);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1129 if (get_bits(gb, 1) == 1)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1130 bits = -bits;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1131 break;
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 case 6:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1134 bits = 8 + get_bits(gb, 3);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1135 if (get_bits(gb, 1) == 1)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1136 bits = -bits;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1137 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1138
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1139 case 7:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1140 bits = 16 + get_bits(gb, 4);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1141 if (get_bits(gb, 1) == 1)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1142 bits = -bits;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1143 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1144
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1145 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1146
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1147 return bits;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1148 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1149
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1150 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1151 * This function fetches a 5-bit number from the stream followed by
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1152 * a sign and calls it a motion vector.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1153 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1154 static int get_motion_vector_fixed(GetBitContext *gb)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1155 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1156
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1157 int bits;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1158
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1159 bits = get_bits(gb, 5);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1160
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1161 if (get_bits(gb, 1) == 1)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1162 bits = -bits;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1163
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1164 return bits;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1165 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1166
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1167 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1168 * This function unpacks all of the superblock/macroblock/fragment coding
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1169 * information from the bitstream.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1170 */
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1171 static int unpack_superblocks(Vp3DecodeContext *s, GetBitContext *gb)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1172 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1173 int bit = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1174 int current_superblock = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1175 int current_run = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1176 int decode_fully_flags = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1177 int decode_partial_blocks = 0;
1272
777d4145cdfb fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents: 1244
diff changeset
1178 int first_c_fragment_seen;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1179
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1180 int i, j;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1181 int current_fragment;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1182
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1183 debug_vp3(" vp3: unpacking superblock coding\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1184
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1185 if (s->keyframe) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1186
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1187 debug_vp3(" keyframe-- all superblocks are fully coded\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1188 memset(s->superblock_coding, SB_FULLY_CODED, s->superblock_count);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1189
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1190 } else {
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 /* unpack the list of partially-coded superblocks */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1193 bit = get_bits(gb, 1);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1194 /* toggle the bit because as soon as the first run length is
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1195 * fetched the bit will be toggled again */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1196 bit ^= 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1197 while (current_superblock < s->superblock_count) {
2705
2f9f51297218 optimizing rle decoding loops a little
michael
parents: 2704
diff changeset
1198 if (current_run-- == 0) {
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1199 bit ^= 1;
2703
3817945001ce replace get_superblock_run_length() with a VLC table
melanson
parents: 2702
diff changeset
1200 #if 1
3817945001ce replace get_superblock_run_length() with a VLC table
melanson
parents: 2702
diff changeset
1201 current_run = get_vlc2(gb,
2705
2f9f51297218 optimizing rle decoding loops a little
michael
parents: 2704
diff changeset
1202 s->superblock_run_length_vlc.table, 6, 2);
2f9f51297218 optimizing rle decoding loops a little
michael
parents: 2704
diff changeset
1203 if (current_run == 33)
2703
3817945001ce replace get_superblock_run_length() with a VLC table
melanson
parents: 2702
diff changeset
1204 current_run += get_bits(gb, 12);
3817945001ce replace get_superblock_run_length() with a VLC table
melanson
parents: 2702
diff changeset
1205 #else
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1206 current_run = get_superblock_run_length(gb);
2703
3817945001ce replace get_superblock_run_length() with a VLC table
melanson
parents: 2702
diff changeset
1207 #endif
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1208 debug_block_coding(" setting superblocks %d..%d to %s\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1209 current_superblock,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1210 current_superblock + current_run - 1,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1211 (bit) ? "partially coded" : "not coded");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1212
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1213 /* if any of the superblocks are not partially coded, flag
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1214 * 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
1215 if (bit == 0) {
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1216 decode_fully_flags = 1;
1292
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
1217 } else {
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
1218
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
1219 /* 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
1220 * superblocks */
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
1221 decode_partial_blocks = 1;
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
1222 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1223 }
2705
2f9f51297218 optimizing rle decoding loops a little
michael
parents: 2704
diff changeset
1224 s->superblock_coding[current_superblock++] = bit;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1225 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1226
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1227 /* 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
1228 * not marked as partially coded in the previous step */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1229 if (decode_fully_flags) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1230
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1231 current_superblock = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1232 current_run = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1233 bit = get_bits(gb, 1);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1234 /* toggle the bit because as soon as the first run length is
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1235 * fetched the bit will be toggled again */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1236 bit ^= 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1237 while (current_superblock < s->superblock_count) {
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 /* skip any superblocks already marked as partially coded */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1240 if (s->superblock_coding[current_superblock] == SB_NOT_CODED) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1241
2705
2f9f51297218 optimizing rle decoding loops a little
michael
parents: 2704
diff changeset
1242 if (current_run-- == 0) {
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1243 bit ^= 1;
2703
3817945001ce replace get_superblock_run_length() with a VLC table
melanson
parents: 2702
diff changeset
1244 #if 1
3817945001ce replace get_superblock_run_length() with a VLC table
melanson
parents: 2702
diff changeset
1245 current_run = get_vlc2(gb,
2705
2f9f51297218 optimizing rle decoding loops a little
michael
parents: 2704
diff changeset
1246 s->superblock_run_length_vlc.table, 6, 2);
2f9f51297218 optimizing rle decoding loops a little
michael
parents: 2704
diff changeset
1247 if (current_run == 33)
2703
3817945001ce replace get_superblock_run_length() with a VLC table
melanson
parents: 2702
diff changeset
1248 current_run += get_bits(gb, 12);
3817945001ce replace get_superblock_run_length() with a VLC table
melanson
parents: 2702
diff changeset
1249 #else
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1250 current_run = get_superblock_run_length(gb);
2703
3817945001ce replace get_superblock_run_length() with a VLC table
melanson
parents: 2702
diff changeset
1251 #endif
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1252 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1253
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1254 debug_block_coding(" setting superblock %d to %s\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1255 current_superblock,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1256 (bit) ? "fully coded" : "not coded");
2705
2f9f51297218 optimizing rle decoding loops a little
michael
parents: 2704
diff changeset
1257 s->superblock_coding[current_superblock] = 2*bit;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1258 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1259 current_superblock++;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1260 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1261 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1262
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1263 /* if there were partial blocks, initialize bitstream for
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1264 * unpacking fragment codings */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1265 if (decode_partial_blocks) {
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 current_run = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1268 bit = get_bits(gb, 1);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1269 /* toggle the bit because as soon as the first run length is
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1270 * fetched the bit will be toggled again */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1271 bit ^= 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1272 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1273 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1274
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1275 /* figure out which fragments are coded; iterate through each
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1276 * superblock (all planes) */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1277 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
1278 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
1279 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
1280 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
1281 first_c_fragment_seen = 0;
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
1282 memset(s->macroblock_coding, MODE_COPY, s->macroblock_count);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1283 for (i = 0; i < s->superblock_count; i++) {
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 /* iterate through all 16 fragments in a superblock */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1286 for (j = 0; j < 16; j++) {
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 /* if the fragment is in bounds, check its coding status */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1289 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
1290 if (current_fragment >= s->fragment_count) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1518
diff changeset
1291 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
1292 current_fragment, s->fragment_count);
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1293 return 1;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1294 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1295 if (current_fragment != -1) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1296 if (s->superblock_coding[i] == SB_NOT_CODED) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1297
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1298 /* copy all the fragments from the prior frame */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1299 s->all_fragments[current_fragment].coding_method =
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1300 MODE_COPY;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1301
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1302 } else if (s->superblock_coding[i] == SB_PARTIALLY_CODED) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1303
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1304 /* fragment may or may not be coded; this is the case
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1305 * that cares about the fragment coding runs */
2705
2f9f51297218 optimizing rle decoding loops a little
michael
parents: 2704
diff changeset
1306 if (current_run-- == 0) {
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1307 bit ^= 1;
2702
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
1308 #if 1
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
1309 current_run = get_vlc2(gb,
2705
2f9f51297218 optimizing rle decoding loops a little
michael
parents: 2704
diff changeset
1310 s->fragment_run_length_vlc.table, 5, 2);
2702
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
1311 #else
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1312 current_run = get_fragment_run_length(gb);
2702
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
1313 #endif
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1314 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1315
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1316 if (bit) {
1272
777d4145cdfb fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents: 1244
diff changeset
1317 /* default mode; actual mode will be decoded in
777d4145cdfb fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents: 1244
diff changeset
1318 * the next phase */
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1319 s->all_fragments[current_fragment].coding_method =
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1320 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
1321 s->all_fragments[current_fragment].next_coeff= s->coeffs + current_fragment;
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1322 s->coded_fragment_list[s->coded_fragment_list_index] =
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1323 current_fragment;
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1324 if ((current_fragment >= s->u_fragment_start) &&
1272
777d4145cdfb fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents: 1244
diff changeset
1325 (s->last_coded_y_fragment == -1) &&
777d4145cdfb fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents: 1244
diff changeset
1326 (!first_c_fragment_seen)) {
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1327 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
1328 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
1329 first_c_fragment_seen = 1;
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1330 }
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1331 s->coded_fragment_list_index++;
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
1332 s->macroblock_coding[s->all_fragments[current_fragment].macroblock] = MODE_INTER_NO_MV;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1333 debug_block_coding(" superblock %d is partially coded, fragment %d is coded\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1334 i, current_fragment);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1335 } else {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1336 /* not coded; copy this fragment from the prior frame */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1337 s->all_fragments[current_fragment].coding_method =
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1338 MODE_COPY;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1339 debug_block_coding(" superblock %d is partially coded, fragment %d is not coded\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1340 i, current_fragment);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1341 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1342
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1343 } else {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1344
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1345 /* fragments are fully coded in this superblock; actual
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1346 * coding will be determined in next step */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1347 s->all_fragments[current_fragment].coding_method =
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1348 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
1349 s->all_fragments[current_fragment].next_coeff= s->coeffs + current_fragment;
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1350 s->coded_fragment_list[s->coded_fragment_list_index] =
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1351 current_fragment;
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1352 if ((current_fragment >= s->u_fragment_start) &&
1272
777d4145cdfb fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents: 1244
diff changeset
1353 (s->last_coded_y_fragment == -1) &&
777d4145cdfb fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents: 1244
diff changeset
1354 (!first_c_fragment_seen)) {
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1355 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
1356 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
1357 first_c_fragment_seen = 1;
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1358 }
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1359 s->coded_fragment_list_index++;
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
1360 s->macroblock_coding[s->all_fragments[current_fragment].macroblock] = MODE_INTER_NO_MV;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1361 debug_block_coding(" superblock %d is fully coded, fragment %d is coded\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1362 i, current_fragment);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1363 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1364 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1365 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1366 }
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1367
1272
777d4145cdfb fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents: 1244
diff changeset
1368 if (!first_c_fragment_seen)
777d4145cdfb fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents: 1244
diff changeset
1369 /* 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
1370 s->last_coded_y_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
1371 else
1292
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
1372 /* 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
1373 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
1374
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1375 debug_block_coding(" %d total coded fragments, y: %d -> %d, c: %d -> %d\n",
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1376 s->coded_fragment_list_index,
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1377 s->first_coded_y_fragment,
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1378 s->last_coded_y_fragment,
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1379 s->first_coded_c_fragment,
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1380 s->last_coded_c_fragment);
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1381
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1382 return 0;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1383 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1384
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1385 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1386 * This function unpacks all the coding mode data for individual macroblocks
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1387 * from the bitstream.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1388 */
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1389 static int unpack_modes(Vp3DecodeContext *s, GetBitContext *gb)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1390 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1391 int i, j, k;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1392 int scheme;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1393 int current_macroblock;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1394 int current_fragment;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1395 int coding_mode;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1396
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1397 debug_vp3(" vp3: unpacking encoding modes\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1398
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1399 if (s->keyframe) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1400 debug_vp3(" keyframe-- all blocks are coded as INTRA\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1401
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1402 for (i = 0; i < s->fragment_count; i++)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1403 s->all_fragments[i].coding_method = MODE_INTRA;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1404
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1405 } else {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1406
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1407 /* fetch the mode coding scheme for this frame */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1408 scheme = get_bits(gb, 3);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1409 debug_modes(" using mode alphabet %d\n", scheme);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1410
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1411 /* is it a custom coding scheme? */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1412 if (scheme == 0) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1413 debug_modes(" custom mode alphabet ahead:\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1414 for (i = 0; i < 8; i++)
1233
5d66713e97e2 correct the custom coding mode alphabet, add some validation on the
tmmm
parents: 1230
diff changeset
1415 ModeAlphabet[scheme][get_bits(gb, 3)] = i;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1416 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1417
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1418 for (i = 0; i < 8; i++)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1419 debug_modes(" mode[%d][%d] = %d\n", scheme, i,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1420 ModeAlphabet[scheme][i]);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1421
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1422 /* iterate through all of the macroblocks that contain 1 or more
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1423 * coded fragments */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1424 for (i = 0; i < s->u_superblock_start; i++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1425
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1426 for (j = 0; j < 4; j++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1427 current_macroblock = s->superblock_macroblocks[i * 4 + j];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1428 if ((current_macroblock == -1) ||
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
1429 (s->macroblock_coding[current_macroblock] == MODE_COPY))
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1430 continue;
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1431 if (current_macroblock >= s->macroblock_count) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1518
diff changeset
1432 av_log(s->avctx, AV_LOG_ERROR, " vp3:unpack_modes(): bad macroblock number (%d >= %d)\n",
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1433 current_macroblock, s->macroblock_count);
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1434 return 1;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1435 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1436
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1437 /* mode 7 means get 3 bits for each coding mode */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1438 if (scheme == 7)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1439 coding_mode = get_bits(gb, 3);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1440 else
2702
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
1441 {
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
1442 #if 1
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
1443 coding_mode = ModeAlphabet[scheme]
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
1444 [get_vlc2(gb, s->mode_code_vlc.table, 3, 3)];
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
1445 #else
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1446 coding_mode = ModeAlphabet[scheme][get_mode_code(gb)];
2702
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
1447 #endif
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
1448 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1449
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
1450 s->macroblock_coding[current_macroblock] = coding_mode;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1451 for (k = 0; k < 6; k++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1452 current_fragment =
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1453 s->macroblock_fragments[current_macroblock * 6 + k];
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1454 if (current_fragment == -1)
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1455 continue;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1456 if (current_fragment >= s->fragment_count) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1518
diff changeset
1457 av_log(s->avctx, AV_LOG_ERROR, " vp3:unpack_modes(): bad fragment number (%d >= %d)\n",
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1458 current_fragment, s->fragment_count);
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1459 return 1;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1460 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1461 if (s->all_fragments[current_fragment].coding_method !=
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1462 MODE_COPY)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1463 s->all_fragments[current_fragment].coding_method =
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1464 coding_mode;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1465 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1466
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1467 debug_modes(" coding method for macroblock starting @ fragment %d = %d\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1468 s->macroblock_fragments[current_macroblock * 6], coding_mode);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1469 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1470 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1471 }
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1472
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1473 return 0;
1229
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
1474 }
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
1475
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
1476 /*
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1477 * This function unpacks all the motion vectors for the individual
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1478 * macroblocks from the bitstream.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1479 */
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1480 static int unpack_vectors(Vp3DecodeContext *s, GetBitContext *gb)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1481 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1482 int i, j, k;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1483 int coding_mode;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1484 int motion_x[6];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1485 int motion_y[6];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1486 int last_motion_x = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1487 int last_motion_y = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1488 int prior_last_motion_x = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1489 int prior_last_motion_y = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1490 int current_macroblock;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1491 int current_fragment;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1492
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1493 debug_vp3(" vp3: unpacking motion vectors\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1494 if (s->keyframe) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1495
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1496 debug_vp3(" keyframe-- there are no motion vectors\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1497
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1498 } else {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1499
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1500 memset(motion_x, 0, 6 * sizeof(int));
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1501 memset(motion_y, 0, 6 * sizeof(int));
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1502
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1503 /* coding mode 0 is the VLC scheme; 1 is the fixed code scheme */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1504 coding_mode = get_bits(gb, 1);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1505 debug_vectors(" using %s scheme for unpacking motion vectors\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1506 (coding_mode == 0) ? "VLC" : "fixed-length");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1507
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1508 /* iterate through all of the macroblocks that contain 1 or more
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1509 * coded fragments */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1510 for (i = 0; i < s->u_superblock_start; i++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1511
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1512 for (j = 0; j < 4; j++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1513 current_macroblock = s->superblock_macroblocks[i * 4 + j];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1514 if ((current_macroblock == -1) ||
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
1515 (s->macroblock_coding[current_macroblock] == MODE_COPY))
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1516 continue;
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1517 if (current_macroblock >= s->macroblock_count) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1518
diff changeset
1518 av_log(s->avctx, AV_LOG_ERROR, " vp3:unpack_vectors(): bad macroblock number (%d >= %d)\n",
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1519 current_macroblock, s->macroblock_count);
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1520 return 1;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1521 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1522
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1523 current_fragment = s->macroblock_fragments[current_macroblock * 6];
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1524 if (current_fragment >= s->fragment_count) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1518
diff changeset
1525 av_log(s->avctx, AV_LOG_ERROR, " vp3:unpack_vectors(): bad fragment number (%d >= %d\n",
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1526 current_fragment, s->fragment_count);
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1527 return 1;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1528 }
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
1529 switch (s->macroblock_coding[current_macroblock]) {
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1530
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1531 case MODE_INTER_PLUS_MV:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1532 case MODE_GOLDEN_MV:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1533 /* all 6 fragments use the same motion vector */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1534 if (coding_mode == 0) {
2709
a119d4eb53d7 fix 4MV MC and reinstate new MC VLC
melanson
parents: 2706
diff changeset
1535 #if 1
2702
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
1536 motion_x[0] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)];
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
1537 motion_y[0] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)];
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
1538 #else
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1539 motion_x[0] = get_motion_vector_vlc(gb);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1540 motion_y[0] = get_motion_vector_vlc(gb);
2702
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
1541 #endif
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1542 } else {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1543 motion_x[0] = get_motion_vector_fixed(gb);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1544 motion_y[0] = get_motion_vector_fixed(gb);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1545 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1546 for (k = 1; k < 6; k++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1547 motion_x[k] = motion_x[0];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1548 motion_y[k] = motion_y[0];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1549 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1550
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1551 /* vector maintenance, only on MODE_INTER_PLUS_MV */
1292
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
1552 if (s->macroblock_coding[current_macroblock] ==
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1553 MODE_INTER_PLUS_MV) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1554 prior_last_motion_x = last_motion_x;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1555 prior_last_motion_y = last_motion_y;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1556 last_motion_x = motion_x[0];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1557 last_motion_y = motion_y[0];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1558 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1559 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1560
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1561 case MODE_INTER_FOURMV:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1562 /* fetch 4 vectors from the bitstream, one for each
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1563 * Y fragment, then average for the C fragment vectors */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1564 motion_x[4] = motion_y[4] = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1565 for (k = 0; k < 4; k++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1566 if (coding_mode == 0) {
2709
a119d4eb53d7 fix 4MV MC and reinstate new MC VLC
melanson
parents: 2706
diff changeset
1567 #if 1
a119d4eb53d7 fix 4MV MC and reinstate new MC VLC
melanson
parents: 2706
diff changeset
1568 motion_x[k] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)];
a119d4eb53d7 fix 4MV MC and reinstate new MC VLC
melanson
parents: 2706
diff changeset
1569 motion_y[k] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)];
2702
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
1570 #else
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1571 motion_x[k] = get_motion_vector_vlc(gb);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1572 motion_y[k] = get_motion_vector_vlc(gb);
2702
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
1573 #endif
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1574 } else {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1575 motion_x[k] = get_motion_vector_fixed(gb);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1576 motion_y[k] = get_motion_vector_fixed(gb);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1577 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1578 motion_x[4] += motion_x[k];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1579 motion_y[4] += motion_y[k];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1580 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1581
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1582 if (motion_x[4] >= 0)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1583 motion_x[4] = (motion_x[4] + 2) / 4;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1584 else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1585 motion_x[4] = (motion_x[4] - 2) / 4;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1586 motion_x[5] = motion_x[4];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1587
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1588 if (motion_y[4] >= 0)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1589 motion_y[4] = (motion_y[4] + 2) / 4;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1590 else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1591 motion_y[4] = (motion_y[4] - 2) / 4;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1592 motion_y[5] = motion_y[4];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1593
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1594 /* vector maintenance; vector[3] is treated as the
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1595 * last vector in this case */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1596 prior_last_motion_x = last_motion_x;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1597 prior_last_motion_y = last_motion_y;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1598 last_motion_x = motion_x[3];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1599 last_motion_y = motion_y[3];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1600 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1601
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1602 case MODE_INTER_LAST_MV:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1603 /* all 6 fragments use the last motion vector */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1604 motion_x[0] = last_motion_x;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1605 motion_y[0] = last_motion_y;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1606 for (k = 1; k < 6; k++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1607 motion_x[k] = motion_x[0];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1608 motion_y[k] = motion_y[0];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1609 }
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 /* no vector maintenance (last vector remains the
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1612 * last vector) */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1613 break;
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 case MODE_INTER_PRIOR_LAST:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1616 /* all 6 fragments use the motion vector prior to the
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1617 * last motion vector */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1618 motion_x[0] = prior_last_motion_x;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1619 motion_y[0] = prior_last_motion_y;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1620 for (k = 1; k < 6; k++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1621 motion_x[k] = motion_x[0];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1622 motion_y[k] = motion_y[0];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1623 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1624
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1625 /* vector maintenance */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1626 prior_last_motion_x = last_motion_x;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1627 prior_last_motion_y = last_motion_y;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1628 last_motion_x = motion_x[0];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1629 last_motion_y = motion_y[0];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1630 break;
1229
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
1631
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
1632 default:
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
1633 /* covers intra, inter without MV, golden without MV */
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
1634 memset(motion_x, 0, 6 * sizeof(int));
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
1635 memset(motion_y, 0, 6 * sizeof(int));
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
1636
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
1637 /* no vector maintenance */
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
1638 break;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1639 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1640
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1641 /* assign the motion vectors to the correct fragments */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1642 debug_vectors(" vectors for macroblock starting @ fragment %d (coding method %d):\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1643 current_fragment,
1292
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
1644 s->macroblock_coding[current_macroblock]);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1645 for (k = 0; k < 6; k++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1646 current_fragment =
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1647 s->macroblock_fragments[current_macroblock * 6 + k];
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1648 if (current_fragment == -1)
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1649 continue;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1650 if (current_fragment >= s->fragment_count) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1518
diff changeset
1651 av_log(s->avctx, AV_LOG_ERROR, " vp3:unpack_vectors(): bad fragment number (%d >= %d)\n",
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1652 current_fragment, s->fragment_count);
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1653 return 1;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1654 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1655 s->all_fragments[current_fragment].motion_x = motion_x[k];
1229
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
1656 s->all_fragments[current_fragment].motion_y = motion_y[k];
1292
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
1657 debug_vectors(" vector %d: fragment %d = (%d, %d)\n",
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
1658 k, current_fragment, motion_x[k], motion_y[k]);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1659 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1660 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1661 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1662 }
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1663
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1664 return 0;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1665 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1666
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1667 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1668 * 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
1669 * 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
1670 * 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
1671 * 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
1672 * levels (since different coefficient types require different VLC tables.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1673 *
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1674 * 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
1675 * 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
1676 * 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
1677 * be passed into the next call to this same function.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1678 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1679 static int unpack_vlcs(Vp3DecodeContext *s, GetBitContext *gb,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1680 VLC *table, int coeff_index,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1681 int first_fragment, int last_fragment,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1682 int eob_run)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1683 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1684 int i;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1685 int token;
2712
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1686 int zero_run = 0;
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1687 DCTELEM coeff = 0;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1688 Vp3Fragment *fragment;
2694
0d229cf036b9 fix idct permutation
michael
parents: 2693
diff changeset
1689 uint8_t *perm= s->scantable.permutated;
2712
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1690 int bits_to_get;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1691
1272
777d4145cdfb fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents: 1244
diff changeset
1692 if ((first_fragment >= s->fragment_count) ||
1244
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
1693 (last_fragment >= s->fragment_count)) {
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
1694
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1518
diff changeset
1695 av_log(s->avctx, AV_LOG_ERROR, " vp3:unpack_vlcs(): bad fragment number (%d -> %d ?)\n",
1244
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
1696 first_fragment, last_fragment);
1272
777d4145cdfb fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents: 1244
diff changeset
1697 return 0;
1244
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
1698 }
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
1699
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1700 for (i = first_fragment; i <= last_fragment; i++) {
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1701
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1702 fragment = &s->all_fragments[s->coded_fragment_list[i]];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1703 if (fragment->coeff_count > coeff_index)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1704 continue;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1705
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1706 if (!eob_run) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1707 /* decode a VLC into a token */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1708 token = get_vlc2(gb, table->table, 5, 3);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1709 debug_vlc(" token = %2d, ", token);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1710 /* 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
1711 #if 1
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1712 if (token <= 6) {
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1713 eob_run = eob_run_base[token];
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1714 if (eob_run_get_bits[token])
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1715 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
1716 coeff = zero_run = 0;
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1717 } else {
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1718 bits_to_get = coeff_get_bits[token];
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1719 if (!bits_to_get)
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1720 coeff = coeff_tables[token][0];
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1721 else
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1722 coeff = coeff_tables[token][get_bits(gb, bits_to_get)];
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1723
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1724 zero_run = zero_run_base[token];
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1725 if (zero_run_get_bits[token])
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1726 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
1727 }
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1728 #else
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1729 unpack_token(gb, token, &zero_run, &coeff, &eob_run);
2712
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1730 #endif
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1731 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1732
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1733 if (!eob_run) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1734 fragment->coeff_count += zero_run;
2714
b008c78467e6 use O(number of non zero coeffs) instead of O(number of coeffs) storage for the coefficient colleting/reordering
michael
parents: 2712
diff changeset
1735 if (fragment->coeff_count < 64){
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
1736 fragment->next_coeff->coeff= 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
1737 fragment->next_coeff->index= perm[fragment->coeff_count++]; //FIXME perm here already?
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
1738 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
1739 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
1740 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
1741 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1742 debug_vlc(" fragment %d coeff = %d\n",
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
1743 s->coded_fragment_list[i], fragment->next_coeff[coeff_index]);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1744 } else {
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
1745 fragment->coeff_count |= 128;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1746 debug_vlc(" fragment %d eob with %d coefficients\n",
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
1747 s->coded_fragment_list[i], fragment->coeff_count&127);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1748 eob_run--;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1749 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1750 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1751
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1752 return eob_run;
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 function unpacks all of the DCT coefficient data from the
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1757 * bitstream.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1758 */
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1759 static int unpack_dct_coeffs(Vp3DecodeContext *s, GetBitContext *gb)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1760 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1761 int i;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1762 int dc_y_table;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1763 int dc_c_table;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1764 int ac_y_table;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1765 int ac_c_table;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1766 int residual_eob_run = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1767
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1768 /* fetch the DC table indices */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1769 dc_y_table = get_bits(gb, 4);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1770 dc_c_table = get_bits(gb, 4);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1771
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1772 /* unpack the Y plane DC coefficients */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1773 debug_vp3(" vp3: unpacking Y plane DC coefficients using table %d\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1774 dc_y_table);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1775 residual_eob_run = unpack_vlcs(s, gb, &s->dc_vlc[dc_y_table], 0,
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1776 s->first_coded_y_fragment, s->last_coded_y_fragment, residual_eob_run);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1777
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1778 /* unpack the C plane DC coefficients */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1779 debug_vp3(" vp3: unpacking C plane DC coefficients using table %d\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1780 dc_c_table);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1781 residual_eob_run = unpack_vlcs(s, gb, &s->dc_vlc[dc_c_table], 0,
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1782 s->first_coded_c_fragment, s->last_coded_c_fragment, residual_eob_run);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1783
1233
5d66713e97e2 correct the custom coding mode alphabet, add some validation on the
tmmm
parents: 1230
diff changeset
1784 /* fetch the AC table indices */
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1785 ac_y_table = get_bits(gb, 4);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1786 ac_c_table = get_bits(gb, 4);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1787
1233
5d66713e97e2 correct the custom coding mode alphabet, add some validation on the
tmmm
parents: 1230
diff changeset
1788 /* unpack the group 1 AC coefficients (coeffs 1-5) */
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1789 for (i = 1; i <= 5; i++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1790
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1791 debug_vp3(" vp3: unpacking level %d Y plane AC coefficients using table %d\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1792 i, ac_y_table);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1793 residual_eob_run = unpack_vlcs(s, gb, &s->ac_vlc_1[ac_y_table], i,
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1794 s->first_coded_y_fragment, s->last_coded_y_fragment, residual_eob_run);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1795
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1796 debug_vp3(" vp3: unpacking level %d C plane AC coefficients using table %d\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1797 i, ac_c_table);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1798 residual_eob_run = unpack_vlcs(s, gb, &s->ac_vlc_1[ac_c_table], i,
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1799 s->first_coded_c_fragment, s->last_coded_c_fragment, residual_eob_run);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1800 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1801
1233
5d66713e97e2 correct the custom coding mode alphabet, add some validation on the
tmmm
parents: 1230
diff changeset
1802 /* unpack the group 2 AC coefficients (coeffs 6-14) */
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1803 for (i = 6; i <= 14; i++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1804
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1805 debug_vp3(" vp3: unpacking level %d Y plane AC coefficients using table %d\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1806 i, ac_y_table);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1807 residual_eob_run = unpack_vlcs(s, gb, &s->ac_vlc_2[ac_y_table], i,
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1808 s->first_coded_y_fragment, s->last_coded_y_fragment, residual_eob_run);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1809
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1810 debug_vp3(" vp3: unpacking level %d C plane AC coefficients using table %d\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1811 i, ac_c_table);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1812 residual_eob_run = unpack_vlcs(s, gb, &s->ac_vlc_2[ac_c_table], i,
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1813 s->first_coded_c_fragment, s->last_coded_c_fragment, residual_eob_run);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1814 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1815
1233
5d66713e97e2 correct the custom coding mode alphabet, add some validation on the
tmmm
parents: 1230
diff changeset
1816 /* unpack the group 3 AC coefficients (coeffs 15-27) */
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1817 for (i = 15; i <= 27; i++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1818
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1819 debug_vp3(" vp3: unpacking level %d Y plane AC coefficients using table %d\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1820 i, ac_y_table);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1821 residual_eob_run = unpack_vlcs(s, gb, &s->ac_vlc_3[ac_y_table], i,
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1822 s->first_coded_y_fragment, s->last_coded_y_fragment, residual_eob_run);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1823
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1824 debug_vp3(" vp3: unpacking level %d C plane AC coefficients using table %d\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1825 i, ac_c_table);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1826 residual_eob_run = unpack_vlcs(s, gb, &s->ac_vlc_3[ac_c_table], i,
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1827 s->first_coded_c_fragment, s->last_coded_c_fragment, residual_eob_run);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1828 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1829
1233
5d66713e97e2 correct the custom coding mode alphabet, add some validation on the
tmmm
parents: 1230
diff changeset
1830 /* unpack the group 4 AC coefficients (coeffs 28-63) */
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1831 for (i = 28; i <= 63; i++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1832
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1833 debug_vp3(" vp3: unpacking level %d Y plane AC coefficients using table %d\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1834 i, ac_y_table);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1835 residual_eob_run = unpack_vlcs(s, gb, &s->ac_vlc_4[ac_y_table], i,
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1836 s->first_coded_y_fragment, s->last_coded_y_fragment, residual_eob_run);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1837
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1838 debug_vp3(" vp3: unpacking level %d C plane AC coefficients using table %d\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1839 i, ac_c_table);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1840 residual_eob_run = unpack_vlcs(s, gb, &s->ac_vlc_4[ac_c_table], i,
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1841 s->first_coded_c_fragment, s->last_coded_c_fragment, residual_eob_run);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1842 }
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1843
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1844 return 0;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1845 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1846
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1847 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1848 * This function reverses the DC prediction for each coded fragment in
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1849 * the frame. Much of this function is adapted directly from the original
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1850 * VP3 source code.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1851 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1852 #define COMPATIBLE_FRAME(x) \
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1853 (compatible_frame[s->all_fragments[x].coding_method] == current_frame_type)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1854 #define FRAME_CODED(x) (s->all_fragments[x].coding_method != MODE_COPY)
2714
b008c78467e6 use O(number of non zero coeffs) instead of O(number of coeffs) storage for the coefficient colleting/reordering
michael
parents: 2712
diff changeset
1855 #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
1856 static inline int iabs (int x) { return ((x < 0) ? -x : x); }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1857
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1858 static void reverse_dc_prediction(Vp3DecodeContext *s,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1859 int first_fragment,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1860 int fragment_width,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1861 int fragment_height)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1862 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1863
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1864 #define PUL 8
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1865 #define PU 4
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1866 #define PUR 2
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1867 #define PL 1
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1868
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1869 int x, y;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1870 int i = first_fragment;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1871
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1872 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1873 * Fragment prediction groups:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1874 *
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1875 * 32222222226
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1876 * 10000000004
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1877 * 10000000004
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1878 * 10000000004
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1879 * 10000000004
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1880 *
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1881 * Note: Groups 5 and 7 do not exist as it would mean that the
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1882 * fragment's x coordinate is both 0 and (width - 1) at the same time.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1883 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1884 int predictor_group;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1885 short predicted_dc;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1886
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1887 /* validity flags for the left, up-left, up, and up-right fragments */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1888 int fl, ful, fu, fur;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1889
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1890 /* 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
1891 int vl, vul, vu, vur;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1892
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1893 /* indices for the left, up-left, up, and up-right fragments */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1894 int l, ul, u, ur;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1895
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1896 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1897 * The 6 fields mean:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1898 * 0: up-left multiplier
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1899 * 1: up multiplier
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1900 * 2: up-right multiplier
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1901 * 3: left multiplier
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1902 * 4: mask
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1903 * 5: right bit shift divisor (e.g., 7 means >>=7, a.k.a. div by 128)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1904 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1905 int predictor_transform[16][6] = {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1906 { 0, 0, 0, 0, 0, 0 },
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1907 { 0, 0, 0, 1, 0, 0 }, // PL
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1908 { 0, 0, 1, 0, 0, 0 }, // PUR
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1909 { 0, 0, 53, 75, 127, 7 }, // PUR|PL
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1910 { 0, 1, 0, 0, 0, 0 }, // PU
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1911 { 0, 1, 0, 1, 1, 1 }, // PU|PL
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1912 { 0, 1, 0, 0, 0, 0 }, // PU|PUR
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1913 { 0, 0, 53, 75, 127, 7 }, // PU|PUR|PL
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1914 { 1, 0, 0, 0, 0, 0 }, // PUL
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1915 { 0, 0, 0, 1, 0, 0 }, // PUL|PL
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1916 { 1, 0, 1, 0, 1, 1 }, // PUL|PUR
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1917 { 0, 0, 53, 75, 127, 7 }, // PUL|PUR|PL
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1918 { 0, 1, 0, 0, 0, 0 }, // PUL|PU
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1919 {-26, 29, 0, 29, 31, 5 }, // PUL|PU|PL
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1920 { 3, 10, 3, 0, 15, 4 }, // PUL|PU|PUR
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1921 {-26, 29, 0, 29, 31, 5 } // PUL|PU|PUR|PL
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
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1924 /* 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
1925 * 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
1926 * have a frame number of 0. That means INTRA blocks can only predict
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1927 * from other INTRA blocks. There are 2 golden frame coding types;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1928 * blocks encoding in these modes can only predict from other blocks
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1929 * that were encoded with these 1 of these 2 modes. */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1930 unsigned char compatible_frame[8] = {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1931 1, /* MODE_INTER_NO_MV */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1932 0, /* MODE_INTRA */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1933 1, /* MODE_INTER_PLUS_MV */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1934 1, /* MODE_INTER_LAST_MV */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1935 1, /* MODE_INTER_PRIOR_MV */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1936 2, /* MODE_USING_GOLDEN */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1937 2, /* MODE_GOLDEN_MV */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1938 1 /* MODE_INTER_FOUR_MV */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1939 };
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1940 int current_frame_type;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1941
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1942 /* 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
1943 short last_dc[3];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1944
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1945 int transform = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1946
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1947 debug_vp3(" vp3: reversing DC prediction\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1948
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1949 vul = vu = vur = vl = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1950 last_dc[0] = last_dc[1] = last_dc[2] = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1951
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1952 /* for each fragment row... */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1953 for (y = 0; y < fragment_height; y++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1954
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1955 /* for each fragment in a row... */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1956 for (x = 0; x < fragment_width; x++, i++) {
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 /* reverse prediction if this block was coded */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1959 if (s->all_fragments[i].coding_method != MODE_COPY) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1960
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1961 current_frame_type =
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1962 compatible_frame[s->all_fragments[i].coding_method];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1963 predictor_group = (x == 0) + ((y == 0) << 1) +
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1964 ((x + 1 == fragment_width) << 2);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1965 debug_dc_pred(" frag %d: group %d, orig DC = %d, ",
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
1966 i, predictor_group, DC_COEFF(i));
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1967
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1968 switch (predictor_group) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1969
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1970 case 0:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1971 /* main body of fragments; consider all 4 possible
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1972 * fragments for prediction */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1973
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1974 /* calculate the indices of the predicting fragments */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1975 ul = i - fragment_width - 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1976 u = i - fragment_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1977 ur = i - fragment_width + 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1978 l = i - 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1979
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1980 /* fetch the DC values for the predicting fragments */
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
1981 vul = DC_COEFF(ul);
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
1982 vu = DC_COEFF(u);
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
1983 vur = DC_COEFF(ur);
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
1984 vl = DC_COEFF(l);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1985
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1986 /* figure out which fragments are valid */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1987 ful = FRAME_CODED(ul) && COMPATIBLE_FRAME(ul);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1988 fu = FRAME_CODED(u) && COMPATIBLE_FRAME(u);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1989 fur = FRAME_CODED(ur) && COMPATIBLE_FRAME(ur);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1990 fl = FRAME_CODED(l) && COMPATIBLE_FRAME(l);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1991
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1992 /* decide which predictor transform to use */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1993 transform = (fl*PL) | (fu*PU) | (ful*PUL) | (fur*PUR);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1994
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1995 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1996
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1997 case 1:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1998 /* left column of fragments, not including top corner;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1999 * only consider up and up-right fragments */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2000
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2001 /* calculate the indices of the predicting fragments */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2002 u = i - fragment_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2003 ur = i - fragment_width + 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2004
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2005 /* fetch the DC values for the predicting fragments */
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
2006 vu = DC_COEFF(u);
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
2007 vur = DC_COEFF(ur);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2008
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2009 /* figure out which fragments are valid */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2010 fur = FRAME_CODED(ur) && COMPATIBLE_FRAME(ur);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2011 fu = FRAME_CODED(u) && COMPATIBLE_FRAME(u);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2012
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2013 /* decide which predictor transform to use */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2014 transform = (fu*PU) | (fur*PUR);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2015
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2016 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2017
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2018 case 2:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2019 case 6:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2020 /* top row of fragments, not including top-left frag;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2021 * only consider the left fragment for prediction */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2022
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2023 /* calculate the indices of the predicting fragments */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2024 l = i - 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2025
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2026 /* fetch the DC values for the predicting fragments */
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
2027 vl = DC_COEFF(l);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2028
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2029 /* figure out which fragments are valid */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2030 fl = FRAME_CODED(l) && COMPATIBLE_FRAME(l);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2031
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2032 /* decide which predictor transform to use */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2033 transform = (fl*PL);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2034
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2035 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2036
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2037 case 3:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2038 /* top-left fragment */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2039
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2040 /* nothing to predict from in this case */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2041 transform = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2042
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2043 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2044
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2045 case 4:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2046 /* right column of fragments, not including top corner;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2047 * consider up-left, up, and left fragments for
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2048 * prediction */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2049
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2050 /* calculate the indices of the predicting fragments */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2051 ul = i - fragment_width - 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2052 u = i - fragment_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2053 l = i - 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2054
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2055 /* fetch the DC values for the predicting fragments */
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
2056 vul = DC_COEFF(ul);
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
2057 vu = DC_COEFF(u);
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
2058 vl = DC_COEFF(l);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2059
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2060 /* figure out which fragments are valid */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2061 ful = FRAME_CODED(ul) && COMPATIBLE_FRAME(ul);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2062 fu = FRAME_CODED(u) && COMPATIBLE_FRAME(u);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2063 fl = FRAME_CODED(l) && COMPATIBLE_FRAME(l);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2064
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2065 /* decide which predictor transform to use */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2066 transform = (fl*PL) | (fu*PU) | (ful*PUL);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2067
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2068 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2069
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2070 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2071
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2072 debug_dc_pred("transform = %d, ", transform);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2073
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2074 if (transform == 0) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2075
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2076 /* if there were no fragments to predict from, use last
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2077 * 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
2078 predicted_dc = last_dc[current_frame_type];
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2079 debug_dc_pred("from last DC (%d) = %d\n",
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
2080 current_frame_type, DC_COEFF(i));
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2081
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2082 } else {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2083
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2084 /* apply the appropriate predictor transform */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2085 predicted_dc =
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2086 (predictor_transform[transform][0] * vul) +
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2087 (predictor_transform[transform][1] * vu) +
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2088 (predictor_transform[transform][2] * vur) +
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2089 (predictor_transform[transform][3] * vl);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2090
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2091 /* if there is a shift value in the transform, add
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2092 * the sign bit before the shift */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2093 if (predictor_transform[transform][5] != 0) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2094 predicted_dc += ((predicted_dc >> 15) &
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2095 predictor_transform[transform][4]);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2096 predicted_dc >>= predictor_transform[transform][5];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2097 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2098
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2099 /* check for outranging on the [ul u l] and
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2100 * [ul u ur l] predictors */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2101 if ((transform == 13) || (transform == 15)) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2102 if (iabs(predicted_dc - vu) > 128)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2103 predicted_dc = vu;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2104 else if (iabs(predicted_dc - vl) > 128)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2105 predicted_dc = vl;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2106 else if (iabs(predicted_dc - vul) > 128)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2107 predicted_dc = vul;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2108 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2109
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2110 debug_dc_pred("from pred DC = %d\n",
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
2111 DC_COEFF(i));
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2112 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2113
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
2114 /* 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
2115 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
2116 *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
2117 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
2118 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
2119 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
2120 }
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
2121 s->coeffs[i].coeff += predicted_dc;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2122 /* 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
2123 last_dc[current_frame_type] = DC_COEFF(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
2124 if(DC_COEFF(i) && !(s->all_fragments[i].coeff_count&127)){
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
2125 s->all_fragments[i].coeff_count= 129;
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
2126 // 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
2127 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
2128 (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
2129 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2130 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2131 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2132 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2133 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2134
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2135 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2136 * This function performs the final rendering of each fragment's data
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2137 * onto the output frame.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2138 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2139 static void render_fragments(Vp3DecodeContext *s,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2140 int first_fragment,
1229
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2141 int width,
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2142 int height,
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2143 int plane /* 0 = Y, 1 = U, 2 = V */)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2144 {
2693
02925a3903b6 porting vp3 idct over to lavc idct api
michael
parents: 2692
diff changeset
2145 int x, y, j;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2146 int m, n;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2147 int i = first_fragment;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2148 int16_t *dequantizer;
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
2149 DCTELEM __align16 block[64];
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2150 unsigned char *output_plane;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2151 unsigned char *last_plane;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2152 unsigned char *golden_plane;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2153 int stride;
2031
4225c131a2eb warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents: 2028
diff changeset
2154 int motion_x = 0xdeadbeef, motion_y = 0xdeadbeef;
1233
5d66713e97e2 correct the custom coding mode alphabet, add some validation on the
tmmm
parents: 1230
diff changeset
2155 int upper_motion_limit, lower_motion_limit;
1229
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2156 int motion_halfpel_index;
1406
ae5524a3cd08 MC rounding fixed?
michaelni
parents: 1405
diff changeset
2157 uint8_t *motion_source;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2158
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2159 debug_vp3(" vp3: rendering final fragments for %s\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2160 (plane == 0) ? "Y plane" : (plane == 1) ? "U plane" : "V plane");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2161
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2162 /* set up plane-specific parameters */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2163 if (plane == 0) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2164 output_plane = s->current_frame.data[0];
1227
184c480cefc3 fix decoder so that ffmpeg does not crash, at least not right away
tmmm
parents: 1224
diff changeset
2165 last_plane = s->last_frame.data[0];
184c480cefc3 fix decoder so that ffmpeg does not crash, at least not right away
tmmm
parents: 1224
diff changeset
2166 golden_plane = s->golden_frame.data[0];
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
2167 stride = s->current_frame.linesize[0];
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2168 if (!s->flipped_image) stride = -stride;
1233
5d66713e97e2 correct the custom coding mode alphabet, add some validation on the
tmmm
parents: 1230
diff changeset
2169 upper_motion_limit = 7 * s->current_frame.linesize[0];
5d66713e97e2 correct the custom coding mode alphabet, add some validation on the
tmmm
parents: 1230
diff changeset
2170 lower_motion_limit = height * s->current_frame.linesize[0] + width - 8;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2171 } else if (plane == 1) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2172 output_plane = s->current_frame.data[1];
1227
184c480cefc3 fix decoder so that ffmpeg does not crash, at least not right away
tmmm
parents: 1224
diff changeset
2173 last_plane = s->last_frame.data[1];
184c480cefc3 fix decoder so that ffmpeg does not crash, at least not right away
tmmm
parents: 1224
diff changeset
2174 golden_plane = s->golden_frame.data[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
2175 stride = s->current_frame.linesize[1];
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2176 if (!s->flipped_image) stride = -stride;
1233
5d66713e97e2 correct the custom coding mode alphabet, add some validation on the
tmmm
parents: 1230
diff changeset
2177 upper_motion_limit = 7 * s->current_frame.linesize[1];
5d66713e97e2 correct the custom coding mode alphabet, add some validation on the
tmmm
parents: 1230
diff changeset
2178 lower_motion_limit = height * s->current_frame.linesize[1] + width - 8;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2179 } else {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2180 output_plane = s->current_frame.data[2];
1227
184c480cefc3 fix decoder so that ffmpeg does not crash, at least not right away
tmmm
parents: 1224
diff changeset
2181 last_plane = s->last_frame.data[2];
184c480cefc3 fix decoder so that ffmpeg does not crash, at least not right away
tmmm
parents: 1224
diff changeset
2182 golden_plane = s->golden_frame.data[2];
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
2183 stride = s->current_frame.linesize[2];
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2184 if (!s->flipped_image) stride = -stride;
1233
5d66713e97e2 correct the custom coding mode alphabet, add some validation on the
tmmm
parents: 1230
diff changeset
2185 upper_motion_limit = 7 * s->current_frame.linesize[2];
5d66713e97e2 correct the custom coding mode alphabet, add some validation on the
tmmm
parents: 1230
diff changeset
2186 lower_motion_limit = height * s->current_frame.linesize[2] + width - 8;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2187 }
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2370
diff changeset
2188
2466
acfea8a94bf8 10l (negative strides)
michael
parents: 2422
diff changeset
2189 if(ABS(stride) > 2048)
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2370
diff changeset
2190 return; //various tables are fixed size
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2191
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2192 /* for each fragment row... */
1229
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2193 for (y = 0; y < height; y += 8) {
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2194
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2195 /* for each fragment in a row... */
1229
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2196 for (x = 0; x < width; x += 8, i++) {
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2197
1244
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
2198 if ((i < 0) || (i >= s->fragment_count)) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1518
diff changeset
2199 av_log(s->avctx, AV_LOG_ERROR, " vp3:render_fragments(): bad fragment number (%d)\n", i);
1244
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
2200 return;
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
2201 }
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
2202
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2203 /* transform if this block was coded */
1667
720c073661a1 FF_DEBUG_PICT_INFO and CODEC_FLAG_GRAY support
alex
parents: 1664
diff changeset
2204 if ((s->all_fragments[i].coding_method != MODE_COPY) &&
720c073661a1 FF_DEBUG_PICT_INFO and CODEC_FLAG_GRAY support
alex
parents: 1664
diff changeset
2205 !((s->avctx->flags & CODEC_FLAG_GRAY) && plane)) {
1229
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2206
1406
ae5524a3cd08 MC rounding fixed?
michaelni
parents: 1405
diff changeset
2207 if ((s->all_fragments[i].coding_method == MODE_USING_GOLDEN) ||
ae5524a3cd08 MC rounding fixed?
michaelni
parents: 1405
diff changeset
2208 (s->all_fragments[i].coding_method == MODE_GOLDEN_MV))
ae5524a3cd08 MC rounding fixed?
michaelni
parents: 1405
diff changeset
2209 motion_source= golden_plane;
ae5524a3cd08 MC rounding fixed?
michaelni
parents: 1405
diff changeset
2210 else
ae5524a3cd08 MC rounding fixed?
michaelni
parents: 1405
diff changeset
2211 motion_source= last_plane;
ae5524a3cd08 MC rounding fixed?
michaelni
parents: 1405
diff changeset
2212
ae5524a3cd08 MC rounding fixed?
michaelni
parents: 1405
diff changeset
2213 motion_source += s->all_fragments[i].first_pixel;
1292
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
2214 motion_halfpel_index = 0;
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
2215
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
2216 /* sort out the motion vector if this fragment is coded
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
2217 * using a motion vector method */
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
2218 if ((s->all_fragments[i].coding_method > MODE_INTRA) &&
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
2219 (s->all_fragments[i].coding_method != MODE_USING_GOLDEN)) {
1406
ae5524a3cd08 MC rounding fixed?
michaelni
parents: 1405
diff changeset
2220 int src_x, src_y;
1292
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
2221 motion_x = s->all_fragments[i].motion_x;
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
2222 motion_y = s->all_fragments[i].motion_y;
1407
69f4f4fb8a50 fixing chroma MC
michaelni
parents: 1406
diff changeset
2223 if(plane){
69f4f4fb8a50 fixing chroma MC
michaelni
parents: 1406
diff changeset
2224 motion_x= (motion_x>>1) | (motion_x&1);
69f4f4fb8a50 fixing chroma MC
michaelni
parents: 1406
diff changeset
2225 motion_y= (motion_y>>1) | (motion_y&1);
69f4f4fb8a50 fixing chroma MC
michaelni
parents: 1406
diff changeset
2226 }
69f4f4fb8a50 fixing chroma MC
michaelni
parents: 1406
diff changeset
2227
1406
ae5524a3cd08 MC rounding fixed?
michaelni
parents: 1405
diff changeset
2228 src_x= (motion_x>>1) + x;
ae5524a3cd08 MC rounding fixed?
michaelni
parents: 1405
diff changeset
2229 src_y= (motion_y>>1) + y;
1292
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
2230 if ((motion_x == 0xbeef) || (motion_y == 0xbeef))
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1518
diff changeset
2231 av_log(s->avctx, AV_LOG_ERROR, " help! got beefy vector! (%X, %X)\n", motion_x, motion_y);
1292
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
2232
1407
69f4f4fb8a50 fixing chroma MC
michaelni
parents: 1406
diff changeset
2233 motion_halfpel_index = motion_x & 0x01;
69f4f4fb8a50 fixing chroma MC
michaelni
parents: 1406
diff changeset
2234 motion_source += (motion_x >> 1);
1292
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
2235
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
2236 // motion_y = -motion_y;
1407
69f4f4fb8a50 fixing chroma MC
michaelni
parents: 1406
diff changeset
2237 motion_halfpel_index |= (motion_y & 0x01) << 1;
69f4f4fb8a50 fixing chroma MC
michaelni
parents: 1406
diff changeset
2238 motion_source += ((motion_y >> 1) * stride);
1292
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
2239
1406
ae5524a3cd08 MC rounding fixed?
michaelni
parents: 1405
diff changeset
2240 if(src_x<0 || src_y<0 || src_x + 9 >= width || src_y + 9 >= height){
ae5524a3cd08 MC rounding fixed?
michaelni
parents: 1405
diff changeset
2241 uint8_t *temp= s->edge_emu_buffer;
ae5524a3cd08 MC rounding fixed?
michaelni
parents: 1405
diff changeset
2242 if(stride<0) temp -= 9*stride;
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
2243 else temp += 9*stride;
1406
ae5524a3cd08 MC rounding fixed?
michaelni
parents: 1405
diff changeset
2244
ae5524a3cd08 MC rounding fixed?
michaelni
parents: 1405
diff changeset
2245 ff_emulated_edge_mc(temp, motion_source, stride, 9, 9, src_x, src_y, width, height);
ae5524a3cd08 MC rounding fixed?
michaelni
parents: 1405
diff changeset
2246 motion_source= temp;
1292
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
2247 }
1233
5d66713e97e2 correct the custom coding mode alphabet, add some validation on the
tmmm
parents: 1230
diff changeset
2248 }
1864
9a73e6dc5d68 fix motion compensation with (x+1/2,y+1/2) MVs
michael
parents: 1667
diff changeset
2249
1233
5d66713e97e2 correct the custom coding mode alphabet, add some validation on the
tmmm
parents: 1230
diff changeset
2250
1229
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2251 /* first, take care of copying a block from either the
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2252 * previous or the golden frame */
1406
ae5524a3cd08 MC rounding fixed?
michaelni
parents: 1405
diff changeset
2253 if (s->all_fragments[i].coding_method != MODE_INTRA) {
1864
9a73e6dc5d68 fix motion compensation with (x+1/2,y+1/2) MVs
michael
parents: 1667
diff changeset
2254 //Note, it is possible to implement all MC cases with put_no_rnd_pixels_l2 which would look more like the VP3 source but this would be slower as put_no_rnd_pixels_tab is better optimzed
9a73e6dc5d68 fix motion compensation with (x+1/2,y+1/2) MVs
michael
parents: 1667
diff changeset
2255 if(motion_halfpel_index != 3){
9a73e6dc5d68 fix motion compensation with (x+1/2,y+1/2) MVs
michael
parents: 1667
diff changeset
2256 s->dsp.put_no_rnd_pixels_tab[1][motion_halfpel_index](
9a73e6dc5d68 fix motion compensation with (x+1/2,y+1/2) MVs
michael
parents: 1667
diff changeset
2257 output_plane + s->all_fragments[i].first_pixel,
9a73e6dc5d68 fix motion compensation with (x+1/2,y+1/2) MVs
michael
parents: 1667
diff changeset
2258 motion_source, stride, 8);
9a73e6dc5d68 fix motion compensation with (x+1/2,y+1/2) MVs
michael
parents: 1667
diff changeset
2259 }else{
9a73e6dc5d68 fix motion compensation with (x+1/2,y+1/2) MVs
michael
parents: 1667
diff changeset
2260 int d= (motion_x ^ motion_y)>>31; // d is 0 if motion_x and _y have the same sign, else -1
9a73e6dc5d68 fix motion compensation with (x+1/2,y+1/2) MVs
michael
parents: 1667
diff changeset
2261 s->dsp.put_no_rnd_pixels_l2[1](
9a73e6dc5d68 fix motion compensation with (x+1/2,y+1/2) MVs
michael
parents: 1667
diff changeset
2262 output_plane + s->all_fragments[i].first_pixel,
9a73e6dc5d68 fix motion compensation with (x+1/2,y+1/2) MVs
michael
parents: 1667
diff changeset
2263 motion_source - d,
9a73e6dc5d68 fix motion compensation with (x+1/2,y+1/2) MVs
michael
parents: 1667
diff changeset
2264 motion_source + stride + 1 + d,
9a73e6dc5d68 fix motion compensation with (x+1/2,y+1/2) MVs
michael
parents: 1667
diff changeset
2265 stride, 8);
9a73e6dc5d68 fix motion compensation with (x+1/2,y+1/2) MVs
michael
parents: 1667
diff changeset
2266 }
2684
c8386f5c4fb9 fix dequant matrix
michael
parents: 2678
diff changeset
2267 dequantizer = s->inter_dequant;
c8386f5c4fb9 fix dequant matrix
michael
parents: 2678
diff changeset
2268 }else{
c8386f5c4fb9 fix dequant matrix
michael
parents: 2678
diff changeset
2269 if (plane == 0)
c8386f5c4fb9 fix dequant matrix
michael
parents: 2678
diff changeset
2270 dequantizer = s->intra_y_dequant;
c8386f5c4fb9 fix dequant matrix
michael
parents: 2678
diff changeset
2271 else
c8386f5c4fb9 fix dequant matrix
michael
parents: 2678
diff changeset
2272 dequantizer = s->intra_c_dequant;
1229
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2273 }
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2274
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2275 /* dequantize the DCT coefficients */
1229
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2276 debug_idct("fragment %d, coding mode %d, DC = %d, dequant = %d:\n",
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2277 i, s->all_fragments[i].coding_method,
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
2278 DC_COEFF(i), dequantizer[0]);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2279
2693
02925a3903b6 porting vp3 idct over to lavc idct api
michael
parents: 2692
diff changeset
2280 if(s->avctx->idct_algo==FF_IDCT_VP3){
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
2281 Coeff *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
2282 memset(block, 0, sizeof(block));
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
2283 while(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
2284 block[coeff->index]= coeff->coeff * dequantizer[coeff->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
2285 coeff= coeff->next;
2693
02925a3903b6 porting vp3 idct over to lavc idct api
michael
parents: 2692
diff changeset
2286 }
02925a3903b6 porting vp3 idct over to lavc idct api
michael
parents: 2692
diff changeset
2287 }else{
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
2288 Coeff *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
2289 memset(block, 0, sizeof(block));
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
2290 while(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
2291 block[coeff->index]= (coeff->coeff * dequantizer[coeff->index] + 2)>>2;
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
2292 coeff= coeff->next;
2693
02925a3903b6 porting vp3 idct over to lavc idct api
michael
parents: 2692
diff changeset
2293 }
02925a3903b6 porting vp3 idct over to lavc idct api
michael
parents: 2692
diff changeset
2294 }
02925a3903b6 porting vp3 idct over to lavc idct api
michael
parents: 2692
diff changeset
2295
1230
31d090bae36c looking better all the time! motion compensation is starting to work
tmmm
parents: 1229
diff changeset
2296 /* invert DCT and place (or add) in final output */
2693
02925a3903b6 porting vp3 idct over to lavc idct api
michael
parents: 2692
diff changeset
2297
1230
31d090bae36c looking better all the time! motion compensation is starting to work
tmmm
parents: 1229
diff changeset
2298 if (s->all_fragments[i].coding_method == MODE_INTRA) {
2693
02925a3903b6 porting vp3 idct over to lavc idct api
michael
parents: 2692
diff changeset
2299 if(s->avctx->idct_algo!=FF_IDCT_VP3)
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
2300 block[0] += 128<<3;
2693
02925a3903b6 porting vp3 idct over to lavc idct api
michael
parents: 2692
diff changeset
2301 s->dsp.idct_put(
1984
ef919e9ef73e separate out put_signed_pixels_clamped() into its own function and
melanson
parents: 1977
diff changeset
2302 output_plane + s->all_fragments[i].first_pixel,
2693
02925a3903b6 porting vp3 idct over to lavc idct api
michael
parents: 2692
diff changeset
2303 stride,
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
2304 block);
1230
31d090bae36c looking better all the time! motion compensation is starting to work
tmmm
parents: 1229
diff changeset
2305 } else {
2693
02925a3903b6 porting vp3 idct over to lavc idct api
michael
parents: 2692
diff changeset
2306 s->dsp.idct_add(
1229
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2307 output_plane + s->all_fragments[i].first_pixel,
2693
02925a3903b6 porting vp3 idct over to lavc idct api
michael
parents: 2692
diff changeset
2308 stride,
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
2309 block);
1230
31d090bae36c looking better all the time! motion compensation is starting to work
tmmm
parents: 1229
diff changeset
2310 }
1229
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2311
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2312 debug_idct("block after idct_%s():\n",
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2313 (s->all_fragments[i].coding_method == MODE_INTRA)?
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2314 "put" : "add");
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2315 for (m = 0; m < 8; m++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2316 for (n = 0; n < 8; n++) {
1229
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2317 debug_idct(" %3d", *(output_plane +
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2318 s->all_fragments[i].first_pixel + (m * stride + n)));
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2319 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2320 debug_idct("\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2321 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2322 debug_idct("\n");
1229
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2323
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2324 } else {
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2325
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2326 /* copy directly from the previous frame */
1229
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2327 s->dsp.put_pixels_tab[1][0](
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2328 output_plane + s->all_fragments[i].first_pixel,
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2329 last_plane + s->all_fragments[i].first_pixel,
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2330 stride, 8);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2331
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2332 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2333 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2334 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2335
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2336 emms_c();
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2337 }
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2338
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2339 static void horizontal_filter(unsigned char *first_pixel, int stride,
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2340 int *bounding_values)
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2341 {
2699
1b4a3c083f9d some optimizations gcc should have done (10% faster loop filter)
michael
parents: 2698
diff changeset
2342 unsigned char *end;
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2343 int filter_value;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2344
2699
1b4a3c083f9d some optimizations gcc should have done (10% faster loop filter)
michael
parents: 2698
diff changeset
2345 for (end= first_pixel + 8*stride; first_pixel < end; first_pixel += stride) {
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2346 filter_value =
2699
1b4a3c083f9d some optimizations gcc should have done (10% faster loop filter)
michael
parents: 2698
diff changeset
2347 (first_pixel[-2] - first_pixel[ 1])
1b4a3c083f9d some optimizations gcc should have done (10% faster loop filter)
michael
parents: 2698
diff changeset
2348 +3*(first_pixel[ 0] - first_pixel[-1]);
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2349 filter_value = bounding_values[(filter_value + 4) >> 3];
2698
fae7fce1a202 SATURATE_U8 -> clip_uint8 (10% faster loop filter)
michael
parents: 2695
diff changeset
2350 first_pixel[-1] = clip_uint8(first_pixel[-1] + filter_value);
fae7fce1a202 SATURATE_U8 -> clip_uint8 (10% faster loop filter)
michael
parents: 2695
diff changeset
2351 first_pixel[ 0] = clip_uint8(first_pixel[ 0] - filter_value);
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2352 }
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2353 }
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2354
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2355 static void vertical_filter(unsigned char *first_pixel, int stride,
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2356 int *bounding_values)
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2357 {
2699
1b4a3c083f9d some optimizations gcc should have done (10% faster loop filter)
michael
parents: 2698
diff changeset
2358 unsigned char *end;
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2359 int filter_value;
2699
1b4a3c083f9d some optimizations gcc should have done (10% faster loop filter)
michael
parents: 2698
diff changeset
2360 const int nstride= -stride;
1b4a3c083f9d some optimizations gcc should have done (10% faster loop filter)
michael
parents: 2698
diff changeset
2361
1b4a3c083f9d some optimizations gcc should have done (10% faster loop filter)
michael
parents: 2698
diff changeset
2362 for (end= first_pixel + 8; first_pixel < end; first_pixel++) {
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2363 filter_value =
2699
1b4a3c083f9d some optimizations gcc should have done (10% faster loop filter)
michael
parents: 2698
diff changeset
2364 (first_pixel[2 * nstride] - first_pixel[ stride])
1b4a3c083f9d some optimizations gcc should have done (10% faster loop filter)
michael
parents: 2698
diff changeset
2365 +3*(first_pixel[0 ] - first_pixel[nstride]);
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2366 filter_value = bounding_values[(filter_value + 4) >> 3];
2699
1b4a3c083f9d some optimizations gcc should have done (10% faster loop filter)
michael
parents: 2698
diff changeset
2367 first_pixel[nstride] = clip_uint8(first_pixel[nstride] + filter_value);
2698
fae7fce1a202 SATURATE_U8 -> clip_uint8 (10% faster loop filter)
michael
parents: 2695
diff changeset
2368 first_pixel[0] = clip_uint8(first_pixel[0] - filter_value);
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2369 }
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2370 }
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2371
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2372 static void apply_loop_filter(Vp3DecodeContext *s)
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2373 {
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2374 int x, y, plane;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2375 int width, height;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2376 int fragment;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2377 int stride;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2378 unsigned char *plane_data;
2686
979a847cb943 various 10l fixes for the loop filter
michael
parents: 2684
diff changeset
2379
979a847cb943 various 10l fixes for the loop filter
michael
parents: 2684
diff changeset
2380 int bounding_values_array[256];
979a847cb943 various 10l fixes for the loop filter
michael
parents: 2684
diff changeset
2381 int *bounding_values= bounding_values_array+127;
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2382 int filter_limit;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2383
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2384 /* find the right loop limit value */
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2385 for (x = 63; x >= 0; x--) {
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2386 if (vp31_ac_scale_factor[x] >= s->quality_index)
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2387 break;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2388 }
2686
979a847cb943 various 10l fixes for the loop filter
michael
parents: 2684
diff changeset
2389 filter_limit = vp31_filter_limit_values[s->quality_index];
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2390
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2391 /* set up the bounding values */
2686
979a847cb943 various 10l fixes for the loop filter
michael
parents: 2684
diff changeset
2392 memset(bounding_values_array, 0, 256 * sizeof(int));
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2393 for (x = 0; x < filter_limit; x++) {
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2394 bounding_values[-x - filter_limit] = -filter_limit + x;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2395 bounding_values[-x] = -x;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2396 bounding_values[x] = x;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2397 bounding_values[x + filter_limit] = filter_limit - x;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2398 }
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2399
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2400 for (plane = 0; plane < 3; plane++) {
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2401
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2402 if (plane == 0) {
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2403 /* Y plane parameters */
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2404 fragment = 0;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2405 width = s->fragment_width;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2406 height = s->fragment_height;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2407 stride = s->current_frame.linesize[0];
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2408 plane_data = s->current_frame.data[0];
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2409 } else if (plane == 1) {
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2410 /* U plane parameters */
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2411 fragment = s->u_fragment_start;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2412 width = s->fragment_width / 2;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2413 height = s->fragment_height / 2;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2414 stride = s->current_frame.linesize[1];
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2415 plane_data = s->current_frame.data[1];
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2416 } else {
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2417 /* V plane parameters */
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2418 fragment = s->v_fragment_start;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2419 width = s->fragment_width / 2;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2420 height = s->fragment_height / 2;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2421 stride = s->current_frame.linesize[2];
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2422 plane_data = s->current_frame.data[2];
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2423 }
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2424
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2425 for (y = 0; y < height; y++) {
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2426
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2427 for (x = 0; x < width; x++) {
2687
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2428 START_TIMER
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2429 /* do not perform left edge filter for left columns frags */
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2430 if ((x > 0) &&
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2431 (s->all_fragments[fragment].coding_method != MODE_COPY)) {
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2432 horizontal_filter(
2686
979a847cb943 various 10l fixes for the loop filter
michael
parents: 2684
diff changeset
2433 plane_data + s->all_fragments[fragment].first_pixel - 7*stride,
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2434 stride, bounding_values);
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2435 }
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2436
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2437 /* do not perform top edge filter for top row fragments */
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2438 if ((y > 0) &&
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2439 (s->all_fragments[fragment].coding_method != MODE_COPY)) {
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2440 vertical_filter(
2686
979a847cb943 various 10l fixes for the loop filter
michael
parents: 2684
diff changeset
2441 plane_data + s->all_fragments[fragment].first_pixel + stride,
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2442 stride, bounding_values);
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2443 }
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2444
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2445 /* do not perform right edge filter for right column
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2446 * fragments or if right fragment neighbor is also coded
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2447 * in this frame (it will be filtered in next iteration) */
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2448 if ((x < width - 1) &&
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2449 (s->all_fragments[fragment].coding_method != MODE_COPY) &&
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2450 (s->all_fragments[fragment + 1].coding_method == MODE_COPY)) {
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2451 horizontal_filter(
2686
979a847cb943 various 10l fixes for the loop filter
michael
parents: 2684
diff changeset
2452 plane_data + s->all_fragments[fragment + 1].first_pixel - 7*stride,
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2453 stride, bounding_values);
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2454 }
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2455
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2456 /* do not perform bottom edge filter for bottom row
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2457 * fragments or if bottom fragment neighbor is also coded
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2458 * in this frame (it will be filtered in the next row) */
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2459 if ((y < height - 1) &&
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2460 (s->all_fragments[fragment].coding_method != MODE_COPY) &&
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2461 (s->all_fragments[fragment + width].coding_method == MODE_COPY)) {
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2462 vertical_filter(
2686
979a847cb943 various 10l fixes for the loop filter
michael
parents: 2684
diff changeset
2463 plane_data + s->all_fragments[fragment + width].first_pixel + stride,
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2464 stride, bounding_values);
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2465 }
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2466
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2467 fragment++;
2687
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2468 STOP_TIMER("loop filter")
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2469 }
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2470 }
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2471 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2472 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2473
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2474 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2475 * This function computes the first pixel addresses for each fragment.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2476 * This function needs to be invoked after the first frame is allocated
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2477 * so that it has access to the plane strides.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2478 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2479 static void vp3_calculate_pixel_addresses(Vp3DecodeContext *s)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2480 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2481
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2482 int i, x, y;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2483
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2484 /* figure out the first pixel addresses for each of the fragments */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2485 /* Y plane */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2486 i = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2487 for (y = s->fragment_height; y > 0; y--) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2488 for (x = 0; x < s->fragment_width; x++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2489 s->all_fragments[i++].first_pixel =
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2490 s->golden_frame.linesize[0] * y * FRAGMENT_PIXELS -
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2491 s->golden_frame.linesize[0] +
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2492 x * FRAGMENT_PIXELS;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2493 debug_init(" fragment %d, first pixel @ %d\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2494 i-1, s->all_fragments[i-1].first_pixel);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2495 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2496 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2497
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2498 /* U plane */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2499 i = s->u_fragment_start;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2500 for (y = s->fragment_height / 2; y > 0; y--) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2501 for (x = 0; x < s->fragment_width / 2; x++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2502 s->all_fragments[i++].first_pixel =
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2503 s->golden_frame.linesize[1] * y * FRAGMENT_PIXELS -
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2504 s->golden_frame.linesize[1] +
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2505 x * FRAGMENT_PIXELS;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2506 debug_init(" fragment %d, first pixel @ %d\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2507 i-1, s->all_fragments[i-1].first_pixel);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2508 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2509 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2510
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2511 /* V plane */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2512 i = s->v_fragment_start;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2513 for (y = s->fragment_height / 2; y > 0; y--) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2514 for (x = 0; x < s->fragment_width / 2; x++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2515 s->all_fragments[i++].first_pixel =
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2516 s->golden_frame.linesize[2] * y * FRAGMENT_PIXELS -
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2517 s->golden_frame.linesize[2] +
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2518 x * FRAGMENT_PIXELS;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2519 debug_init(" fragment %d, first pixel @ %d\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2520 i-1, s->all_fragments[i-1].first_pixel);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2521 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2522 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2523 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2524
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
2525 /* FIXME: this should be merged with the above! */
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2526 static void theora_calculate_pixel_addresses(Vp3DecodeContext *s)
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2527 {
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2528
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2529 int i, x, y;
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2530
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2531 /* figure out the first pixel addresses for each of the fragments */
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2532 /* Y plane */
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2533 i = 0;
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2534 for (y = 1; y <= s->fragment_height; y++) {
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2535 for (x = 0; x < s->fragment_width; x++) {
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2536 s->all_fragments[i++].first_pixel =
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2537 s->golden_frame.linesize[0] * y * FRAGMENT_PIXELS -
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2538 s->golden_frame.linesize[0] +
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2539 x * FRAGMENT_PIXELS;
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2540 debug_init(" fragment %d, first pixel @ %d\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
2541 i-1, s->all_fragments[i-1].first_pixel);
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2542 }
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2543 }
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2544
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2545 /* U plane */
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2546 i = s->u_fragment_start;
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2547 for (y = 1; y <= s->fragment_height / 2; y++) {
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2548 for (x = 0; x < s->fragment_width / 2; x++) {
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2549 s->all_fragments[i++].first_pixel =
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2550 s->golden_frame.linesize[1] * y * FRAGMENT_PIXELS -
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2551 s->golden_frame.linesize[1] +
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2552 x * FRAGMENT_PIXELS;
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2553 debug_init(" fragment %d, first pixel @ %d\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
2554 i-1, s->all_fragments[i-1].first_pixel);
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2555 }
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2556 }
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2557
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2558 /* V plane */
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2559 i = s->v_fragment_start;
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2560 for (y = 1; y <= s->fragment_height / 2; y++) {
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2561 for (x = 0; x < s->fragment_width / 2; x++) {
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2562 s->all_fragments[i++].first_pixel =
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2563 s->golden_frame.linesize[2] * y * FRAGMENT_PIXELS -
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2564 s->golden_frame.linesize[2] +
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2565 x * FRAGMENT_PIXELS;
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2566 debug_init(" fragment %d, first pixel @ %d\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
2567 i-1, s->all_fragments[i-1].first_pixel);
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2568 }
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2569 }
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2570 }
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2571
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2572 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2573 * This is the ffmpeg/libavcodec API init function.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2574 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2575 static int vp3_decode_init(AVCodecContext *avctx)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2576 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2577 Vp3DecodeContext *s = avctx->priv_data;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2578 int i;
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2579 int c_width;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2580 int c_height;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2581 int y_superblock_count;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2582 int c_superblock_count;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2583
1664
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2584 if (avctx->codec_tag == MKTAG('V','P','3','0'))
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2585 s->version = 0;
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2586 else
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2587 s->version = 1;
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2588
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2589 s->avctx = avctx;
1292
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
2590 s->width = (avctx->width + 15) & 0xFFFFFFF0;
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
2591 s->height = (avctx->height + 15) & 0xFFFFFFF0;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2592 avctx->pix_fmt = PIX_FMT_YUV420P;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2593 avctx->has_b_frames = 0;
2693
02925a3903b6 porting vp3 idct over to lavc idct api
michael
parents: 2692
diff changeset
2594 if(avctx->idct_algo==FF_IDCT_AUTO)
02925a3903b6 porting vp3 idct over to lavc idct api
michael
parents: 2692
diff changeset
2595 avctx->idct_algo=FF_IDCT_VP3;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2596 dsputil_init(&s->dsp, avctx);
2694
0d229cf036b9 fix idct permutation
michael
parents: 2693
diff changeset
2597
0d229cf036b9 fix idct permutation
michael
parents: 2693
diff changeset
2598 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
2599
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2600 /* initialize to an impossible value which will force a recalculation
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2601 * in the first frame decode */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2602 s->quality_index = -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2603
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2604 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
2605 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
2606 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
2607
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2608 /* 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
2609 c_width = s->width / 2;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2610 c_height = s->height / 2;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2611 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
2612 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
2613 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
2614
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2615 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
2616 s->u_superblock_start = y_superblock_count;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2617 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
2618 s->superblock_coding = av_malloc(s->superblock_count);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2619
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2620 s->macroblock_width = (s->width + 15) / 16;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2621 s->macroblock_height = (s->height + 15) / 16;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2622 s->macroblock_count = s->macroblock_width * s->macroblock_height;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2623
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2624 s->fragment_width = s->width / FRAGMENT_PIXELS;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2625 s->fragment_height = s->height / FRAGMENT_PIXELS;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2626
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2627 /* fragment count covers all 8x8 blocks for all 3 planes */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2628 s->fragment_count = s->fragment_width * s->fragment_height * 3 / 2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2629 s->u_fragment_start = s->fragment_width * s->fragment_height;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2630 s->v_fragment_start = s->fragment_width * s->fragment_height * 5 / 4;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2631
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2632 debug_init(" Y plane: %d x %d\n", s->width, s->height);
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2633 debug_init(" C plane: %d x %d\n", c_width, c_height);
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2634 debug_init(" Y superblocks: %d x %d, %d total\n",
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2635 s->y_superblock_width, s->y_superblock_height, y_superblock_count);
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2636 debug_init(" C superblocks: %d x %d, %d total\n",
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2637 s->c_superblock_width, s->c_superblock_height, c_superblock_count);
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2638 debug_init(" total superblocks = %d, U starts @ %d, V starts @ %d\n",
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2639 s->superblock_count, s->u_superblock_start, s->v_superblock_start);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2640 debug_init(" macroblocks: %d x %d, %d total\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2641 s->macroblock_width, s->macroblock_height, s->macroblock_count);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2642 debug_init(" %d fragments, %d x %d, u starts @ %d, v starts @ %d\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2643 s->fragment_count,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2644 s->fragment_width,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2645 s->fragment_height,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2646 s->u_fragment_start,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2647 s->v_fragment_start);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2648
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2649 s->all_fragments = av_malloc(s->fragment_count * sizeof(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
2650 s->coeffs = av_malloc(s->fragment_count * sizeof(Coeff) * 65);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2651 s->coded_fragment_list = av_malloc(s->fragment_count * sizeof(int));
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2652 s->pixel_addresses_inited = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2653
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
2654 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
2655 {
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
2656 for (i = 0; i < 64; i++)
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
2657 s->coded_dc_scale_factor[i] = vp31_dc_scale_factor[i];
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
2658 for (i = 0; i < 64; i++)
1867
7f7aa6ac3723 cut over to using new VP3 DSP functions and remove the old ones; bring
melanson
parents: 1864
diff changeset
2659 s->coded_ac_scale_factor[i] = vp31_ac_scale_factor[i];
1516
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2660 for (i = 0; i < 64; i++)
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
2661 s->coded_intra_y_dequant[i] = vp31_intra_y_dequant[i];
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
2662 for (i = 0; i < 64; i++)
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
2663 s->coded_intra_c_dequant[i] = vp31_intra_c_dequant[i];
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
2664 for (i = 0; i < 64; i++)
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
2665 s->coded_inter_dequant[i] = vp31_inter_dequant[i];
2718
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2666
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2667 /* init VLC tables */
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2668 for (i = 0; i < 16; i++) {
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2669
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2670 /* DC histograms */
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2671 init_vlc(&s->dc_vlc[i], 5, 32,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2672 &dc_bias[i][0][1], 4, 2,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2673 &dc_bias[i][0][0], 4, 2, 0);
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2674
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2675 /* group 1 AC histograms */
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2676 init_vlc(&s->ac_vlc_1[i], 5, 32,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2677 &ac_bias_0[i][0][1], 4, 2,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2678 &ac_bias_0[i][0][0], 4, 2, 0);
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2679
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2680 /* group 2 AC histograms */
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2681 init_vlc(&s->ac_vlc_2[i], 5, 32,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2682 &ac_bias_1[i][0][1], 4, 2,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2683 &ac_bias_1[i][0][0], 4, 2, 0);
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2684
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2685 /* group 3 AC histograms */
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2686 init_vlc(&s->ac_vlc_3[i], 5, 32,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2687 &ac_bias_2[i][0][1], 4, 2,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2688 &ac_bias_2[i][0][0], 4, 2, 0);
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2689
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2690 /* group 4 AC histograms */
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2691 init_vlc(&s->ac_vlc_4[i], 5, 32,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2692 &ac_bias_3[i][0][1], 4, 2,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2693 &ac_bias_3[i][0][0], 4, 2, 0);
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2694 }
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2695 } else {
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2696 for (i = 0; i < 16; i++) {
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2697
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2698 /* DC histograms */
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2699 init_vlc(&s->dc_vlc[i], 5, 32,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2700 &s->huffman_table[i][0][1], 4, 2,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2701 &s->huffman_table[i][0][0], 4, 2, 0);
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2702
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2703 /* group 1 AC histograms */
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2704 init_vlc(&s->ac_vlc_1[i], 5, 32,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2705 &s->huffman_table[i+16][0][1], 4, 2,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2706 &s->huffman_table[i+16][0][0], 4, 2, 0);
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2707
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2708 /* group 2 AC histograms */
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2709 init_vlc(&s->ac_vlc_2[i], 5, 32,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2710 &s->huffman_table[i+16*2][0][1], 4, 2,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2711 &s->huffman_table[i+16*2][0][0], 4, 2, 0);
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2712
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2713 /* group 3 AC histograms */
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2714 init_vlc(&s->ac_vlc_3[i], 5, 32,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2715 &s->huffman_table[i+16*3][0][1], 4, 2,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2716 &s->huffman_table[i+16*3][0][0], 4, 2, 0);
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2717
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2718 /* group 4 AC histograms */
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2719 init_vlc(&s->ac_vlc_4[i], 5, 32,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2720 &s->huffman_table[i+16*4][0][1], 4, 2,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2721 &s->huffman_table[i+16*4][0][0], 4, 2, 0);
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2722 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2723 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2724
2703
3817945001ce replace get_superblock_run_length() with a VLC table
melanson
parents: 2702
diff changeset
2725 init_vlc(&s->superblock_run_length_vlc, 6, 34,
3817945001ce replace get_superblock_run_length() with a VLC table
melanson
parents: 2702
diff changeset
2726 &superblock_run_length_vlc_table[0][1], 4, 2,
3817945001ce replace get_superblock_run_length() with a VLC table
melanson
parents: 2702
diff changeset
2727 &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
2728
2702
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
2729 init_vlc(&s->fragment_run_length_vlc, 5, 31,
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
2730 &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
2731 &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
2732
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
2733 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
2734 &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
2735 &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
2736
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
2737 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
2738 &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
2739 &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
2740
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2741 /* work out the block mapping tables */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2742 s->superblock_fragments = av_malloc(s->superblock_count * 16 * sizeof(int));
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2743 s->superblock_macroblocks = av_malloc(s->superblock_count * 4 * sizeof(int));
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2744 s->macroblock_fragments = av_malloc(s->macroblock_count * 6 * sizeof(int));
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
2745 s->macroblock_coding = av_malloc(s->macroblock_count + 1);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2746 init_block_mapping(s);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2747
1229
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2748 for (i = 0; i < 3; i++) {
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2749 s->current_frame.data[i] = NULL;
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2750 s->last_frame.data[i] = NULL;
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2751 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
2752 }
184c480cefc3 fix decoder so that ffmpeg does not crash, at least not right away
tmmm
parents: 1224
diff changeset
2753
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2754 return 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2755 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2756
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2757 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2758 * This is the ffmpeg/libavcodec API frame decode function.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2759 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2760 static int vp3_decode_frame(AVCodecContext *avctx,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2761 void *data, int *data_size,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2762 uint8_t *buf, int buf_size)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2763 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2764 Vp3DecodeContext *s = avctx->priv_data;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2765 GetBitContext gb;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2766 static int counter = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2767
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2768 init_get_bits(&gb, buf, buf_size * 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
2769
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
2770 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
2771 {
1664
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2772 int ptype = get_bits(&gb, 7);
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2773
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2774 skip_bits(&gb, 6*8); /* "theora" */
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2775
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2776 switch(ptype)
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2777 {
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2778 case 1:
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2779 theora_decode_comments(avctx, gb);
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2780 break;
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2781 case 2:
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2782 theora_decode_tables(avctx, gb);
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2783 init_dequantizer(s);
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2784 break;
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2785 default:
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2786 av_log(avctx, AV_LOG_ERROR, "Unknown Theora config packet: %d\n", ptype);
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2787 }
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2788 return buf_size;
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
2789 }
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
2790
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
2791 s->keyframe = !get_bits1(&gb);
1664
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2792 if (!s->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
2793 skip_bits(&gb, 1);
1664
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2794 s->last_quality_index = s->quality_index;
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2795 s->quality_index = get_bits(&gb, 6);
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2796 if (s->theora >= 0x030200)
1664
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2797 skip_bits1(&gb);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2798
1667
720c073661a1 FF_DEBUG_PICT_INFO and CODEC_FLAG_GRAY support
alex
parents: 1664
diff changeset
2799 if (s->avctx->debug & FF_DEBUG_PICT_INFO)
720c073661a1 FF_DEBUG_PICT_INFO and CODEC_FLAG_GRAY support
alex
parents: 1664
diff changeset
2800 av_log(s->avctx, AV_LOG_INFO, " VP3 %sframe #%d: Q index = %d\n",
720c073661a1 FF_DEBUG_PICT_INFO and CODEC_FLAG_GRAY support
alex
parents: 1664
diff changeset
2801 s->keyframe?"key":"", counter, s->quality_index);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2802 counter++;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2803
1292
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
2804 if (s->quality_index != s->last_quality_index)
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
2805 init_dequantizer(s);
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
2806
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2807 if (s->keyframe) {
1664
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2808 if (!s->theora)
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2809 {
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2810 skip_bits(&gb, 4); /* width code */
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2811 skip_bits(&gb, 4); /* height code */
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2812 if (s->version)
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2813 {
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2814 s->version = get_bits(&gb, 5);
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2815 if (counter == 1)
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2816 av_log(s->avctx, AV_LOG_DEBUG, "VP version: %d\n", s->version);
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2817 }
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2818 }
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2819 if (s->version || s->theora)
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2820 {
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2821 if (get_bits1(&gb))
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2822 av_log(s->avctx, AV_LOG_ERROR, "Warning, unsupported keyframe coding type?!\n");
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2823 skip_bits(&gb, 2); /* reserved? */
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2824 }
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2825
1244
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
2826 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
2827 if (s->golden_frame.data[0])
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
2828 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
2829 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
2830 } else {
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
2831 if (s->golden_frame.data[0])
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
2832 avctx->release_buffer(avctx, &s->golden_frame);
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
2833 if (s->last_frame.data[0])
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
2834 avctx->release_buffer(avctx, &s->last_frame);
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
2835 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2836
1405
e69f99ade5b0 fix AVFrame.reference (the frames are used for decoding future frames so it should be !=0)
michaelni
parents: 1355
diff changeset
2837 s->golden_frame.reference = 3;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2838 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
2839 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
2840 return -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2841 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2842
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2843 /* golden frame is also the current frame */
1227
184c480cefc3 fix decoder so that ffmpeg does not crash, at least not right away
tmmm
parents: 1224
diff changeset
2844 memcpy(&s->current_frame, &s->golden_frame, sizeof(AVFrame));
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2845
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2846 /* time to figure out pixel addresses? */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2847 if (!s->pixel_addresses_inited)
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
2848 {
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2849 if (!s->flipped_image)
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2850 vp3_calculate_pixel_addresses(s);
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2851 else
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2852 theora_calculate_pixel_addresses(s);
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2853 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2854 } else {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2855 /* 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
2856 s->current_frame.reference = 3;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2857 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
2858 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
2859 return -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2860 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2861 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2862
1407
69f4f4fb8a50 fixing chroma MC
michaelni
parents: 1406
diff changeset
2863 s->current_frame.qscale_table= s->qscale_table; //FIXME allocate individual tables per AVFrame
69f4f4fb8a50 fixing chroma MC
michaelni
parents: 1406
diff changeset
2864 s->current_frame.qstride= 0;
69f4f4fb8a50 fixing chroma MC
michaelni
parents: 1406
diff changeset
2865
2687
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2866 {START_TIMER
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2867 init_frame(s, &gb);
2687
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2868 STOP_TIMER("init_frame")}
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2869
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2870 #if KEYFRAMES_ONLY
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2871 if (!s->keyframe) {
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2872
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2873 memcpy(s->current_frame.data[0], s->golden_frame.data[0],
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2874 s->current_frame.linesize[0] * s->height);
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2875 memcpy(s->current_frame.data[1], s->golden_frame.data[1],
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2876 s->current_frame.linesize[1] * s->height / 2);
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2877 memcpy(s->current_frame.data[2], s->golden_frame.data[2],
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2878 s->current_frame.linesize[2] * s->height / 2);
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2879
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2880 } else {
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2881 #endif
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2882
2687
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2883 {START_TIMER
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2884 if (unpack_superblocks(s, &gb)){
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2885 av_log(s->avctx, AV_LOG_ERROR, "error in unpack_superblocks\n");
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2886 return -1;
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2887 }
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2888 STOP_TIMER("unpack_superblocks")}
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2889 {START_TIMER
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2890 if (unpack_modes(s, &gb)){
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2891 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
2892 return -1;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2893 }
2687
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2894 STOP_TIMER("unpack_modes")}
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2895 {START_TIMER
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2896 if (unpack_vectors(s, &gb)){
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2897 av_log(s->avctx, AV_LOG_ERROR, "error in unpack_vectors\n");
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2898 return -1;
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2899 }
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2900 STOP_TIMER("unpack_vectors")}
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2901 {START_TIMER
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2902 if (unpack_dct_coeffs(s, &gb)){
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2903 av_log(s->avctx, AV_LOG_ERROR, "error in unpack_dct_coeffs\n");
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2904 return -1;
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2905 }
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2906 STOP_TIMER("unpack_dct_coeffs")}
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2907 {START_TIMER
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2908
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2909 reverse_dc_prediction(s, 0, s->fragment_width, s->fragment_height);
2687
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2910 STOP_TIMER("reverse_dc_prediction")}
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2911 {START_TIMER
1229
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2912 render_fragments(s, 0, s->width, s->height, 0);
2687
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2913 STOP_TIMER("render_fragments")}
1355
1c05f4290517 added the official VP3 IDCT (C implementation) as well as a grayscale
tmmm
parents: 1292
diff changeset
2914
1c05f4290517 added the official VP3 IDCT (C implementation) as well as a grayscale
tmmm
parents: 1292
diff changeset
2915 if ((avctx->flags & CODEC_FLAG_GRAY) == 0) {
1c05f4290517 added the official VP3 IDCT (C implementation) as well as a grayscale
tmmm
parents: 1292
diff changeset
2916 reverse_dc_prediction(s, s->u_fragment_start,
1c05f4290517 added the official VP3 IDCT (C implementation) as well as a grayscale
tmmm
parents: 1292
diff changeset
2917 s->fragment_width / 2, s->fragment_height / 2);
1c05f4290517 added the official VP3 IDCT (C implementation) as well as a grayscale
tmmm
parents: 1292
diff changeset
2918 reverse_dc_prediction(s, s->v_fragment_start,
1c05f4290517 added the official VP3 IDCT (C implementation) as well as a grayscale
tmmm
parents: 1292
diff changeset
2919 s->fragment_width / 2, s->fragment_height / 2);
1c05f4290517 added the official VP3 IDCT (C implementation) as well as a grayscale
tmmm
parents: 1292
diff changeset
2920 render_fragments(s, s->u_fragment_start, s->width / 2, s->height / 2, 1);
1c05f4290517 added the official VP3 IDCT (C implementation) as well as a grayscale
tmmm
parents: 1292
diff changeset
2921 render_fragments(s, s->v_fragment_start, s->width / 2, s->height / 2, 2);
1c05f4290517 added the official VP3 IDCT (C implementation) as well as a grayscale
tmmm
parents: 1292
diff changeset
2922 } else {
1c05f4290517 added the official VP3 IDCT (C implementation) as well as a grayscale
tmmm
parents: 1292
diff changeset
2923 memset(s->current_frame.data[1], 0x80, s->width * s->height / 4);
1c05f4290517 added the official VP3 IDCT (C implementation) as well as a grayscale
tmmm
parents: 1292
diff changeset
2924 memset(s->current_frame.data[2], 0x80, s->width * s->height / 4);
1c05f4290517 added the official VP3 IDCT (C implementation) as well as a grayscale
tmmm
parents: 1292
diff changeset
2925 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2926
2687
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2927 {START_TIMER
2686
979a847cb943 various 10l fixes for the loop filter
michael
parents: 2684
diff changeset
2928 apply_loop_filter(s);
2687
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2929 STOP_TIMER("apply_loop_filter")}
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2930 #if KEYFRAMES_ONLY
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2931 }
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2932 #endif
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2933
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2934 *data_size=sizeof(AVFrame);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2935 *(AVFrame*)data= s->current_frame;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2936
1229
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2937 /* 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
2938 * golden frame */
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2939 if ((s->last_frame.data[0]) &&
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2940 (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
2941 avctx->release_buffer(avctx, &s->last_frame);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2942
1227
184c480cefc3 fix decoder so that ffmpeg does not crash, at least not right away
tmmm
parents: 1224
diff changeset
2943 /* shuffle frames (last = current) */
184c480cefc3 fix decoder so that ffmpeg does not crash, at least not right away
tmmm
parents: 1224
diff changeset
2944 memcpy(&s->last_frame, &s->current_frame, sizeof(AVFrame));
1405
e69f99ade5b0 fix AVFrame.reference (the frames are used for decoding future frames so it should be !=0)
michaelni
parents: 1355
diff changeset
2945 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
2946
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2947 return buf_size;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2948 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2949
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2950 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2951 * This is the ffmpeg/libavcodec API module cleanup function.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2952 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2953 static int vp3_decode_end(AVCodecContext *avctx)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2954 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2955 Vp3DecodeContext *s = avctx->priv_data;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2956
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2957 av_free(s->all_fragments);
2689
ed0ab6f82167 clear blocks after each idct instead of per picture
michael
parents: 2687
diff changeset
2958 av_free(s->coeffs);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2959 av_free(s->coded_fragment_list);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2960 av_free(s->superblock_fragments);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2961 av_free(s->superblock_macroblocks);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2962 av_free(s->macroblock_fragments);
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
2963 av_free(s->macroblock_coding);
1405
e69f99ade5b0 fix AVFrame.reference (the frames are used for decoding future frames so it should be !=0)
michaelni
parents: 1355
diff changeset
2964
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2965 /* 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
2966 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
2967 avctx->release_buffer(avctx, &s->golden_frame);
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2968 if (s->last_frame.data[0])
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2969 avctx->release_buffer(avctx, &s->last_frame);
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2970 /* 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
2971 * 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
2972
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2973 return 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2974 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2975
2718
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2976 static int read_huffman_tree(AVCodecContext *avctx, GetBitContext *gb)
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2977 {
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2978 Vp3DecodeContext *s = avctx->priv_data;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2979
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2980 if (get_bits(gb, 1)) {
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2981 int token;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2982 if (s->entries >= 32) { /* overflow */
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2983 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
2984 return -1;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2985 }
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2986 token = get_bits(gb, 5);
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2987 //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
2988 s->huffman_table[s->hti][token][0] = s->hbits;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2989 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
2990 s->entries++;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2991 }
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2992 else {
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2993 if (s->huff_code_size >= 32) {/* overflow */
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2994 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
2995 return -1;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2996 }
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2997 s->huff_code_size++;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2998 s->hbits <<= 1;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2999 read_huffman_tree(avctx, gb);
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
3000 s->hbits |= 1;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
3001 read_huffman_tree(avctx, gb);
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
3002 s->hbits >>= 1;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
3003 s->huff_code_size--;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
3004 }
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
3005 return 0;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
3006 }
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
3007
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
3008 static int theora_decode_header(AVCodecContext *avctx, 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
3009 {
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
3010 Vp3DecodeContext *s = avctx->priv_data;
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
3011 int major, minor, micro;
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
3012
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
3013 major = get_bits(&gb, 8); /* version major */
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
3014 minor = get_bits(&gb, 8); /* version minor */
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
3015 micro = get_bits(&gb, 8); /* version micro */
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
3016 av_log(avctx, AV_LOG_INFO, "Theora bitstream version %d.%d.%d\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
3017 major, minor, micro);
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
3018
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
3019 /* FIXME: endianess? */
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
3020 s->theora = (major << 16) | (minor << 8) | micro;
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
3021
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
3022 /* 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
3023 /* but previous versions have the image flipped relative to vp3 */
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
3024 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
3025 {
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
3026 s->flipped_image = 1;
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
3027 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
3028 }
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
3029
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
3030 s->width = get_bits(&gb, 16) << 4;
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
3031 s->height = get_bits(&gb, 16) << 4;
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
3032
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2370
diff changeset
3033 if(avcodec_check_dimensions(avctx, s->width, s->height)){
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2370
diff changeset
3034 s->width= s->height= 0;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2370
diff changeset
3035 return -1;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2370
diff changeset
3036 }
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2370
diff changeset
3037
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
3038 skip_bits(&gb, 24); /* frame width */
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
3039 skip_bits(&gb, 24); /* frame height */
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
3040
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
3041 skip_bits(&gb, 8); /* offset x */
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
3042 skip_bits(&gb, 8); /* offset y */
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
3043
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
3044 skip_bits(&gb, 32); /* fps numerator */
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
3045 skip_bits(&gb, 32); /* fps denumerator */
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
3046 skip_bits(&gb, 24); /* aspect numerator */
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
3047 skip_bits(&gb, 24); /* aspect denumerator */
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
3048
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
3049 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
3050 skip_bits(&gb, 5); /* keyframe frequency force */
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
3051 skip_bits(&gb, 8); /* colorspace */
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
3052 skip_bits(&gb, 24); /* bitrate */
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
3053
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
3054 skip_bits(&gb, 6); /* last(?) quality index */
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
3055
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
3056 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
3057 {
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
3058 skip_bits(&gb, 5); /* keyframe frequency force */
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
3059 skip_bits(&gb, 5); /* spare bits */
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
3060 }
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
3061
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
3062 // align_get_bits(&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
3063
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
3064 avctx->width = s->width;
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
3065 avctx->height = s->height;
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
3066
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
3067 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
3068 }
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
3069
1518
c66cdace3bf6 theora comments skipping
alex
parents: 1516
diff changeset
3070 static int theora_decode_comments(AVCodecContext *avctx, GetBitContext gb)
c66cdace3bf6 theora comments skipping
alex
parents: 1516
diff changeset
3071 {
c66cdace3bf6 theora comments skipping
alex
parents: 1516
diff changeset
3072 int nb_comments, i, tmp;
c66cdace3bf6 theora comments skipping
alex
parents: 1516
diff changeset
3073
2173
380c40efd6bb get_bits(32) fix
michael
parents: 2031
diff changeset
3074 tmp = get_bits_long(&gb, 32);
1664
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
3075 tmp = be2me_32(tmp);
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
3076 while(tmp--)
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
3077 skip_bits(&gb, 8);
1518
c66cdace3bf6 theora comments skipping
alex
parents: 1516
diff changeset
3078
2173
380c40efd6bb get_bits(32) fix
michael
parents: 2031
diff changeset
3079 nb_comments = get_bits_long(&gb, 32);
1664
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
3080 nb_comments = be2me_32(nb_comments);
1518
c66cdace3bf6 theora comments skipping
alex
parents: 1516
diff changeset
3081 for (i = 0; i < nb_comments; i++)
c66cdace3bf6 theora comments skipping
alex
parents: 1516
diff changeset
3082 {
2173
380c40efd6bb get_bits(32) fix
michael
parents: 2031
diff changeset
3083 tmp = get_bits_long(&gb, 32);
1664
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
3084 tmp = be2me_32(tmp);
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
3085 while(tmp--)
1518
c66cdace3bf6 theora comments skipping
alex
parents: 1516
diff changeset
3086 skip_bits(&gb, 8);
c66cdace3bf6 theora comments skipping
alex
parents: 1516
diff changeset
3087 }
c66cdace3bf6 theora comments skipping
alex
parents: 1516
diff changeset
3088
c66cdace3bf6 theora comments skipping
alex
parents: 1516
diff changeset
3089 return 0;
c66cdace3bf6 theora comments skipping
alex
parents: 1516
diff changeset
3090 }
c66cdace3bf6 theora comments skipping
alex
parents: 1516
diff changeset
3091
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
3092 static int theora_decode_tables(AVCodecContext *avctx, 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
3093 {
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
3094 Vp3DecodeContext *s = avctx->priv_data;
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
3095 int i, n;
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
3096
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
3097 if (s->theora >= 0x030200) {
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
3098 n = get_bits(&gb, 3);
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
3099 /* loop filter table */
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
3100 for (i = 0; i < 64; i++)
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
3101 skip_bits(&gb, n);
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
3102 }
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
3103
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
3104 if (s->theora >= 0x030200)
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
3105 n = get_bits(&gb, 4) + 1;
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
3106 else
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
3107 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
3108 /* 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
3109 for (i = 0; i < 64; i++)
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
3110 s->coded_ac_scale_factor[i] = get_bits(&gb, n);
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
3111
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
3112 if (s->theora >= 0x030200)
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
3113 n = get_bits(&gb, 4) + 1;
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
3114 else
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
3115 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
3116 /* 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
3117 for (i = 0; i < 64; i++)
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
3118 s->coded_dc_scale_factor[i] = get_bits(&gb, n);
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
3119
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
3120 if (s->theora >= 0x030200)
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
3121 n = get_bits(&gb, 9) + 1;
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
3122 else
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
3123 n = 3;
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
3124 if (n != 3) {
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
3125 av_log(NULL,AV_LOG_ERROR, "unsupported nbms : %d\n", n);
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
3126 return -1;
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
3127 }
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
3128 /* y coeffs */
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
3129 for (i = 0; i < 64; i++)
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
3130 s->coded_intra_y_dequant[i] = get_bits(&gb, 8);
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
3131
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
3132 /* uv coeffs */
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
3133 for (i = 0; i < 64; i++)
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
3134 s->coded_intra_c_dequant[i] = get_bits(&gb, 8);
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
3135
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
3136 /* inter coeffs */
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
3137 for (i = 0; i < 64; i++)
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
3138 s->coded_inter_dequant[i] = get_bits(&gb, 8);
1664
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
3139
2718
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
3140 /* Huffman tables */
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
3141 for (i = 0; i <= 1; i++) {
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
3142 for (n = 0; n <= 2; n++) {
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
3143 int newqr;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
3144 if (i > 0 || n > 0)
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
3145 newqr = get_bits(&gb, 1);
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
3146 else
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
3147 newqr = 1;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
3148 if (!newqr) {
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
3149 if (i > 0)
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
3150 get_bits(&gb, 1);
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
3151 }
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
3152 else {
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
3153 int qi = 0;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
3154 skip_bits(&gb, av_log2(2)+1);
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
3155 while (qi < 63) {
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
3156 qi += get_bits(&gb, av_log2(63-qi)+1) + 1;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
3157 skip_bits(&gb, av_log2(2)+1);
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
3158 }
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
3159 if (qi > 63)
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
3160 av_log(NULL, AV_LOG_ERROR, "error...\n");
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
3161 }
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
3162 }
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
3163 }
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
3164
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
3165 for (s->hti = 0; s->hti < 80; s->hti++) {
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
3166 s->entries = 0;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
3167 s->huff_code_size = 1;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
3168 if (!get_bits(&gb, 1)) {
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
3169 s->hbits = 0;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
3170 read_huffman_tree(avctx, &gb);
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
3171 s->hbits = 1;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
3172 read_huffman_tree(avctx, &gb);
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
3173 }
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
3174 }
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
3175
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
3176 s->theora_tables = 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
3177
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
3178 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
3179 }
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
3180
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
3181 static int theora_decode_init(AVCodecContext *avctx)
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
3182 {
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
3183 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
3184 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
3185 int ptype;
2533
06985f4138e3 04-vp3 fix(by matthieu castet).patch
michael
parents: 2531
diff changeset
3186 uint8_t *p= avctx->extradata;
06985f4138e3 04-vp3 fix(by matthieu castet).patch
michael
parents: 2531
diff changeset
3187 int op_bytes, i;
1516
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
3188
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
3189 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
3190
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
3191 if (!avctx->extradata_size)
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
3192 return -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
3193
2533
06985f4138e3 04-vp3 fix(by matthieu castet).patch
michael
parents: 2531
diff changeset
3194 for(i=0;i<3;i++) {
06985f4138e3 04-vp3 fix(by matthieu castet).patch
michael
parents: 2531
diff changeset
3195 op_bytes = *(p++)<<8;
06985f4138e3 04-vp3 fix(by matthieu castet).patch
michael
parents: 2531
diff changeset
3196 op_bytes += *(p++);
06985f4138e3 04-vp3 fix(by matthieu castet).patch
michael
parents: 2531
diff changeset
3197
06985f4138e3 04-vp3 fix(by matthieu castet).patch
michael
parents: 2531
diff changeset
3198 init_get_bits(&gb, p, op_bytes);
06985f4138e3 04-vp3 fix(by matthieu castet).patch
michael
parents: 2531
diff changeset
3199 p += op_bytes;
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
3200
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
3201 ptype = get_bits(&gb, 8);
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
3202 debug_vp3("Theora headerpacket type: %x\n", 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
3203
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
3204 if (!(ptype & 0x80))
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
3205 return -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
3206
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
3207 skip_bits(&gb, 6*8); /* "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
3208
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
3209 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
3210 {
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
3211 case 0x80:
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
3212 theora_decode_header(avctx, 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
3213 break;
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
3214 case 0x81:
1518
c66cdace3bf6 theora comments skipping
alex
parents: 1516
diff changeset
3215 theora_decode_comments(avctx, 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
3216 break;
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
3217 case 0x82:
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
3218 theora_decode_tables(avctx, 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
3219 break;
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
3220 }
2533
06985f4138e3 04-vp3 fix(by matthieu castet).patch
michael
parents: 2531
diff changeset
3221 }
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
3222
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
3223 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
3224 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
3225 }
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
3226
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
3227 AVCodec vp3_decoder = {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
3228 "vp3",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
3229 CODEC_TYPE_VIDEO,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
3230 CODEC_ID_VP3,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
3231 sizeof(Vp3DecodeContext),
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
3232 vp3_decode_init,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
3233 NULL,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
3234 vp3_decode_end,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
3235 vp3_decode_frame,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
3236 0,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
3237 NULL
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
3238 };
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
3239
2665
5ea2a7f74817 theora decoding using libtheora
mru
parents: 2533
diff changeset
3240 #ifndef CONFIG_LIBTHEORA
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
3241 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
3242 "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
3243 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
3244 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
3245 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
3246 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
3247 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
3248 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
3249 vp3_decode_frame,
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
3250 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
3251 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
3252 };
2665
5ea2a7f74817 theora decoding using libtheora
mru
parents: 2533
diff changeset
3253 #endif