annotate vp3.c @ 1628:e7420fdad5fc libavcodec

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