annotate vp3.c @ 2497:69adfbbdcdeb libavcodec

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