annotate vp3.c @ 2693:02925a3903b6 libavcodec

porting vp3 idct over to lavc idct api
author michael
date Tue, 17 May 2005 11:12:04 +0000
parents fb8f26fc57eb
children 0d229cf036b9
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 {
2689
ed0ab6f82167 clear blocks after each idct instead of per picture
michael
parents: 2687
diff changeset
138 DCTELEM *coeffs;
1224
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;
2689
ed0ab6f82167 clear blocks after each idct instead of per picture
michael
parents: 2687
diff changeset
249 DCTELEM *coeffs;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
250 int u_fragment_start;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
251 int v_fragment_start;
1516
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
252
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
253 /* tables */
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
254 uint16_t coded_dc_scale_factor[64];
1867
7f7aa6ac3723 cut over to using new VP3 DSP functions and remove the old ones; bring
melanson
parents: 1864
diff changeset
255 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
256 uint16_t coded_intra_y_dequant[64];
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
257 uint16_t coded_intra_c_dequant[64];
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
258 uint16_t coded_inter_dequant[64];
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
259
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
260 /* this is a list of indices into the all_fragments array indicating
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
261 * which of the fragments are coded */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
262 int *coded_fragment_list;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
263 int coded_fragment_list_index;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
264 int pixel_addresses_inited;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
265
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
266 VLC dc_vlc[16];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
267 VLC ac_vlc_1[16];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
268 VLC ac_vlc_2[16];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
269 VLC ac_vlc_3[16];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
270 VLC ac_vlc_4[16];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
271
1972
8a556283601d hook up support for SSE2-optimized VP3 IDCT
melanson
parents: 1867
diff changeset
272 /* 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
273 * index into them */
8a556283601d hook up support for SSE2-optimized VP3 IDCT
melanson
parents: 1867
diff changeset
274 int16_t __align16 intra_y_dequant[64];
8a556283601d hook up support for SSE2-optimized VP3 IDCT
melanson
parents: 1867
diff changeset
275 int16_t __align16 intra_c_dequant[64];
8a556283601d hook up support for SSE2-optimized VP3 IDCT
melanson
parents: 1867
diff changeset
276 int16_t __align16 inter_dequant[64];
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
277
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
278 /* This table contains superblock_count * 16 entries. Each set of 16
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
279 * numbers corresponds to the fragment indices 0..15 of the superblock.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
280 * 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
281 * index. */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
282 int *superblock_fragments;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
283
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
284 /* This table contains superblock_count * 4 entries. Each set of 4
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
285 * numbers corresponds to the macroblock indices 0..3 of the superblock.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
286 * 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
287 * index. */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
288 int *superblock_macroblocks;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
289
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
290 /* This table contains macroblock_count * 6 entries. Each set of 6
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
291 * numbers corresponds to the fragment indices 0..5 which comprise
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
292 * the macroblock (4 Y fragments and 2 C fragments). */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
293 int *macroblock_fragments;
1244
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
294 /* 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
295 * is coded. */
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
296 unsigned char *macroblock_coding;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
297
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
298 int first_coded_y_fragment;
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
299 int first_coded_c_fragment;
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
300 int last_coded_y_fragment;
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
301 int last_coded_c_fragment;
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
302
1406
ae5524a3cd08 MC rounding fixed?
michaelni
parents: 1405
diff changeset
303 uint8_t edge_emu_buffer[9*2048]; //FIXME dynamic alloc
1407
69f4f4fb8a50 fixing chroma MC
michaelni
parents: 1406
diff changeset
304 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
305 } Vp3DecodeContext;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
306
1664
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
307 static int theora_decode_comments(AVCodecContext *avctx, GetBitContext gb);
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
308 static int theora_decode_tables(AVCodecContext *avctx, GetBitContext gb);
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
309
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
310 /************************************************************************
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
311 * VP3 specific functions
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 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
315 * This function sets up all of the various blocks mappings:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
316 * superblocks <-> fragments, macroblocks <-> fragments,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
317 * superblocks <-> macroblocks
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
318 *
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
319 * Returns 0 is successful; returns 1 if *anything* went wrong.
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
320 */
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
321 static int init_block_mapping(Vp3DecodeContext *s)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
322 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
323 int i, j;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
324 signed int hilbert_walk_y[16];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
325 signed int hilbert_walk_c[16];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
326 signed int hilbert_walk_mb[4];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
327
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
328 int current_fragment = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
329 int current_width = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
330 int current_height = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
331 int right_edge = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
332 int bottom_edge = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
333 int superblock_row_inc = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
334 int *hilbert = NULL;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
335 int mapping_index = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
336
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
337 int current_macroblock;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
338 int c_fragment;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
339
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
340 signed char travel_width[16] = {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
341 1, 1, 0, -1,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
342 0, 0, 1, 0,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
343 1, 0, 1, 0,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
344 0, -1, 0, 1
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
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
347 signed char travel_height[16] = {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
348 0, 0, 1, 0,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
349 1, 1, 0, -1,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
350 0, 1, 0, -1,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
351 -1, 0, -1, 0
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
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
354 signed char travel_width_mb[4] = {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
355 1, 0, 1, 0
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
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
358 signed char travel_height_mb[4] = {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
359 0, 1, 0, -1
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
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
362 debug_vp3(" vp3: initialize block mapping tables\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
363
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
364 /* figure out hilbert pattern per these frame dimensions */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
365 hilbert_walk_y[0] = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
366 hilbert_walk_y[1] = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
367 hilbert_walk_y[2] = s->fragment_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
368 hilbert_walk_y[3] = -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
369 hilbert_walk_y[4] = s->fragment_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
370 hilbert_walk_y[5] = s->fragment_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
371 hilbert_walk_y[6] = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
372 hilbert_walk_y[7] = -s->fragment_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
373 hilbert_walk_y[8] = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
374 hilbert_walk_y[9] = s->fragment_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
375 hilbert_walk_y[10] = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
376 hilbert_walk_y[11] = -s->fragment_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
377 hilbert_walk_y[12] = -s->fragment_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
378 hilbert_walk_y[13] = -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
379 hilbert_walk_y[14] = -s->fragment_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
380 hilbert_walk_y[15] = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
381
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
382 hilbert_walk_c[0] = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
383 hilbert_walk_c[1] = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
384 hilbert_walk_c[2] = s->fragment_width / 2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
385 hilbert_walk_c[3] = -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
386 hilbert_walk_c[4] = s->fragment_width / 2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
387 hilbert_walk_c[5] = s->fragment_width / 2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
388 hilbert_walk_c[6] = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
389 hilbert_walk_c[7] = -s->fragment_width / 2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
390 hilbert_walk_c[8] = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
391 hilbert_walk_c[9] = s->fragment_width / 2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
392 hilbert_walk_c[10] = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
393 hilbert_walk_c[11] = -s->fragment_width / 2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
394 hilbert_walk_c[12] = -s->fragment_width / 2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
395 hilbert_walk_c[13] = -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
396 hilbert_walk_c[14] = -s->fragment_width / 2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
397 hilbert_walk_c[15] = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
398
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
399 hilbert_walk_mb[0] = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
400 hilbert_walk_mb[1] = s->macroblock_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
401 hilbert_walk_mb[2] = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
402 hilbert_walk_mb[3] = -s->macroblock_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
403
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
404 /* iterate through each superblock (all planes) and map the fragments */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
405 for (i = 0; i < s->superblock_count; i++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
406 debug_init(" superblock %d (u starts @ %d, v starts @ %d)\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
407 i, s->u_superblock_start, s->v_superblock_start);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
408
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
409 /* time to re-assign the limits? */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
410 if (i == 0) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
411
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
412 /* start of Y superblocks */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
413 right_edge = s->fragment_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
414 bottom_edge = s->fragment_height;
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
415 current_width = -1;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
416 current_height = 0;
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
417 superblock_row_inc = 3 * s->fragment_width -
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
418 (s->y_superblock_width * 4 - s->fragment_width);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
419 hilbert = hilbert_walk_y;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
420
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
421 /* the first operation for this variable is to advance by 1 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
422 current_fragment = -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
423
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
424 } else if (i == s->u_superblock_start) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
425
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
426 /* start of U superblocks */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
427 right_edge = s->fragment_width / 2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
428 bottom_edge = s->fragment_height / 2;
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
429 current_width = -1;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
430 current_height = 0;
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
431 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
432 (s->c_superblock_width * 4 - s->fragment_width / 2);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
433 hilbert = hilbert_walk_c;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
434
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
435 /* the first operation for this variable is to advance by 1 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
436 current_fragment = s->u_fragment_start - 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
437
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
438 } else if (i == s->v_superblock_start) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
439
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
440 /* start of V superblocks */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
441 right_edge = s->fragment_width / 2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
442 bottom_edge = s->fragment_height / 2;
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
443 current_width = -1;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
444 current_height = 0;
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
445 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
446 (s->c_superblock_width * 4 - s->fragment_width / 2);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
447 hilbert = hilbert_walk_c;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
448
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
449 /* the first operation for this variable is to advance by 1 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
450 current_fragment = s->v_fragment_start - 1;
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 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
453
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
454 if (current_width >= right_edge - 1) {
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
455 /* 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
456 current_width = -1;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
457 current_height += 4;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
458
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
459 /* fragment is now at the start of a new superblock row */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
460 current_fragment += superblock_row_inc;
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
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
463 /* iterate through all 16 fragments in a superblock */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
464 for (j = 0; j < 16; j++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
465 current_fragment += hilbert[j];
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
466 current_width += travel_width[j];
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
467 current_height += travel_height[j];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
468
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
469 /* 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
470 if ((current_width < right_edge) &&
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
471 (current_height < bottom_edge)) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
472 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
473 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
474 s->superblock_fragments[mapping_index], i, j,
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
475 current_width, right_edge, current_height, bottom_edge);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
476 } else {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
477 s->superblock_fragments[mapping_index] = -1;
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
478 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
479 i, j,
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
480 current_width, right_edge, current_height, bottom_edge);
1224
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
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
483 mapping_index++;
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
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
487 /* initialize the superblock <-> macroblock mapping; iterate through
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
488 * all of the Y plane superblocks to build this mapping */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
489 right_edge = s->macroblock_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
490 bottom_edge = s->macroblock_height;
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
491 current_width = -1;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
492 current_height = 0;
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
493 superblock_row_inc = s->macroblock_width -
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
494 (s->y_superblock_width * 2 - s->macroblock_width);;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
495 hilbert = hilbert_walk_mb;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
496 mapping_index = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
497 current_macroblock = -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
498 for (i = 0; i < s->u_superblock_start; i++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
499
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
500 if (current_width >= right_edge - 1) {
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
501 /* reset width and move to next superblock row */
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
502 current_width = -1;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
503 current_height += 2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
504
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
505 /* macroblock is now at the start of a new superblock row */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
506 current_macroblock += superblock_row_inc;
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
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
509 /* iterate through each potential macroblock in the superblock */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
510 for (j = 0; j < 4; j++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
511 current_macroblock += hilbert_walk_mb[j];
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
512 current_width += travel_width_mb[j];
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
513 current_height += travel_height_mb[j];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
514
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
515 /* 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
516 if ((current_width < right_edge) &&
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
517 (current_height < bottom_edge)) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
518 s->superblock_macroblocks[mapping_index] = current_macroblock;
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
519 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
520 s->superblock_macroblocks[mapping_index], i, j,
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
521 current_width, right_edge, current_height, bottom_edge);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
522 } else {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
523 s->superblock_macroblocks[mapping_index] = -1;
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
524 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
525 i, j,
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
526 current_width, right_edge, current_height, bottom_edge);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
527 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
528
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
529 mapping_index++;
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
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
533 /* initialize the macroblock <-> fragment mapping */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
534 current_fragment = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
535 current_macroblock = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
536 mapping_index = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
537 for (i = 0; i < s->fragment_height; i += 2) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
538
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
539 for (j = 0; j < s->fragment_width; j += 2) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
540
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
541 debug_init(" macroblock %d contains fragments: ", current_macroblock);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
542 s->all_fragments[current_fragment].macroblock = current_macroblock;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
543 s->macroblock_fragments[mapping_index++] = current_fragment;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
544 debug_init("%d ", current_fragment);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
545
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
546 if (j + 1 < s->fragment_width) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
547 s->all_fragments[current_fragment + 1].macroblock = current_macroblock;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
548 s->macroblock_fragments[mapping_index++] = current_fragment + 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
549 debug_init("%d ", current_fragment + 1);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
550 } else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
551 s->macroblock_fragments[mapping_index++] = -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
552
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
553 if (i + 1 < s->fragment_height) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
554 s->all_fragments[current_fragment + s->fragment_width].macroblock =
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
555 current_macroblock;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
556 s->macroblock_fragments[mapping_index++] =
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
557 current_fragment + s->fragment_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
558 debug_init("%d ", current_fragment + s->fragment_width);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
559 } else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
560 s->macroblock_fragments[mapping_index++] = -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
561
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
562 if ((j + 1 < s->fragment_width) && (i + 1 < s->fragment_height)) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
563 s->all_fragments[current_fragment + s->fragment_width + 1].macroblock =
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
564 current_macroblock;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
565 s->macroblock_fragments[mapping_index++] =
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
566 current_fragment + s->fragment_width + 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
567 debug_init("%d ", current_fragment + s->fragment_width + 1);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
568 } else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
569 s->macroblock_fragments[mapping_index++] = -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
570
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
571 /* C planes */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
572 c_fragment = s->u_fragment_start +
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
573 (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
574 s->all_fragments[c_fragment].macroblock = s->macroblock_count;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
575 s->macroblock_fragments[mapping_index++] = c_fragment;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
576 debug_init("%d ", c_fragment);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
577
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
578 c_fragment = s->v_fragment_start +
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
579 (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
580 s->all_fragments[c_fragment].macroblock = s->macroblock_count;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
581 s->macroblock_fragments[mapping_index++] = c_fragment;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
582 debug_init("%d ", c_fragment);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
583
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
584 debug_init("\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
585
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
586 if (j + 2 <= s->fragment_width)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
587 current_fragment += 2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
588 else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
589 current_fragment++;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
590 current_macroblock++;
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
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
593 current_fragment += s->fragment_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
594 }
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
595
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
596 return 0; /* successful path out */
1224
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 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
600 * 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
601 * 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
602 * before next non-zero coefficient), the next DCT coefficient, and the
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
603 * number of consecutive, non-EOB'd DCT blocks to EOB.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
604 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
605 static void unpack_token(GetBitContext *gb, int token, int *zero_run,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
606 DCTELEM *coeff, int *eob_run)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
607 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
608 int sign;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
609
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
610 *zero_run = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
611 *eob_run = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
612 *coeff = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
613
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
614 debug_token(" vp3 token %d: ", token);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
615 switch (token) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
616
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
617 case 0:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
618 debug_token("DCT_EOB_TOKEN, EOB next block\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
619 *eob_run = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
620 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
621
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
622 case 1:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
623 debug_token("DCT_EOB_PAIR_TOKEN, EOB next 2 blocks\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
624 *eob_run = 2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
625 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
626
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
627 case 2:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
628 debug_token("DCT_EOB_TRIPLE_TOKEN, EOB next 3 blocks\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
629 *eob_run = 3;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
630 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
631
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
632 case 3:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
633 debug_token("DCT_REPEAT_RUN_TOKEN, ");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
634 *eob_run = get_bits(gb, 2) + 4;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
635 debug_token("EOB the next %d blocks\n", *eob_run);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
636 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
637
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
638 case 4:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
639 debug_token("DCT_REPEAT_RUN2_TOKEN, ");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
640 *eob_run = get_bits(gb, 3) + 8;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
641 debug_token("EOB the next %d blocks\n", *eob_run);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
642 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
643
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
644 case 5:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
645 debug_token("DCT_REPEAT_RUN3_TOKEN, ");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
646 *eob_run = get_bits(gb, 4) + 16;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
647 debug_token("EOB the next %d blocks\n", *eob_run);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
648 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
649
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
650 case 6:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
651 debug_token("DCT_REPEAT_RUN4_TOKEN, ");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
652 *eob_run = get_bits(gb, 12);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
653 debug_token("EOB the next %d blocks\n", *eob_run);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
654 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
655
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
656 case 7:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
657 debug_token("DCT_SHORT_ZRL_TOKEN, ");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
658 /* 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
659 * 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
660 * coefficient of 0. */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
661 *zero_run = get_bits(gb, 3);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
662 *coeff = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
663 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
664 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
665
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
666 case 8:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
667 debug_token("DCT_ZRL_TOKEN, ");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
668 /* 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
669 * 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
670 * coefficient of 0. */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
671 *zero_run = get_bits(gb, 6);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
672 *coeff = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
673 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
674 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
675
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
676 case 9:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
677 debug_token("ONE_TOKEN, output 1\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
678 *coeff = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
679 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
680
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
681 case 10:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
682 debug_token("MINUS_ONE_TOKEN, output -1\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
683 *coeff = -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
684 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
685
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
686 case 11:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
687 debug_token("TWO_TOKEN, output 2\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
688 *coeff = 2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
689 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
690
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
691 case 12:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
692 debug_token("MINUS_TWO_TOKEN, output -2\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
693 *coeff = -2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
694 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
695
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
696 case 13:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
697 case 14:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
698 case 15:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
699 case 16:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
700 debug_token("LOW_VAL_TOKENS, ");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
701 if (get_bits(gb, 1))
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
702 *coeff = -(3 + (token - 13));
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
703 else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
704 *coeff = 3 + (token - 13);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
705 debug_token("output %d\n", *coeff);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
706 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
707
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
708 case 17:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
709 debug_token("DCT_VAL_CATEGORY3, ");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
710 sign = get_bits(gb, 1);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
711 *coeff = 7 + get_bits(gb, 1);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
712 if (sign)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
713 *coeff = -(*coeff);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
714 debug_token("output %d\n", *coeff);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
715 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
716
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
717 case 18:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
718 debug_token("DCT_VAL_CATEGORY4, ");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
719 sign = get_bits(gb, 1);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
720 *coeff = 9 + get_bits(gb, 2);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
721 if (sign)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
722 *coeff = -(*coeff);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
723 debug_token("output %d\n", *coeff);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
724 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
725
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
726 case 19:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
727 debug_token("DCT_VAL_CATEGORY5, ");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
728 sign = get_bits(gb, 1);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
729 *coeff = 13 + get_bits(gb, 3);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
730 if (sign)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
731 *coeff = -(*coeff);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
732 debug_token("output %d\n", *coeff);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
733 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
734
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
735 case 20:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
736 debug_token("DCT_VAL_CATEGORY6, ");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
737 sign = get_bits(gb, 1);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
738 *coeff = 21 + get_bits(gb, 4);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
739 if (sign)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
740 *coeff = -(*coeff);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
741 debug_token("output %d\n", *coeff);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
742 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
743
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
744 case 21:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
745 debug_token("DCT_VAL_CATEGORY7, ");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
746 sign = get_bits(gb, 1);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
747 *coeff = 37 + get_bits(gb, 5);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
748 if (sign)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
749 *coeff = -(*coeff);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
750 debug_token("output %d\n", *coeff);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
751 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
752
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
753 case 22:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
754 debug_token("DCT_VAL_CATEGORY8, ");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
755 sign = get_bits(gb, 1);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
756 *coeff = 69 + get_bits(gb, 9);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
757 if (sign)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
758 *coeff = -(*coeff);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
759 debug_token("output %d\n", *coeff);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
760 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
761
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
762 case 23:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
763 case 24:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
764 case 25:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
765 case 26:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
766 case 27:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
767 debug_token("DCT_RUN_CATEGORY1, ");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
768 *zero_run = token - 22;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
769 if (get_bits(gb, 1))
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
770 *coeff = -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
771 else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
772 *coeff = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
773 debug_token("output %d 0s, then %d\n", *zero_run, *coeff);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
774 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
775
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
776 case 28:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
777 debug_token("DCT_RUN_CATEGORY1B, ");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
778 if (get_bits(gb, 1))
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
779 *coeff = -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
780 else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
781 *coeff = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
782 *zero_run = 6 + get_bits(gb, 2);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
783 debug_token("output %d 0s, then %d\n", *zero_run, *coeff);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
784 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
785
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
786 case 29:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
787 debug_token("DCT_RUN_CATEGORY1C, ");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
788 if (get_bits(gb, 1))
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
789 *coeff = -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
790 else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
791 *coeff = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
792 *zero_run = 10 + get_bits(gb, 3);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
793 debug_token("output %d 0s, then %d\n", *zero_run, *coeff);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
794 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
795
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
796 case 30:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
797 debug_token("DCT_RUN_CATEGORY2, ");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
798 sign = get_bits(gb, 1);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
799 *coeff = 2 + get_bits(gb, 1);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
800 if (sign)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
801 *coeff = -(*coeff);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
802 *zero_run = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
803 debug_token("output %d 0s, then %d\n", *zero_run, *coeff);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
804 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
805
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
806 case 31:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
807 debug_token("DCT_RUN_CATEGORY2, ");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
808 sign = get_bits(gb, 1);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
809 *coeff = 2 + get_bits(gb, 1);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
810 if (sign)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
811 *coeff = -(*coeff);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
812 *zero_run = 2 + get_bits(gb, 1);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
813 debug_token("output %d 0s, then %d\n", *zero_run, *coeff);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
814 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
815
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
816 default:
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1518
diff changeset
817 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
818 break;
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 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
824 * This function wipes out all of the fragment data.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
825 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
826 static void init_frame(Vp3DecodeContext *s, GetBitContext *gb)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
827 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
828 int i;
2689
ed0ab6f82167 clear blocks after each idct instead of per picture
michael
parents: 2687
diff changeset
829 static const DCTELEM zero_block[64];
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
830
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
831 /* zero out all of the fragment information */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
832 s->coded_fragment_list_index = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
833 for (i = 0; i < s->fragment_count; i++) {
2689
ed0ab6f82167 clear blocks after each idct instead of per picture
michael
parents: 2687
diff changeset
834 s->all_fragments[i].coeffs = zero_block;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
835 s->all_fragments[i].coeff_count = 0;
2690
9cd85de24bcb fix last coeff
michael
parents: 2689
diff changeset
836 s->all_fragments[i].last_coeff = -1;
1292
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
837 s->all_fragments[i].motion_x = 0xbeef;
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
838 s->all_fragments[i].motion_y = 0xbeef;
1224
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
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
842 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
843 * This function sets of the dequantization tables used for a particular
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
844 * frame.
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 static void init_dequantizer(Vp3DecodeContext *s)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
847 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
848
1867
7f7aa6ac3723 cut over to using new VP3 DSP functions and remove the old ones; bring
melanson
parents: 1864
diff changeset
849 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
850 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
851 int i, j;
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 debug_vp3(" vp3: initializing dequantization tables\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
854
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 * Scale dequantizers:
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 * quantizer * sf
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 * 100
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
861 *
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
862 * 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
863 * or ac_scale_factor for AC quantizer
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
864 *
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
865 * 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
866 */
1355
1c05f4290517 added the official VP3 IDCT (C implementation) as well as a grayscale
tmmm
parents: 1292
diff changeset
867 #define SCALER 4
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
868
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
869 /* 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
870 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
871 if (s->intra_y_dequant[0] < MIN_DEQUANT_VAL * 2)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
872 s->intra_y_dequant[0] = MIN_DEQUANT_VAL * 2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
873 s->intra_y_dequant[0] *= SCALER;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
874
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
875 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
876 if (s->intra_c_dequant[0] < MIN_DEQUANT_VAL * 2)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
877 s->intra_c_dequant[0] = MIN_DEQUANT_VAL * 2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
878 s->intra_c_dequant[0] *= SCALER;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
879
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
880 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
881 if (s->inter_dequant[0] < MIN_DEQUANT_VAL * 4)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
882 s->inter_dequant[0] = MIN_DEQUANT_VAL * 4;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
883 s->inter_dequant[0] *= SCALER;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
884
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
885 /* scale AC quantizers, zigzag at the same time in preparation for
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
886 * the dequantization phase */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
887 for (i = 1; i < 64; i++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
888
2692
fb8f26fc57eb remove permutation done to quant tables and then undone during idct
michael
parents: 2690
diff changeset
889 j = i;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
890
1867
7f7aa6ac3723 cut over to using new VP3 DSP functions and remove the old ones; bring
melanson
parents: 1864
diff changeset
891 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
892 if (s->intra_y_dequant[j] < MIN_DEQUANT_VAL)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
893 s->intra_y_dequant[j] = MIN_DEQUANT_VAL;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
894 s->intra_y_dequant[j] *= SCALER;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
895
1867
7f7aa6ac3723 cut over to using new VP3 DSP functions and remove the old ones; bring
melanson
parents: 1864
diff changeset
896 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
897 if (s->intra_c_dequant[j] < MIN_DEQUANT_VAL)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
898 s->intra_c_dequant[j] = MIN_DEQUANT_VAL;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
899 s->intra_c_dequant[j] *= SCALER;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
900
1867
7f7aa6ac3723 cut over to using new VP3 DSP functions and remove the old ones; bring
melanson
parents: 1864
diff changeset
901 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
902 if (s->inter_dequant[j] < MIN_DEQUANT_VAL * 2)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
903 s->inter_dequant[j] = MIN_DEQUANT_VAL * 2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
904 s->inter_dequant[j] *= SCALER;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
905 }
1407
69f4f4fb8a50 fixing chroma MC
michaelni
parents: 1406
diff changeset
906
69f4f4fb8a50 fixing chroma MC
michaelni
parents: 1406
diff changeset
907 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
908
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
909 /* print debug information as requested */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
910 debug_dequantizers("intra Y dequantizers:\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
911 for (i = 0; i < 8; i++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
912 for (j = i * 8; j < i * 8 + 8; j++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
913 debug_dequantizers(" %4d,", s->intra_y_dequant[j]);
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("\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
918
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
919 debug_dequantizers("intra C dequantizers:\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
920 for (i = 0; i < 8; i++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
921 for (j = i * 8; j < i * 8 + 8; j++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
922 debug_dequantizers(" %4d,", s->intra_c_dequant[j]);
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("\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
927
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
928 debug_dequantizers("interframe dequantizers:\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
929 for (i = 0; i < 8; i++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
930 for (j = i * 8; j < i * 8 + 8; j++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
931 debug_dequantizers(" %4d,", s->inter_dequant[j]);
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 debug_dequantizers("\n");
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
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
938 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
939 * 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
940 * use in determining which superblocks are fully and partially coded.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
941 *
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
942 * Codeword RunLength
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
943 * 0 1
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
944 * 10x 2-3
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
945 * 110x 4-5
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
946 * 1110xx 6-9
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
947 * 11110xxx 10-17
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
948 * 111110xxxx 18-33
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
949 * 111111xxxxxxxxxxxx 34-4129
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 static int get_superblock_run_length(GetBitContext *gb)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
952 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
953
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
954 if (get_bits(gb, 1) == 0)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
955 return 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
956
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
957 else if (get_bits(gb, 1) == 0)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
958 return (2 + get_bits(gb, 1));
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
959
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
960 else if (get_bits(gb, 1) == 0)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
961 return (4 + get_bits(gb, 1));
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
962
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
963 else if (get_bits(gb, 1) == 0)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
964 return (6 + get_bits(gb, 2));
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
965
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
966 else if (get_bits(gb, 1) == 0)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
967 return (10 + get_bits(gb, 3));
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
968
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
969 else if (get_bits(gb, 1) == 0)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
970 return (18 + get_bits(gb, 4));
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
971
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
972 else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
973 return (34 + get_bits(gb, 12));
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
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
977 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
978 * 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
979 * use in determining which particular fragments are coded.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
980 *
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
981 * Codeword RunLength
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
982 * 0x 1-2
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
983 * 10x 3-4
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
984 * 110x 5-6
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
985 * 1110xx 7-10
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
986 * 11110xx 11-14
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
987 * 11111xxxx 15-30
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 static int get_fragment_run_length(GetBitContext *gb)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
990 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
991
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
992 if (get_bits(gb, 1) == 0)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
993 return (1 + get_bits(gb, 1));
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
994
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
995 else if (get_bits(gb, 1) == 0)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
996 return (3 + get_bits(gb, 1));
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
997
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
998 else if (get_bits(gb, 1) == 0)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
999 return (5 + get_bits(gb, 1));
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1000
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1001 else if (get_bits(gb, 1) == 0)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1002 return (7 + get_bits(gb, 2));
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1003
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1004 else if (get_bits(gb, 1) == 0)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1005 return (11 + get_bits(gb, 2));
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1006
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1007 else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1008 return (15 + get_bits(gb, 4));
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
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1012 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1013 * 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
1014 * 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
1015 * modes to use.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1016 *
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1017 * VLC Number
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1018 * 0 0
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1019 * 10 1
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1020 * 110 2
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1021 * 1110 3
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1022 * 11110 4
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1023 * 111110 5
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1024 * 1111110 6
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1025 * 1111111 7
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1026 *
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 static int get_mode_code(GetBitContext *gb)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1029 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1030
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1031 if (get_bits(gb, 1) == 0)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1032 return 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1033
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1034 else if (get_bits(gb, 1) == 0)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1035 return 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1036
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1037 else if (get_bits(gb, 1) == 0)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1038 return 2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1039
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1040 else if (get_bits(gb, 1) == 0)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1041 return 3;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1042
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1043 else if (get_bits(gb, 1) == 0)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1044 return 4;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1045
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1046 else if (get_bits(gb, 1) == 0)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1047 return 5;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1048
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1049 else if (get_bits(gb, 1) == 0)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1050 return 6;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1051
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1052 else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1053 return 7;
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
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1057 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1058 * 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
1059 * 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
1060 * taken depending on the value on those 3 bits:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1061 *
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1062 * 0: return 0
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1063 * 1: return 1
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1064 * 2: return -1
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1065 * 3: if (next bit is 1) return -2, else return 2
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1066 * 4: if (next bit is 1) return -3, else return 3
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1067 * 5: return 4 + (next 2 bits), next bit is sign
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1068 * 6: return 8 + (next 3 bits), next bit is sign
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1069 * 7: return 16 + (next 4 bits), next bit is sign
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 static int get_motion_vector_vlc(GetBitContext *gb)
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 int bits;
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 bits = get_bits(gb, 3);
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 switch(bits) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1078
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1079 case 0:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1080 bits = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1081 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1082
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1083 case 1:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1084 bits = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1085 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1086
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1087 case 2:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1088 bits = -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1089 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1090
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1091 case 3:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1092 if (get_bits(gb, 1) == 0)
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 else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1095 bits = -2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1096 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1097
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1098 case 4:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1099 if (get_bits(gb, 1) == 0)
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 else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1102 bits = -3;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1103 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1104
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1105 case 5:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1106 bits = 4 + get_bits(gb, 2);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1107 if (get_bits(gb, 1) == 1)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1108 bits = -bits;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1109 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1110
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1111 case 6:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1112 bits = 8 + get_bits(gb, 3);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1113 if (get_bits(gb, 1) == 1)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1114 bits = -bits;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1115 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1116
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1117 case 7:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1118 bits = 16 + get_bits(gb, 4);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1119 if (get_bits(gb, 1) == 1)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1120 bits = -bits;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1121 break;
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 }
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 return bits;
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
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1128 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1129 * 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
1130 * a sign and calls it a motion vector.
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 static int get_motion_vector_fixed(GetBitContext *gb)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1133 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1134
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1135 int bits;
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 bits = get_bits(gb, 5);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1138
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1139 if (get_bits(gb, 1) == 1)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1140 bits = -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 return bits;
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
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1145 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1146 * This function unpacks all of the superblock/macroblock/fragment coding
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1147 * information from the bitstream.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1148 */
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1149 static int unpack_superblocks(Vp3DecodeContext *s, GetBitContext *gb)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1150 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1151 int bit = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1152 int current_superblock = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1153 int current_run = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1154 int decode_fully_flags = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1155 int decode_partial_blocks = 0;
1272
777d4145cdfb fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents: 1244
diff changeset
1156 int first_c_fragment_seen;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1157
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1158 int i, j;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1159 int current_fragment;
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 debug_vp3(" vp3: unpacking superblock coding\n");
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 if (s->keyframe) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1164
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1165 debug_vp3(" keyframe-- all superblocks are fully coded\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1166 memset(s->superblock_coding, SB_FULLY_CODED, s->superblock_count);
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 } else {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1169
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1170 /* unpack the list of partially-coded superblocks */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1171 bit = get_bits(gb, 1);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1172 /* 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
1173 * fetched the bit will be toggled again */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1174 bit ^= 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1175 while (current_superblock < s->superblock_count) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1176 if (current_run == 0) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1177 bit ^= 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1178 current_run = get_superblock_run_length(gb);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1179 debug_block_coding(" setting superblocks %d..%d to %s\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1180 current_superblock,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1181 current_superblock + current_run - 1,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1182 (bit) ? "partially coded" : "not coded");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1183
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1184 /* if any of the superblocks are not partially coded, flag
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1185 * 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
1186 if (bit == 0) {
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1187 decode_fully_flags = 1;
1292
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
1188 } else {
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
1189
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
1190 /* 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
1191 * superblocks */
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
1192 decode_partial_blocks = 1;
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
1193 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1194 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1195 s->superblock_coding[current_superblock++] =
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1196 (bit) ? SB_PARTIALLY_CODED : SB_NOT_CODED;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1197 current_run--;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1198 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1199
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1200 /* 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
1201 * not marked as partially coded in the previous step */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1202 if (decode_fully_flags) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1203
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1204 current_superblock = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1205 current_run = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1206 bit = get_bits(gb, 1);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1207 /* 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
1208 * fetched the bit will be toggled again */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1209 bit ^= 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1210 while (current_superblock < s->superblock_count) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1211
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1212 /* skip any superblocks already marked as partially coded */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1213 if (s->superblock_coding[current_superblock] == SB_NOT_CODED) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1214
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1215 if (current_run == 0) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1216 bit ^= 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1217 current_run = get_superblock_run_length(gb);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1218 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1219
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1220 debug_block_coding(" setting superblock %d to %s\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1221 current_superblock,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1222 (bit) ? "fully coded" : "not coded");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1223 s->superblock_coding[current_superblock] =
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1224 (bit) ? SB_FULLY_CODED : SB_NOT_CODED;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1225 current_run--;
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 current_superblock++;
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 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1230
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1231 /* if there were partial blocks, initialize bitstream for
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1232 * unpacking fragment codings */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1233 if (decode_partial_blocks) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1234
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1235 current_run = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1236 bit = get_bits(gb, 1);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1237 /* 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
1238 * fetched the bit will be toggled again */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1239 bit ^= 1;
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 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1242
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1243 /* figure out which fragments are coded; iterate through each
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1244 * superblock (all planes) */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1245 s->coded_fragment_list_index = 0;
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1246 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
1247 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
1248 first_c_fragment_seen = 0;
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
1249 memset(s->macroblock_coding, MODE_COPY, s->macroblock_count);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1250 for (i = 0; i < s->superblock_count; i++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1251
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1252 /* iterate through all 16 fragments in a superblock */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1253 for (j = 0; j < 16; j++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1254
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1255 /* if the fragment is in bounds, check its coding status */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1256 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
1257 if (current_fragment >= s->fragment_count) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1518
diff changeset
1258 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
1259 current_fragment, s->fragment_count);
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1260 return 1;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1261 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1262 if (current_fragment != -1) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1263 if (s->superblock_coding[i] == SB_NOT_CODED) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1264
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1265 /* copy all the fragments from the prior frame */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1266 s->all_fragments[current_fragment].coding_method =
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1267 MODE_COPY;
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 } else if (s->superblock_coding[i] == SB_PARTIALLY_CODED) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1270
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1271 /* fragment may or may not be coded; this is the case
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1272 * that cares about the fragment coding runs */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1273 if (current_run == 0) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1274 bit ^= 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1275 current_run = get_fragment_run_length(gb);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1276 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1277
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1278 if (bit) {
1272
777d4145cdfb fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents: 1244
diff changeset
1279 /* 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
1280 * the next phase */
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1281 s->all_fragments[current_fragment].coding_method =
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1282 MODE_INTER_NO_MV;
2689
ed0ab6f82167 clear blocks after each idct instead of per picture
michael
parents: 2687
diff changeset
1283 s->all_fragments[current_fragment].coeffs= s->coeffs + 64*s->coded_fragment_list_index;
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1284 s->coded_fragment_list[s->coded_fragment_list_index] =
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1285 current_fragment;
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1286 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
1287 (s->last_coded_y_fragment == -1) &&
777d4145cdfb fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents: 1244
diff changeset
1288 (!first_c_fragment_seen)) {
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1289 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
1290 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
1291 first_c_fragment_seen = 1;
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1292 }
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1293 s->coded_fragment_list_index++;
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
1294 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
1295 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
1296 i, current_fragment);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1297 } else {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1298 /* not coded; copy this fragment from the prior frame */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1299 s->all_fragments[current_fragment].coding_method =
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1300 MODE_COPY;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1301 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
1302 i, current_fragment);
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
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1305 current_run--;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1306
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1307 } else {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1308
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1309 /* fragments are fully coded in this superblock; actual
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1310 * coding will be determined in next step */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1311 s->all_fragments[current_fragment].coding_method =
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1312 MODE_INTER_NO_MV;
2689
ed0ab6f82167 clear blocks after each idct instead of per picture
michael
parents: 2687
diff changeset
1313 s->all_fragments[current_fragment].coeffs= s->coeffs + 64*s->coded_fragment_list_index;
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1314 s->coded_fragment_list[s->coded_fragment_list_index] =
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1315 current_fragment;
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1316 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
1317 (s->last_coded_y_fragment == -1) &&
777d4145cdfb fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents: 1244
diff changeset
1318 (!first_c_fragment_seen)) {
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1319 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
1320 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
1321 first_c_fragment_seen = 1;
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1322 }
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1323 s->coded_fragment_list_index++;
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
1324 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
1325 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
1326 i, current_fragment);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1327 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1328 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1329 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1330 }
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1331
1272
777d4145cdfb fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents: 1244
diff changeset
1332 if (!first_c_fragment_seen)
777d4145cdfb fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents: 1244
diff changeset
1333 /* 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
1334 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
1335 else
1292
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
1336 /* 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
1337 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
1338
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1339 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
1340 s->coded_fragment_list_index,
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1341 s->first_coded_y_fragment,
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1342 s->last_coded_y_fragment,
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1343 s->first_coded_c_fragment,
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1344 s->last_coded_c_fragment);
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1345
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1346 return 0;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1347 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1348
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1349 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1350 * This function unpacks all the coding mode data for individual macroblocks
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1351 * from the bitstream.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1352 */
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1353 static int unpack_modes(Vp3DecodeContext *s, GetBitContext *gb)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1354 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1355 int i, j, k;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1356 int scheme;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1357 int current_macroblock;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1358 int current_fragment;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1359 int coding_mode;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1360
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1361 debug_vp3(" vp3: unpacking encoding modes\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1362
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1363 if (s->keyframe) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1364 debug_vp3(" keyframe-- all blocks are coded as INTRA\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1365
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1366 for (i = 0; i < s->fragment_count; i++)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1367 s->all_fragments[i].coding_method = MODE_INTRA;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1368
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1369 } else {
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 /* fetch the mode coding scheme for this frame */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1372 scheme = get_bits(gb, 3);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1373 debug_modes(" using mode alphabet %d\n", scheme);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1374
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1375 /* is it a custom coding scheme? */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1376 if (scheme == 0) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1377 debug_modes(" custom mode alphabet ahead:\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1378 for (i = 0; i < 8; i++)
1233
5d66713e97e2 correct the custom coding mode alphabet, add some validation on the
tmmm
parents: 1230
diff changeset
1379 ModeAlphabet[scheme][get_bits(gb, 3)] = i;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1380 }
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 for (i = 0; i < 8; i++)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1383 debug_modes(" mode[%d][%d] = %d\n", scheme, i,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1384 ModeAlphabet[scheme][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 /* iterate through all of the macroblocks that contain 1 or more
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1387 * coded fragments */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1388 for (i = 0; i < s->u_superblock_start; i++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1389
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1390 for (j = 0; j < 4; j++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1391 current_macroblock = s->superblock_macroblocks[i * 4 + j];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1392 if ((current_macroblock == -1) ||
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
1393 (s->macroblock_coding[current_macroblock] == MODE_COPY))
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1394 continue;
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1395 if (current_macroblock >= s->macroblock_count) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1518
diff changeset
1396 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
1397 current_macroblock, s->macroblock_count);
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1398 return 1;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1399 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1400
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1401 /* mode 7 means get 3 bits for each coding mode */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1402 if (scheme == 7)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1403 coding_mode = get_bits(gb, 3);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1404 else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1405 coding_mode = ModeAlphabet[scheme][get_mode_code(gb)];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1406
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
1407 s->macroblock_coding[current_macroblock] = coding_mode;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1408 for (k = 0; k < 6; k++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1409 current_fragment =
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1410 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
1411 if (current_fragment == -1)
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1412 continue;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1413 if (current_fragment >= s->fragment_count) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1518
diff changeset
1414 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
1415 current_fragment, s->fragment_count);
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1416 return 1;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1417 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1418 if (s->all_fragments[current_fragment].coding_method !=
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1419 MODE_COPY)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1420 s->all_fragments[current_fragment].coding_method =
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1421 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 debug_modes(" coding method for macroblock starting @ fragment %d = %d\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1425 s->macroblock_fragments[current_macroblock * 6], coding_mode);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1426 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1427 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1428 }
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1429
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1430 return 0;
1229
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
1431 }
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
1432
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
1433 /*
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1434 * This function unpacks all the motion vectors for the individual
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1435 * macroblocks from the bitstream.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1436 */
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1437 static int unpack_vectors(Vp3DecodeContext *s, GetBitContext *gb)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1438 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1439 int i, j, k;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1440 int coding_mode;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1441 int motion_x[6];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1442 int motion_y[6];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1443 int last_motion_x = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1444 int last_motion_y = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1445 int prior_last_motion_x = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1446 int prior_last_motion_y = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1447 int current_macroblock;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1448 int current_fragment;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1449
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1450 debug_vp3(" vp3: unpacking motion vectors\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1451 if (s->keyframe) {
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 debug_vp3(" keyframe-- there are no motion vectors\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1454
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1455 } else {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1456
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1457 memset(motion_x, 0, 6 * sizeof(int));
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1458 memset(motion_y, 0, 6 * sizeof(int));
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1459
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1460 /* 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
1461 coding_mode = get_bits(gb, 1);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1462 debug_vectors(" using %s scheme for unpacking motion vectors\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1463 (coding_mode == 0) ? "VLC" : "fixed-length");
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 /* iterate through all of the macroblocks that contain 1 or more
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1466 * coded fragments */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1467 for (i = 0; i < s->u_superblock_start; i++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1468
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1469 for (j = 0; j < 4; j++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1470 current_macroblock = s->superblock_macroblocks[i * 4 + j];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1471 if ((current_macroblock == -1) ||
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
1472 (s->macroblock_coding[current_macroblock] == MODE_COPY))
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1473 continue;
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1474 if (current_macroblock >= s->macroblock_count) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1518
diff changeset
1475 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
1476 current_macroblock, s->macroblock_count);
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1477 return 1;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1478 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1479
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1480 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
1481 if (current_fragment >= s->fragment_count) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1518
diff changeset
1482 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
1483 current_fragment, s->fragment_count);
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1484 return 1;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1485 }
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
1486 switch (s->macroblock_coding[current_macroblock]) {
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1487
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1488 case MODE_INTER_PLUS_MV:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1489 case MODE_GOLDEN_MV:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1490 /* all 6 fragments use the same motion vector */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1491 if (coding_mode == 0) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1492 motion_x[0] = get_motion_vector_vlc(gb);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1493 motion_y[0] = get_motion_vector_vlc(gb);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1494 } else {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1495 motion_x[0] = get_motion_vector_fixed(gb);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1496 motion_y[0] = get_motion_vector_fixed(gb);
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 for (k = 1; k < 6; k++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1499 motion_x[k] = motion_x[0];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1500 motion_y[k] = motion_y[0];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1501 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1502
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1503 /* 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
1504 if (s->macroblock_coding[current_macroblock] ==
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1505 MODE_INTER_PLUS_MV) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1506 prior_last_motion_x = last_motion_x;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1507 prior_last_motion_y = last_motion_y;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1508 last_motion_x = motion_x[0];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1509 last_motion_y = motion_y[0];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1510 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1511 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1512
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1513 case MODE_INTER_FOURMV:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1514 /* fetch 4 vectors from the bitstream, one for each
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1515 * Y fragment, then average for the C fragment vectors */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1516 motion_x[4] = motion_y[4] = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1517 for (k = 0; k < 4; k++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1518 if (coding_mode == 0) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1519 motion_x[k] = get_motion_vector_vlc(gb);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1520 motion_y[k] = get_motion_vector_vlc(gb);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1521 } else {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1522 motion_x[k] = get_motion_vector_fixed(gb);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1523 motion_y[k] = get_motion_vector_fixed(gb);
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 motion_x[4] += motion_x[k];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1526 motion_y[4] += motion_y[k];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1527 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1528
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1529 if (motion_x[4] >= 0)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1530 motion_x[4] = (motion_x[4] + 2) / 4;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1531 else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1532 motion_x[4] = (motion_x[4] - 2) / 4;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1533 motion_x[5] = motion_x[4];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1534
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1535 if (motion_y[4] >= 0)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1536 motion_y[4] = (motion_y[4] + 2) / 4;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1537 else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1538 motion_y[4] = (motion_y[4] - 2) / 4;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1539 motion_y[5] = motion_y[4];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1540
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1541 /* vector maintenance; vector[3] is treated as the
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1542 * last vector in this case */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1543 prior_last_motion_x = last_motion_x;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1544 prior_last_motion_y = last_motion_y;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1545 last_motion_x = motion_x[3];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1546 last_motion_y = motion_y[3];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1547 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1548
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1549 case MODE_INTER_LAST_MV:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1550 /* all 6 fragments use the last motion vector */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1551 motion_x[0] = last_motion_x;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1552 motion_y[0] = last_motion_y;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1553 for (k = 1; k < 6; k++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1554 motion_x[k] = motion_x[0];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1555 motion_y[k] = motion_y[0];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1556 }
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 /* no vector maintenance (last vector remains the
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1559 * last vector) */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1560 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1561
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1562 case MODE_INTER_PRIOR_LAST:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1563 /* all 6 fragments use the motion vector prior to the
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1564 * last motion vector */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1565 motion_x[0] = prior_last_motion_x;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1566 motion_y[0] = prior_last_motion_y;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1567 for (k = 1; k < 6; k++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1568 motion_x[k] = motion_x[0];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1569 motion_y[k] = motion_y[0];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1570 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1571
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1572 /* vector maintenance */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1573 prior_last_motion_x = last_motion_x;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1574 prior_last_motion_y = last_motion_y;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1575 last_motion_x = motion_x[0];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1576 last_motion_y = motion_y[0];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1577 break;
1229
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
1578
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
1579 default:
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
1580 /* 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
1581 memset(motion_x, 0, 6 * sizeof(int));
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
1582 memset(motion_y, 0, 6 * sizeof(int));
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
1583
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
1584 /* no vector maintenance */
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
1585 break;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1586 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1587
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1588 /* assign the motion vectors to the correct fragments */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1589 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
1590 current_fragment,
1292
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
1591 s->macroblock_coding[current_macroblock]);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1592 for (k = 0; k < 6; k++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1593 current_fragment =
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1594 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
1595 if (current_fragment == -1)
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1596 continue;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1597 if (current_fragment >= s->fragment_count) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1518
diff changeset
1598 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
1599 current_fragment, s->fragment_count);
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1600 return 1;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1601 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1602 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
1603 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
1604 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
1605 k, current_fragment, motion_x[k], motion_y[k]);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1606 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1607 }
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 }
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1610
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1611 return 0;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1612 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1613
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1614 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1615 * 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
1616 * 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
1617 * 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
1618 * 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
1619 * levels (since different coefficient types require different VLC tables.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1620 *
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1621 * 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
1622 * 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
1623 * 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
1624 * be passed into the next call to this same function.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1625 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1626 static int unpack_vlcs(Vp3DecodeContext *s, GetBitContext *gb,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1627 VLC *table, int coeff_index,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1628 int first_fragment, int last_fragment,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1629 int eob_run)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1630 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1631 int i;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1632 int token;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1633 int zero_run;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1634 DCTELEM coeff;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1635 Vp3Fragment *fragment;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1636
1272
777d4145cdfb fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents: 1244
diff changeset
1637 if ((first_fragment >= s->fragment_count) ||
1244
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
1638 (last_fragment >= s->fragment_count)) {
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
1639
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1518
diff changeset
1640 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
1641 first_fragment, last_fragment);
1272
777d4145cdfb fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents: 1244
diff changeset
1642 return 0;
1244
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
1643 }
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
1644
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1645 for (i = first_fragment; i <= last_fragment; i++) {
1224
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 fragment = &s->all_fragments[s->coded_fragment_list[i]];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1648 if (fragment->coeff_count > coeff_index)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1649 continue;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1650
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1651 if (!eob_run) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1652 /* decode a VLC into a token */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1653 token = get_vlc2(gb, table->table, 5, 3);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1654 debug_vlc(" token = %2d, ", token);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1655 /* 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
1656 unpack_token(gb, token, &zero_run, &coeff, &eob_run);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1657 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1658
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1659 if (!eob_run) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1660 fragment->coeff_count += zero_run;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1661 if (fragment->coeff_count < 64)
2692
fb8f26fc57eb remove permutation done to quant tables and then undone during idct
michael
parents: 2690
diff changeset
1662 fragment->coeffs[dezigzag_index[fragment->coeff_count++]] = coeff;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1663 debug_vlc(" fragment %d coeff = %d\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1664 s->coded_fragment_list[i], fragment->coeffs[coeff_index]);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1665 } else {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1666 fragment->last_coeff = fragment->coeff_count;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1667 fragment->coeff_count = 64;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1668 debug_vlc(" fragment %d eob with %d coefficients\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1669 s->coded_fragment_list[i], fragment->last_coeff);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1670 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 return eob_run;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1675 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1676
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1677 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1678 * This function unpacks all of the DCT coefficient data from the
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1679 * bitstream.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1680 */
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1681 static int unpack_dct_coeffs(Vp3DecodeContext *s, GetBitContext *gb)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1682 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1683 int i;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1684 int dc_y_table;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1685 int dc_c_table;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1686 int ac_y_table;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1687 int ac_c_table;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1688 int residual_eob_run = 0;
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 /* fetch the DC table indices */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1691 dc_y_table = get_bits(gb, 4);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1692 dc_c_table = get_bits(gb, 4);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1693
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1694 /* unpack the Y plane DC coefficients */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1695 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
1696 dc_y_table);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1697 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
1698 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
1699
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1700 /* unpack the C plane DC coefficients */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1701 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
1702 dc_c_table);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1703 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
1704 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
1705
1233
5d66713e97e2 correct the custom coding mode alphabet, add some validation on the
tmmm
parents: 1230
diff changeset
1706 /* fetch the AC table indices */
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1707 ac_y_table = get_bits(gb, 4);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1708 ac_c_table = get_bits(gb, 4);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1709
1233
5d66713e97e2 correct the custom coding mode alphabet, add some validation on the
tmmm
parents: 1230
diff changeset
1710 /* unpack the group 1 AC coefficients (coeffs 1-5) */
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1711 for (i = 1; i <= 5; i++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1712
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1713 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
1714 i, ac_y_table);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1715 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
1716 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
1717
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1718 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
1719 i, ac_c_table);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1720 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
1721 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
1722 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1723
1233
5d66713e97e2 correct the custom coding mode alphabet, add some validation on the
tmmm
parents: 1230
diff changeset
1724 /* unpack the group 2 AC coefficients (coeffs 6-14) */
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1725 for (i = 6; i <= 14; i++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1726
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1727 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
1728 i, ac_y_table);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1729 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
1730 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
1731
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1732 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
1733 i, ac_c_table);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1734 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
1735 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
1736 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1737
1233
5d66713e97e2 correct the custom coding mode alphabet, add some validation on the
tmmm
parents: 1230
diff changeset
1738 /* unpack the group 3 AC coefficients (coeffs 15-27) */
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1739 for (i = 15; i <= 27; i++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1740
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1741 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
1742 i, ac_y_table);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1743 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
1744 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
1745
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1746 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
1747 i, ac_c_table);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1748 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
1749 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
1750 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1751
1233
5d66713e97e2 correct the custom coding mode alphabet, add some validation on the
tmmm
parents: 1230
diff changeset
1752 /* unpack the group 4 AC coefficients (coeffs 28-63) */
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1753 for (i = 28; i <= 63; i++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1754
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1755 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
1756 i, ac_y_table);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1757 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
1758 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
1759
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1760 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
1761 i, ac_c_table);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1762 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
1763 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
1764 }
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1765
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1766 return 0;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1767 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1768
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 * This function reverses the DC prediction for each coded fragment in
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1771 * 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
1772 * VP3 source code.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1773 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1774 #define COMPATIBLE_FRAME(x) \
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1775 (compatible_frame[s->all_fragments[x].coding_method] == current_frame_type)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1776 #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
1777 static inline int iabs (int x) { return ((x < 0) ? -x : x); }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1778
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1779 static void reverse_dc_prediction(Vp3DecodeContext *s,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1780 int first_fragment,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1781 int fragment_width,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1782 int fragment_height)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1783 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1784
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1785 #define PUL 8
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1786 #define PU 4
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1787 #define PUR 2
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1788 #define PL 1
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 int x, y;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1791 int i = first_fragment;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1792
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1793 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1794 * Fragment prediction groups:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1795 *
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1796 * 32222222226
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1797 * 10000000004
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1798 * 10000000004
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1799 * 10000000004
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1800 * 10000000004
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1801 *
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1802 * 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
1803 * 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
1804 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1805 int predictor_group;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1806 short predicted_dc;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1807
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1808 /* 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
1809 int fl, ful, fu, fur;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1810
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1811 /* 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
1812 int vl, vul, vu, vur;
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 /* indices for the left, up-left, up, and up-right fragments */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1815 int l, ul, u, ur;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1816
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1817 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1818 * The 6 fields mean:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1819 * 0: up-left multiplier
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1820 * 1: up multiplier
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1821 * 2: up-right multiplier
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1822 * 3: left multiplier
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1823 * 4: mask
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1824 * 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
1825 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1826 int predictor_transform[16][6] = {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1827 { 0, 0, 0, 0, 0, 0 },
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1828 { 0, 0, 0, 1, 0, 0 }, // PL
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1829 { 0, 0, 1, 0, 0, 0 }, // PUR
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1830 { 0, 0, 53, 75, 127, 7 }, // PUR|PL
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1831 { 0, 1, 0, 0, 0, 0 }, // PU
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1832 { 0, 1, 0, 1, 1, 1 }, // PU|PL
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1833 { 0, 1, 0, 0, 0, 0 }, // PU|PUR
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1834 { 0, 0, 53, 75, 127, 7 }, // PU|PUR|PL
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1835 { 1, 0, 0, 0, 0, 0 }, // PUL
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1836 { 0, 0, 0, 1, 0, 0 }, // PUL|PL
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1837 { 1, 0, 1, 0, 1, 1 }, // PUL|PUR
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1838 { 0, 0, 53, 75, 127, 7 }, // PUL|PUR|PL
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1839 { 0, 1, 0, 0, 0, 0 }, // PUL|PU
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1840 {-26, 29, 0, 29, 31, 5 }, // PUL|PU|PL
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1841 { 3, 10, 3, 0, 15, 4 }, // PUL|PU|PUR
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1842 {-26, 29, 0, 29, 31, 5 } // PUL|PU|PUR|PL
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1843 };
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1844
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1845 /* 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
1846 * 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
1847 * 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
1848 * from other INTRA blocks. There are 2 golden frame coding types;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1849 * blocks encoding in these modes can only predict from other blocks
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1850 * that were encoded with these 1 of these 2 modes. */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1851 unsigned char compatible_frame[8] = {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1852 1, /* MODE_INTER_NO_MV */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1853 0, /* MODE_INTRA */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1854 1, /* MODE_INTER_PLUS_MV */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1855 1, /* MODE_INTER_LAST_MV */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1856 1, /* MODE_INTER_PRIOR_MV */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1857 2, /* MODE_USING_GOLDEN */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1858 2, /* MODE_GOLDEN_MV */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1859 1 /* MODE_INTER_FOUR_MV */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1860 };
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1861 int current_frame_type;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1862
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1863 /* 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
1864 short last_dc[3];
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 int transform = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1867
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1868 debug_vp3(" vp3: reversing DC prediction\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1869
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1870 vul = vu = vur = vl = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1871 last_dc[0] = last_dc[1] = last_dc[2] = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1872
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1873 /* for each fragment row... */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1874 for (y = 0; y < fragment_height; y++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1875
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1876 /* for each fragment in a row... */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1877 for (x = 0; x < fragment_width; x++, i++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1878
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1879 /* reverse prediction if this block was coded */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1880 if (s->all_fragments[i].coding_method != MODE_COPY) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1881
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1882 current_frame_type =
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1883 compatible_frame[s->all_fragments[i].coding_method];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1884 predictor_group = (x == 0) + ((y == 0) << 1) +
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1885 ((x + 1 == fragment_width) << 2);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1886 debug_dc_pred(" frag %d: group %d, orig DC = %d, ",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1887 i, predictor_group, s->all_fragments[i].coeffs[0]);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1888
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1889 switch (predictor_group) {
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 case 0:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1892 /* main body of fragments; consider all 4 possible
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1893 * fragments for prediction */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1894
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1895 /* calculate the indices of the predicting fragments */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1896 ul = i - fragment_width - 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1897 u = i - fragment_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1898 ur = i - fragment_width + 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1899 l = i - 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1900
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1901 /* fetch the DC values for the predicting fragments */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1902 vul = s->all_fragments[ul].coeffs[0];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1903 vu = s->all_fragments[u].coeffs[0];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1904 vur = s->all_fragments[ur].coeffs[0];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1905 vl = s->all_fragments[l].coeffs[0];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1906
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1907 /* figure out which fragments are valid */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1908 ful = FRAME_CODED(ul) && COMPATIBLE_FRAME(ul);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1909 fu = FRAME_CODED(u) && COMPATIBLE_FRAME(u);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1910 fur = FRAME_CODED(ur) && COMPATIBLE_FRAME(ur);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1911 fl = FRAME_CODED(l) && COMPATIBLE_FRAME(l);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1912
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1913 /* decide which predictor transform to use */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1914 transform = (fl*PL) | (fu*PU) | (ful*PUL) | (fur*PUR);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1915
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1916 break;
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 case 1:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1919 /* left column of fragments, not including top corner;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1920 * only consider up and up-right fragments */
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 /* calculate the indices of the predicting fragments */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1923 u = i - fragment_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1924 ur = i - fragment_width + 1;
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 /* fetch the DC values for the predicting fragments */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1927 vu = s->all_fragments[u].coeffs[0];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1928 vur = s->all_fragments[ur].coeffs[0];
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 /* figure out which fragments are valid */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1931 fur = FRAME_CODED(ur) && COMPATIBLE_FRAME(ur);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1932 fu = FRAME_CODED(u) && COMPATIBLE_FRAME(u);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1933
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1934 /* decide which predictor transform to use */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1935 transform = (fu*PU) | (fur*PUR);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1936
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1937 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1938
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1939 case 2:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1940 case 6:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1941 /* top row of fragments, not including top-left frag;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1942 * only consider the left fragment for prediction */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1943
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1944 /* calculate the indices of the predicting fragments */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1945 l = i - 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1946
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1947 /* fetch the DC values for the predicting fragments */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1948 vl = s->all_fragments[l].coeffs[0];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1949
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1950 /* figure out which fragments are valid */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1951 fl = FRAME_CODED(l) && COMPATIBLE_FRAME(l);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1952
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1953 /* decide which predictor transform to use */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1954 transform = (fl*PL);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1955
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1956 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1957
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1958 case 3:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1959 /* top-left fragment */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1960
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1961 /* nothing to predict from in this case */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1962 transform = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1963
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1964 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1965
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1966 case 4:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1967 /* right column of fragments, not including top corner;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1968 * consider up-left, up, and left fragments for
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1969 * prediction */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1970
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1971 /* calculate the indices of the predicting fragments */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1972 ul = i - fragment_width - 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1973 u = i - fragment_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1974 l = i - 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1975
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1976 /* fetch the DC values for the predicting fragments */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1977 vul = s->all_fragments[ul].coeffs[0];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1978 vu = s->all_fragments[u].coeffs[0];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1979 vl = s->all_fragments[l].coeffs[0];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1980
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1981 /* figure out which fragments are valid */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1982 ful = FRAME_CODED(ul) && COMPATIBLE_FRAME(ul);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1983 fu = FRAME_CODED(u) && COMPATIBLE_FRAME(u);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1984 fl = FRAME_CODED(l) && COMPATIBLE_FRAME(l);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1985
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1986 /* decide which predictor transform to use */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1987 transform = (fl*PL) | (fu*PU) | (ful*PUL);
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 break;
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 }
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 debug_dc_pred("transform = %d, ", transform);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1994
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1995 if (transform == 0) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1996
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1997 /* if there were no fragments to predict from, use last
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1998 * DC saved */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1999 s->all_fragments[i].coeffs[0] += last_dc[current_frame_type];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2000 debug_dc_pred("from last DC (%d) = %d\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2001 current_frame_type, s->all_fragments[i].coeffs[0]);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2002
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2003 } else {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2004
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2005 /* apply the appropriate predictor transform */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2006 predicted_dc =
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2007 (predictor_transform[transform][0] * vul) +
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2008 (predictor_transform[transform][1] * vu) +
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2009 (predictor_transform[transform][2] * vur) +
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2010 (predictor_transform[transform][3] * vl);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2011
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2012 /* if there is a shift value in the transform, add
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2013 * the sign bit before the shift */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2014 if (predictor_transform[transform][5] != 0) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2015 predicted_dc += ((predicted_dc >> 15) &
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2016 predictor_transform[transform][4]);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2017 predicted_dc >>= predictor_transform[transform][5];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2018 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2019
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2020 /* check for outranging on the [ul u l] and
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2021 * [ul u ur l] predictors */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2022 if ((transform == 13) || (transform == 15)) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2023 if (iabs(predicted_dc - vu) > 128)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2024 predicted_dc = vu;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2025 else if (iabs(predicted_dc - vl) > 128)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2026 predicted_dc = vl;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2027 else if (iabs(predicted_dc - vul) > 128)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2028 predicted_dc = vul;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2029 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2030
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2031 /* at long last, apply the predictor */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2032 s->all_fragments[i].coeffs[0] += predicted_dc;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2033 debug_dc_pred("from pred DC = %d\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2034 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 /* save the DC */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2038 last_dc[current_frame_type] = s->all_fragments[i].coeffs[0];
2690
9cd85de24bcb fix last coeff
michael
parents: 2689
diff changeset
2039 if(s->all_fragments[i].coeffs[0] && s->all_fragments[i].last_coeff<0)
9cd85de24bcb fix last coeff
michael
parents: 2689
diff changeset
2040 s->all_fragments[i].last_coeff= 0;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2041 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2042 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2043 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2044 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2045
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2046 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2047 * This function performs the final rendering of each fragment's data
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2048 * onto the output frame.
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 static void render_fragments(Vp3DecodeContext *s,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2051 int first_fragment,
1229
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2052 int width,
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2053 int height,
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2054 int plane /* 0 = Y, 1 = U, 2 = V */)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2055 {
2693
02925a3903b6 porting vp3 idct over to lavc idct api
michael
parents: 2692
diff changeset
2056 int x, y, j;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2057 int m, n;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2058 int i = first_fragment;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2059 int16_t *dequantizer;
1977
89422281f6f6 reorganize and simplify the VP3 IDCT stuff
melanson
parents: 1972
diff changeset
2060 DCTELEM __align16 output_samples[64];
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2061 unsigned char *output_plane;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2062 unsigned char *last_plane;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2063 unsigned char *golden_plane;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2064 int stride;
2031
4225c131a2eb warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents: 2028
diff changeset
2065 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
2066 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
2067 int motion_halfpel_index;
1406
ae5524a3cd08 MC rounding fixed?
michaelni
parents: 1405
diff changeset
2068 uint8_t *motion_source;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2069
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2070 debug_vp3(" vp3: rendering final fragments for %s\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2071 (plane == 0) ? "Y plane" : (plane == 1) ? "U plane" : "V plane");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2072
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2073 /* set up plane-specific parameters */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2074 if (plane == 0) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2075 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
2076 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
2077 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
2078 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
2079 if (!s->flipped_image) stride = -stride;
1233
5d66713e97e2 correct the custom coding mode alphabet, add some validation on the
tmmm
parents: 1230
diff changeset
2080 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
2081 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
2082 } else if (plane == 1) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2083 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
2084 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
2085 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
2086 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
2087 if (!s->flipped_image) stride = -stride;
1233
5d66713e97e2 correct the custom coding mode alphabet, add some validation on the
tmmm
parents: 1230
diff changeset
2088 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
2089 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
2090 } else {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2091 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
2092 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
2093 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
2094 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
2095 if (!s->flipped_image) stride = -stride;
1233
5d66713e97e2 correct the custom coding mode alphabet, add some validation on the
tmmm
parents: 1230
diff changeset
2096 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
2097 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
2098 }
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2370
diff changeset
2099
2466
acfea8a94bf8 10l (negative strides)
michael
parents: 2422
diff changeset
2100 if(ABS(stride) > 2048)
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2370
diff changeset
2101 return; //various tables are fixed size
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 row... */
1229
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2104 for (y = 0; y < height; y += 8) {
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2105
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2106 /* for each fragment in a row... */
1229
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2107 for (x = 0; x < width; x += 8, i++) {
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2108
1244
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
2109 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
2110 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
2111 return;
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
2112 }
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
2113
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2114 /* transform if this block was coded */
1667
720c073661a1 FF_DEBUG_PICT_INFO and CODEC_FLAG_GRAY support
alex
parents: 1664
diff changeset
2115 if ((s->all_fragments[i].coding_method != MODE_COPY) &&
720c073661a1 FF_DEBUG_PICT_INFO and CODEC_FLAG_GRAY support
alex
parents: 1664
diff changeset
2116 !((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
2117
1406
ae5524a3cd08 MC rounding fixed?
michaelni
parents: 1405
diff changeset
2118 if ((s->all_fragments[i].coding_method == MODE_USING_GOLDEN) ||
ae5524a3cd08 MC rounding fixed?
michaelni
parents: 1405
diff changeset
2119 (s->all_fragments[i].coding_method == MODE_GOLDEN_MV))
ae5524a3cd08 MC rounding fixed?
michaelni
parents: 1405
diff changeset
2120 motion_source= golden_plane;
ae5524a3cd08 MC rounding fixed?
michaelni
parents: 1405
diff changeset
2121 else
ae5524a3cd08 MC rounding fixed?
michaelni
parents: 1405
diff changeset
2122 motion_source= last_plane;
ae5524a3cd08 MC rounding fixed?
michaelni
parents: 1405
diff changeset
2123
ae5524a3cd08 MC rounding fixed?
michaelni
parents: 1405
diff changeset
2124 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
2125 motion_halfpel_index = 0;
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
2126
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
2127 /* 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
2128 * using a motion vector method */
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
2129 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
2130 (s->all_fragments[i].coding_method != MODE_USING_GOLDEN)) {
1406
ae5524a3cd08 MC rounding fixed?
michaelni
parents: 1405
diff changeset
2131 int src_x, src_y;
1292
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
2132 motion_x = s->all_fragments[i].motion_x;
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
2133 motion_y = s->all_fragments[i].motion_y;
1407
69f4f4fb8a50 fixing chroma MC
michaelni
parents: 1406
diff changeset
2134 if(plane){
69f4f4fb8a50 fixing chroma MC
michaelni
parents: 1406
diff changeset
2135 motion_x= (motion_x>>1) | (motion_x&1);
69f4f4fb8a50 fixing chroma MC
michaelni
parents: 1406
diff changeset
2136 motion_y= (motion_y>>1) | (motion_y&1);
69f4f4fb8a50 fixing chroma MC
michaelni
parents: 1406
diff changeset
2137 }
69f4f4fb8a50 fixing chroma MC
michaelni
parents: 1406
diff changeset
2138
1406
ae5524a3cd08 MC rounding fixed?
michaelni
parents: 1405
diff changeset
2139 src_x= (motion_x>>1) + x;
ae5524a3cd08 MC rounding fixed?
michaelni
parents: 1405
diff changeset
2140 src_y= (motion_y>>1) + y;
1292
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
2141 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
2142 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
2143
1407
69f4f4fb8a50 fixing chroma MC
michaelni
parents: 1406
diff changeset
2144 motion_halfpel_index = motion_x & 0x01;
69f4f4fb8a50 fixing chroma MC
michaelni
parents: 1406
diff changeset
2145 motion_source += (motion_x >> 1);
1292
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
2146
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
2147 // motion_y = -motion_y;
1407
69f4f4fb8a50 fixing chroma MC
michaelni
parents: 1406
diff changeset
2148 motion_halfpel_index |= (motion_y & 0x01) << 1;
69f4f4fb8a50 fixing chroma MC
michaelni
parents: 1406
diff changeset
2149 motion_source += ((motion_y >> 1) * stride);
1292
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
2150
1406
ae5524a3cd08 MC rounding fixed?
michaelni
parents: 1405
diff changeset
2151 if(src_x<0 || src_y<0 || src_x + 9 >= width || src_y + 9 >= height){
ae5524a3cd08 MC rounding fixed?
michaelni
parents: 1405
diff changeset
2152 uint8_t *temp= s->edge_emu_buffer;
ae5524a3cd08 MC rounding fixed?
michaelni
parents: 1405
diff changeset
2153 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
2154 else temp += 9*stride;
1406
ae5524a3cd08 MC rounding fixed?
michaelni
parents: 1405
diff changeset
2155
ae5524a3cd08 MC rounding fixed?
michaelni
parents: 1405
diff changeset
2156 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
2157 motion_source= temp;
1292
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
2158 }
1233
5d66713e97e2 correct the custom coding mode alphabet, add some validation on the
tmmm
parents: 1230
diff changeset
2159 }
1864
9a73e6dc5d68 fix motion compensation with (x+1/2,y+1/2) MVs
michael
parents: 1667
diff changeset
2160
1233
5d66713e97e2 correct the custom coding mode alphabet, add some validation on the
tmmm
parents: 1230
diff changeset
2161
1229
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2162 /* 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
2163 * previous or the golden frame */
1406
ae5524a3cd08 MC rounding fixed?
michaelni
parents: 1405
diff changeset
2164 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
2165 //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
2166 if(motion_halfpel_index != 3){
9a73e6dc5d68 fix motion compensation with (x+1/2,y+1/2) MVs
michael
parents: 1667
diff changeset
2167 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
2168 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
2169 motion_source, stride, 8);
9a73e6dc5d68 fix motion compensation with (x+1/2,y+1/2) MVs
michael
parents: 1667
diff changeset
2170 }else{
9a73e6dc5d68 fix motion compensation with (x+1/2,y+1/2) MVs
michael
parents: 1667
diff changeset
2171 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
2172 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
2173 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
2174 motion_source - d,
9a73e6dc5d68 fix motion compensation with (x+1/2,y+1/2) MVs
michael
parents: 1667
diff changeset
2175 motion_source + stride + 1 + d,
9a73e6dc5d68 fix motion compensation with (x+1/2,y+1/2) MVs
michael
parents: 1667
diff changeset
2176 stride, 8);
9a73e6dc5d68 fix motion compensation with (x+1/2,y+1/2) MVs
michael
parents: 1667
diff changeset
2177 }
2684
c8386f5c4fb9 fix dequant matrix
michael
parents: 2678
diff changeset
2178 dequantizer = s->inter_dequant;
c8386f5c4fb9 fix dequant matrix
michael
parents: 2678
diff changeset
2179 }else{
c8386f5c4fb9 fix dequant matrix
michael
parents: 2678
diff changeset
2180 if (plane == 0)
c8386f5c4fb9 fix dequant matrix
michael
parents: 2678
diff changeset
2181 dequantizer = s->intra_y_dequant;
c8386f5c4fb9 fix dequant matrix
michael
parents: 2678
diff changeset
2182 else
c8386f5c4fb9 fix dequant matrix
michael
parents: 2678
diff changeset
2183 dequantizer = s->intra_c_dequant;
1229
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2184 }
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2185
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2186 /* dequantize the DCT coefficients */
1229
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2187 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
2188 i, s->all_fragments[i].coding_method,
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2189 s->all_fragments[i].coeffs[0], dequantizer[0]);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2190
2693
02925a3903b6 porting vp3 idct over to lavc idct api
michael
parents: 2692
diff changeset
2191 if(s->avctx->idct_algo==FF_IDCT_VP3){
02925a3903b6 porting vp3 idct over to lavc idct api
michael
parents: 2692
diff changeset
2192 for (j = 0; j < 64; j++) {
02925a3903b6 porting vp3 idct over to lavc idct api
michael
parents: 2692
diff changeset
2193 s->all_fragments[i].coeffs[j] *= dequantizer[j];
02925a3903b6 porting vp3 idct over to lavc idct api
michael
parents: 2692
diff changeset
2194 }
02925a3903b6 porting vp3 idct over to lavc idct api
michael
parents: 2692
diff changeset
2195 }else{
02925a3903b6 porting vp3 idct over to lavc idct api
michael
parents: 2692
diff changeset
2196 for (j = 0; j < 64; j++) {
02925a3903b6 porting vp3 idct over to lavc idct api
michael
parents: 2692
diff changeset
2197 s->all_fragments[i].coeffs[j]= (dequantizer[j] * s->all_fragments[i].coeffs[j] + 2) >> 2;
02925a3903b6 porting vp3 idct over to lavc idct api
michael
parents: 2692
diff changeset
2198 }
02925a3903b6 porting vp3 idct over to lavc idct api
michael
parents: 2692
diff changeset
2199 }
02925a3903b6 porting vp3 idct over to lavc idct api
michael
parents: 2692
diff changeset
2200
1230
31d090bae36c looking better all the time! motion compensation is starting to work
tmmm
parents: 1229
diff changeset
2201 /* invert DCT and place (or add) in final output */
2693
02925a3903b6 porting vp3 idct over to lavc idct api
michael
parents: 2692
diff changeset
2202
1230
31d090bae36c looking better all the time! motion compensation is starting to work
tmmm
parents: 1229
diff changeset
2203 if (s->all_fragments[i].coding_method == MODE_INTRA) {
2693
02925a3903b6 porting vp3 idct over to lavc idct api
michael
parents: 2692
diff changeset
2204 if(s->avctx->idct_algo!=FF_IDCT_VP3)
02925a3903b6 porting vp3 idct over to lavc idct api
michael
parents: 2692
diff changeset
2205 s->all_fragments[i].coeffs[0] += 128<<3;
02925a3903b6 porting vp3 idct over to lavc idct api
michael
parents: 2692
diff changeset
2206 s->dsp.idct_put(
1984
ef919e9ef73e separate out put_signed_pixels_clamped() into its own function and
melanson
parents: 1977
diff changeset
2207 output_plane + s->all_fragments[i].first_pixel,
2693
02925a3903b6 porting vp3 idct over to lavc idct api
michael
parents: 2692
diff changeset
2208 stride,
02925a3903b6 porting vp3 idct over to lavc idct api
michael
parents: 2692
diff changeset
2209 s->all_fragments[i].coeffs);
1230
31d090bae36c looking better all the time! motion compensation is starting to work
tmmm
parents: 1229
diff changeset
2210 } else {
2693
02925a3903b6 porting vp3 idct over to lavc idct api
michael
parents: 2692
diff changeset
2211 s->dsp.idct_add(
1229
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2212 output_plane + s->all_fragments[i].first_pixel,
2693
02925a3903b6 porting vp3 idct over to lavc idct api
michael
parents: 2692
diff changeset
2213 stride,
02925a3903b6 porting vp3 idct over to lavc idct api
michael
parents: 2692
diff changeset
2214 s->all_fragments[i].coeffs);
1230
31d090bae36c looking better all the time! motion compensation is starting to work
tmmm
parents: 1229
diff changeset
2215 }
2693
02925a3903b6 porting vp3 idct over to lavc idct api
michael
parents: 2692
diff changeset
2216 memset(s->all_fragments[i].coeffs, 0, 64*sizeof(DCTELEM));
1229
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2217
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2218 debug_idct("block after idct_%s():\n",
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2219 (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
2220 "put" : "add");
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2221 for (m = 0; m < 8; m++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2222 for (n = 0; n < 8; n++) {
1229
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2223 debug_idct(" %3d", *(output_plane +
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2224 s->all_fragments[i].first_pixel + (m * stride + n)));
1224
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 debug_idct("\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2227 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2228 debug_idct("\n");
1229
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2229
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2230 } else {
1224
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 /* copy directly from the previous frame */
1229
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2233 s->dsp.put_pixels_tab[1][0](
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2234 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
2235 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
2236 stride, 8);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2237
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2238 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2239 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2240 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2241
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2242 emms_c();
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2243 }
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2244
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2245 #define SATURATE_U8(x) ((x) < 0) ? 0 : ((x) > 255) ? 255 : x
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2246
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2247 static void horizontal_filter(unsigned char *first_pixel, int stride,
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2248 int *bounding_values)
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2249 {
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2250 int i;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2251 int filter_value;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2252
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2253 for (i = 0; i < 8; i++, first_pixel += stride) {
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2254 filter_value =
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2255 (first_pixel[-2] * 1) -
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2256 (first_pixel[-1] * 3) +
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2257 (first_pixel[ 0] * 3) -
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2258 (first_pixel[ 1] * 1);
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2259 filter_value = bounding_values[(filter_value + 4) >> 3];
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2260 first_pixel[-1] = SATURATE_U8(first_pixel[-1] + filter_value);
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2261 first_pixel[ 0] = SATURATE_U8(first_pixel[ 0] - filter_value);
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2262 }
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2263 }
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2264
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2265 static void vertical_filter(unsigned char *first_pixel, int stride,
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2266 int *bounding_values)
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2267 {
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2268 int i;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2269 int filter_value;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2270
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2271 for (i = 0; i < 8; i++, first_pixel++) {
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2272 filter_value =
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2273 (first_pixel[-(2 * stride)] * 1) -
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2274 (first_pixel[-(1 * stride)] * 3) +
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2275 (first_pixel[ (0 )] * 3) -
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2276 (first_pixel[ (1 * stride)] * 1);
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2277 filter_value = bounding_values[(filter_value + 4) >> 3];
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2278 first_pixel[-(1 * stride)] = SATURATE_U8(first_pixel[-(1 * stride)] + filter_value);
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2279 first_pixel[0] = SATURATE_U8(first_pixel[0] - filter_value);
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2280 }
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2281 }
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2282
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2283 static void apply_loop_filter(Vp3DecodeContext *s)
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2284 {
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2285 int x, y, plane;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2286 int width, height;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2287 int fragment;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2288 int stride;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2289 unsigned char *plane_data;
2686
979a847cb943 various 10l fixes for the loop filter
michael
parents: 2684
diff changeset
2290
979a847cb943 various 10l fixes for the loop filter
michael
parents: 2684
diff changeset
2291 int bounding_values_array[256];
979a847cb943 various 10l fixes for the loop filter
michael
parents: 2684
diff changeset
2292 int *bounding_values= bounding_values_array+127;
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2293 int filter_limit;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2294
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2295 /* find the right loop limit value */
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2296 for (x = 63; x >= 0; x--) {
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2297 if (vp31_ac_scale_factor[x] >= s->quality_index)
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2298 break;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2299 }
2686
979a847cb943 various 10l fixes for the loop filter
michael
parents: 2684
diff changeset
2300 filter_limit = vp31_filter_limit_values[s->quality_index];
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2301
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2302 /* set up the bounding values */
2686
979a847cb943 various 10l fixes for the loop filter
michael
parents: 2684
diff changeset
2303 memset(bounding_values_array, 0, 256 * sizeof(int));
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2304 for (x = 0; x < filter_limit; x++) {
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2305 bounding_values[-x - filter_limit] = -filter_limit + x;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2306 bounding_values[-x] = -x;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2307 bounding_values[x] = x;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2308 bounding_values[x + filter_limit] = filter_limit - x;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2309 }
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2310
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2311 for (plane = 0; plane < 3; plane++) {
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2312
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2313 if (plane == 0) {
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2314 /* Y plane parameters */
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2315 fragment = 0;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2316 width = s->fragment_width;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2317 height = s->fragment_height;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2318 stride = s->current_frame.linesize[0];
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2319 plane_data = s->current_frame.data[0];
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2320 } else if (plane == 1) {
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2321 /* U plane parameters */
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2322 fragment = s->u_fragment_start;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2323 width = s->fragment_width / 2;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2324 height = s->fragment_height / 2;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2325 stride = s->current_frame.linesize[1];
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2326 plane_data = s->current_frame.data[1];
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2327 } else {
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2328 /* V plane parameters */
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2329 fragment = s->v_fragment_start;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2330 width = s->fragment_width / 2;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2331 height = s->fragment_height / 2;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2332 stride = s->current_frame.linesize[2];
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2333 plane_data = s->current_frame.data[2];
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2334 }
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2335
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2336 for (y = 0; y < height; y++) {
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2337
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2338 for (x = 0; x < width; x++) {
2687
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2339 START_TIMER
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2340 /* do not perform left edge filter for left columns frags */
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2341 if ((x > 0) &&
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2342 (s->all_fragments[fragment].coding_method != MODE_COPY)) {
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2343 horizontal_filter(
2686
979a847cb943 various 10l fixes for the loop filter
michael
parents: 2684
diff changeset
2344 plane_data + s->all_fragments[fragment].first_pixel - 7*stride,
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2345 stride, bounding_values);
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2346 }
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2347
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2348 /* do not perform top edge filter for top row fragments */
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2349 if ((y > 0) &&
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2350 (s->all_fragments[fragment].coding_method != MODE_COPY)) {
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2351 vertical_filter(
2686
979a847cb943 various 10l fixes for the loop filter
michael
parents: 2684
diff changeset
2352 plane_data + s->all_fragments[fragment].first_pixel + stride,
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2353 stride, bounding_values);
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2354 }
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2355
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2356 /* do not perform right edge filter for right column
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2357 * fragments or if right fragment neighbor is also coded
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2358 * in this frame (it will be filtered in next iteration) */
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2359 if ((x < width - 1) &&
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2360 (s->all_fragments[fragment].coding_method != MODE_COPY) &&
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2361 (s->all_fragments[fragment + 1].coding_method == MODE_COPY)) {
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2362 horizontal_filter(
2686
979a847cb943 various 10l fixes for the loop filter
michael
parents: 2684
diff changeset
2363 plane_data + s->all_fragments[fragment + 1].first_pixel - 7*stride,
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2364 stride, bounding_values);
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2365 }
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2366
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2367 /* do not perform bottom edge filter for bottom row
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2368 * fragments or if bottom fragment neighbor is also coded
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2369 * in this frame (it will be filtered in the next row) */
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2370 if ((y < height - 1) &&
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2371 (s->all_fragments[fragment].coding_method != MODE_COPY) &&
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2372 (s->all_fragments[fragment + width].coding_method == MODE_COPY)) {
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2373 vertical_filter(
2686
979a847cb943 various 10l fixes for the loop filter
michael
parents: 2684
diff changeset
2374 plane_data + s->all_fragments[fragment + width].first_pixel + stride,
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2375 stride, bounding_values);
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2376 }
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2377
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2378 fragment++;
2687
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2379 STOP_TIMER("loop filter")
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2380 }
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2381 }
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
2382 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2383 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2384
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2385 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2386 * This function computes the first pixel addresses for each fragment.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2387 * 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
2388 * so that it has access to the plane strides.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2389 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2390 static void vp3_calculate_pixel_addresses(Vp3DecodeContext *s)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2391 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2392
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2393 int i, x, y;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2394
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2395 /* figure out the first pixel addresses for each of the fragments */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2396 /* Y plane */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2397 i = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2398 for (y = s->fragment_height; y > 0; y--) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2399 for (x = 0; x < s->fragment_width; x++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2400 s->all_fragments[i++].first_pixel =
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2401 s->golden_frame.linesize[0] * y * FRAGMENT_PIXELS -
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2402 s->golden_frame.linesize[0] +
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2403 x * FRAGMENT_PIXELS;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2404 debug_init(" fragment %d, first pixel @ %d\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2405 i-1, s->all_fragments[i-1].first_pixel);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2406 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2407 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2408
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2409 /* U plane */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2410 i = s->u_fragment_start;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2411 for (y = s->fragment_height / 2; y > 0; y--) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2412 for (x = 0; x < s->fragment_width / 2; x++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2413 s->all_fragments[i++].first_pixel =
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2414 s->golden_frame.linesize[1] * y * FRAGMENT_PIXELS -
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2415 s->golden_frame.linesize[1] +
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2416 x * FRAGMENT_PIXELS;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2417 debug_init(" fragment %d, first pixel @ %d\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2418 i-1, s->all_fragments[i-1].first_pixel);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2419 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2420 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2421
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2422 /* V plane */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2423 i = s->v_fragment_start;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2424 for (y = s->fragment_height / 2; y > 0; y--) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2425 for (x = 0; x < s->fragment_width / 2; x++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2426 s->all_fragments[i++].first_pixel =
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2427 s->golden_frame.linesize[2] * y * FRAGMENT_PIXELS -
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2428 s->golden_frame.linesize[2] +
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2429 x * FRAGMENT_PIXELS;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2430 debug_init(" fragment %d, first pixel @ %d\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2431 i-1, s->all_fragments[i-1].first_pixel);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2432 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2433 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2434 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2435
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
2436 /* 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
2437 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
2438 {
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2439
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2440 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
2441
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2442 /* 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
2443 /* 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
2444 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
2445 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
2446 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
2447 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
2448 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
2449 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
2450 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
2451 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
2452 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
2453 }
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2454 }
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2455
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2456 /* 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
2457 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
2458 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
2459 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
2460 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
2461 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
2462 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
2463 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
2464 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
2465 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
2466 }
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2467 }
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2468
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2469 /* 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
2470 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
2471 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
2472 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
2473 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
2474 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
2475 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
2476 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
2477 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
2478 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
2479 }
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2480 }
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2481 }
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2482
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2483 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2484 * This is the ffmpeg/libavcodec API init function.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2485 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2486 static int vp3_decode_init(AVCodecContext *avctx)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2487 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2488 Vp3DecodeContext *s = avctx->priv_data;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2489 int i;
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2490 int c_width;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2491 int c_height;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2492 int y_superblock_count;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2493 int c_superblock_count;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2494
1664
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2495 if (avctx->codec_tag == MKTAG('V','P','3','0'))
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2496 s->version = 0;
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2497 else
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2498 s->version = 1;
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2499
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2500 s->avctx = avctx;
1292
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
2501 #if 0
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2502 s->width = avctx->width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2503 s->height = avctx->height;
1292
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
2504 #else
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
2505 s->width = (avctx->width + 15) & 0xFFFFFFF0;
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
2506 s->height = (avctx->height + 15) & 0xFFFFFFF0;
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
2507 #endif
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2508 avctx->pix_fmt = PIX_FMT_YUV420P;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2509 avctx->has_b_frames = 0;
2693
02925a3903b6 porting vp3 idct over to lavc idct api
michael
parents: 2692
diff changeset
2510 if(avctx->idct_algo==FF_IDCT_AUTO)
02925a3903b6 porting vp3 idct over to lavc idct api
michael
parents: 2692
diff changeset
2511 avctx->idct_algo=FF_IDCT_VP3;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2512 dsputil_init(&s->dsp, avctx);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2513
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2514 /* initialize to an impossible value which will force a recalculation
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2515 * in the first frame decode */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2516 s->quality_index = -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2517
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2518 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
2519 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
2520 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
2521
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2522 /* 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
2523 c_width = s->width / 2;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2524 c_height = s->height / 2;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2525 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
2526 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
2527 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
2528
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2529 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
2530 s->u_superblock_start = y_superblock_count;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2531 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
2532 s->superblock_coding = av_malloc(s->superblock_count);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2533
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2534 s->macroblock_width = (s->width + 15) / 16;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2535 s->macroblock_height = (s->height + 15) / 16;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2536 s->macroblock_count = s->macroblock_width * s->macroblock_height;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2537
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2538 s->fragment_width = s->width / FRAGMENT_PIXELS;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2539 s->fragment_height = s->height / FRAGMENT_PIXELS;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2540
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2541 /* fragment count covers all 8x8 blocks for all 3 planes */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2542 s->fragment_count = s->fragment_width * s->fragment_height * 3 / 2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2543 s->u_fragment_start = s->fragment_width * s->fragment_height;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2544 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
2545
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2546 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
2547 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
2548 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
2549 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
2550 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
2551 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
2552 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
2553 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
2554 debug_init(" macroblocks: %d x %d, %d total\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2555 s->macroblock_width, s->macroblock_height, s->macroblock_count);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2556 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
2557 s->fragment_count,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2558 s->fragment_width,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2559 s->fragment_height,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2560 s->u_fragment_start,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2561 s->v_fragment_start);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2562
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2563 s->all_fragments = av_malloc(s->fragment_count * sizeof(Vp3Fragment));
2689
ed0ab6f82167 clear blocks after each idct instead of per picture
michael
parents: 2687
diff changeset
2564 s->coeffs = av_malloc(s->fragment_count * sizeof(DCTELEM) * 64);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2565 s->coded_fragment_list = av_malloc(s->fragment_count * sizeof(int));
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2566 s->pixel_addresses_inited = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2567
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
2568 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
2569 {
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2570 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
2571 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
2572 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
2573 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
2574 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
2575 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
2576 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
2577 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
2578 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
2579 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
2580 }
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2581
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2582 /* init VLC tables */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2583 for (i = 0; i < 16; i++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2584
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
2585 /* DC histograms */
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2586 init_vlc(&s->dc_vlc[i], 5, 32,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2587 &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
2588 &dc_bias[i][0][0], 4, 2, 0);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2589
1233
5d66713e97e2 correct the custom coding mode alphabet, add some validation on the
tmmm
parents: 1230
diff changeset
2590 /* group 1 AC histograms */
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2591 init_vlc(&s->ac_vlc_1[i], 5, 32,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2592 &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
2593 &ac_bias_0[i][0][0], 4, 2, 0);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2594
1233
5d66713e97e2 correct the custom coding mode alphabet, add some validation on the
tmmm
parents: 1230
diff changeset
2595 /* group 2 AC histograms */
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2596 init_vlc(&s->ac_vlc_2[i], 5, 32,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2597 &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
2598 &ac_bias_1[i][0][0], 4, 2, 0);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2599
1233
5d66713e97e2 correct the custom coding mode alphabet, add some validation on the
tmmm
parents: 1230
diff changeset
2600 /* group 3 AC histograms */
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2601 init_vlc(&s->ac_vlc_3[i], 5, 32,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2602 &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
2603 &ac_bias_2[i][0][0], 4, 2, 0);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2604
1233
5d66713e97e2 correct the custom coding mode alphabet, add some validation on the
tmmm
parents: 1230
diff changeset
2605 /* group 4 AC histograms */
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2606 init_vlc(&s->ac_vlc_4[i], 5, 32,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2607 &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
2608 &ac_bias_3[i][0][0], 4, 2, 0);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2609 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2610
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
2611 /* build quantization zigzag table */
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2612 for (i = 0; i < 64; i++)
1239
fe46bd7c64d4 get those permutations straight
tmmm
parents: 1238
diff changeset
2613 zigzag_index[dezigzag_index[i]] = i;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2614
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2615 /* work out the block mapping tables */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2616 s->superblock_fragments = av_malloc(s->superblock_count * 16 * sizeof(int));
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2617 s->superblock_macroblocks = av_malloc(s->superblock_count * 4 * sizeof(int));
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2618 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
2619 s->macroblock_coding = av_malloc(s->macroblock_count + 1);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2620 init_block_mapping(s);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2621
1229
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2622 for (i = 0; i < 3; i++) {
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2623 s->current_frame.data[i] = NULL;
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2624 s->last_frame.data[i] = NULL;
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2625 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
2626 }
184c480cefc3 fix decoder so that ffmpeg does not crash, at least not right away
tmmm
parents: 1224
diff changeset
2627
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2628 return 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2629 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2630
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2631 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2632 * This is the ffmpeg/libavcodec API frame decode function.
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 static int vp3_decode_frame(AVCodecContext *avctx,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2635 void *data, int *data_size,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2636 uint8_t *buf, int buf_size)
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 Vp3DecodeContext *s = avctx->priv_data;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2639 GetBitContext gb;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2640 static int counter = 0;
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 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
2643
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2644 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
2645 {
1664
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2646 int ptype = get_bits(&gb, 7);
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2647
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2648 skip_bits(&gb, 6*8); /* "theora" */
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2649
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2650 switch(ptype)
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2651 {
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2652 case 1:
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2653 theora_decode_comments(avctx, gb);
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2654 break;
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2655 case 2:
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2656 theora_decode_tables(avctx, gb);
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2657 init_dequantizer(s);
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2658 break;
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2659 default:
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2660 av_log(avctx, AV_LOG_ERROR, "Unknown Theora config packet: %d\n", ptype);
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2661 }
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2662 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
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
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2665 s->keyframe = !get_bits1(&gb);
1664
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2666 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
2667 skip_bits(&gb, 1);
1664
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2668 s->last_quality_index = s->quality_index;
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2669 s->quality_index = get_bits(&gb, 6);
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2670 if (s->theora >= 0x030200)
1664
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2671 skip_bits1(&gb);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2672
1667
720c073661a1 FF_DEBUG_PICT_INFO and CODEC_FLAG_GRAY support
alex
parents: 1664
diff changeset
2673 if (s->avctx->debug & FF_DEBUG_PICT_INFO)
720c073661a1 FF_DEBUG_PICT_INFO and CODEC_FLAG_GRAY support
alex
parents: 1664
diff changeset
2674 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
2675 s->keyframe?"key":"", counter, s->quality_index);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2676 counter++;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2677
1292
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
2678 if (s->quality_index != s->last_quality_index)
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
2679 init_dequantizer(s);
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
2680
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2681 if (s->keyframe) {
1664
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2682 if (!s->theora)
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2683 {
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2684 skip_bits(&gb, 4); /* width code */
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2685 skip_bits(&gb, 4); /* height code */
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2686 if (s->version)
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2687 {
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2688 s->version = get_bits(&gb, 5);
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2689 if (counter == 1)
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2690 av_log(s->avctx, AV_LOG_DEBUG, "VP version: %d\n", s->version);
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2691 }
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2692 }
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2693 if (s->version || s->theora)
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2694 {
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2695 if (get_bits1(&gb))
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2696 av_log(s->avctx, AV_LOG_ERROR, "Warning, unsupported keyframe coding type?!\n");
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2697 skip_bits(&gb, 2); /* reserved? */
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2698 }
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2699
1244
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
2700 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
2701 if (s->golden_frame.data[0])
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
2702 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
2703 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
2704 } else {
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
2705 if (s->golden_frame.data[0])
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
2706 avctx->release_buffer(avctx, &s->golden_frame);
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
2707 if (s->last_frame.data[0])
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
2708 avctx->release_buffer(avctx, &s->last_frame);
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
2709 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2710
1405
e69f99ade5b0 fix AVFrame.reference (the frames are used for decoding future frames so it should be !=0)
michaelni
parents: 1355
diff changeset
2711 s->golden_frame.reference = 3;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2712 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
2713 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
2714 return -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2715 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2716
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2717 /* 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
2718 memcpy(&s->current_frame, &s->golden_frame, sizeof(AVFrame));
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2719
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2720 /* time to figure out pixel addresses? */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2721 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
2722 {
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2723 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
2724 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
2725 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
2726 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
2727 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2728 } else {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2729 /* 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
2730 s->current_frame.reference = 3;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2731 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
2732 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
2733 return -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2734 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2735 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2736
1407
69f4f4fb8a50 fixing chroma MC
michaelni
parents: 1406
diff changeset
2737 s->current_frame.qscale_table= s->qscale_table; //FIXME allocate individual tables per AVFrame
69f4f4fb8a50 fixing chroma MC
michaelni
parents: 1406
diff changeset
2738 s->current_frame.qstride= 0;
69f4f4fb8a50 fixing chroma MC
michaelni
parents: 1406
diff changeset
2739
2687
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2740 {START_TIMER
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2741 init_frame(s, &gb);
2687
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2742 STOP_TIMER("init_frame")}
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2743
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2744 #if KEYFRAMES_ONLY
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2745 if (!s->keyframe) {
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2746
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2747 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
2748 s->current_frame.linesize[0] * s->height);
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2749 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
2750 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
2751 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
2752 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
2753
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2754 } else {
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2755 #endif
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2756
2687
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2757 {START_TIMER
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2758 if (unpack_superblocks(s, &gb)){
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2759 av_log(s->avctx, AV_LOG_ERROR, "error in unpack_superblocks\n");
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2760 return -1;
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2761 }
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2762 STOP_TIMER("unpack_superblocks")}
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2763 {START_TIMER
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2764 if (unpack_modes(s, &gb)){
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2765 av_log(s->avctx, AV_LOG_ERROR, "error in unpack_modes\n");
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2766 return -1;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2767 }
2687
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2768 STOP_TIMER("unpack_modes")}
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2769 {START_TIMER
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2770 if (unpack_vectors(s, &gb)){
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2771 av_log(s->avctx, AV_LOG_ERROR, "error in unpack_vectors\n");
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2772 return -1;
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2773 }
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2774 STOP_TIMER("unpack_vectors")}
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2775 {START_TIMER
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2776 if (unpack_dct_coeffs(s, &gb)){
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2777 av_log(s->avctx, AV_LOG_ERROR, "error in unpack_dct_coeffs\n");
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2778 return -1;
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2779 }
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2780 STOP_TIMER("unpack_dct_coeffs")}
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2781 {START_TIMER
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2782
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2783 reverse_dc_prediction(s, 0, s->fragment_width, s->fragment_height);
2687
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2784 STOP_TIMER("reverse_dc_prediction")}
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2785 {START_TIMER
1229
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2786 render_fragments(s, 0, s->width, s->height, 0);
2687
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2787 STOP_TIMER("render_fragments")}
1355
1c05f4290517 added the official VP3 IDCT (C implementation) as well as a grayscale
tmmm
parents: 1292
diff changeset
2788
1c05f4290517 added the official VP3 IDCT (C implementation) as well as a grayscale
tmmm
parents: 1292
diff changeset
2789 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
2790 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
2791 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
2792 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
2793 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
2794 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
2795 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
2796 } else {
1c05f4290517 added the official VP3 IDCT (C implementation) as well as a grayscale
tmmm
parents: 1292
diff changeset
2797 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
2798 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
2799 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2800
2687
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2801 {START_TIMER
2686
979a847cb943 various 10l fixes for the loop filter
michael
parents: 2684
diff changeset
2802 apply_loop_filter(s);
2687
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2803 STOP_TIMER("apply_loop_filter")}
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2804 #if KEYFRAMES_ONLY
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2805 }
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2806 #endif
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2807
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2808 *data_size=sizeof(AVFrame);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2809 *(AVFrame*)data= s->current_frame;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2810
1229
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2811 /* 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
2812 * golden frame */
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2813 if ((s->last_frame.data[0]) &&
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2814 (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
2815 avctx->release_buffer(avctx, &s->last_frame);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2816
1227
184c480cefc3 fix decoder so that ffmpeg does not crash, at least not right away
tmmm
parents: 1224
diff changeset
2817 /* shuffle frames (last = current) */
184c480cefc3 fix decoder so that ffmpeg does not crash, at least not right away
tmmm
parents: 1224
diff changeset
2818 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
2819 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
2820
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2821 return buf_size;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2822 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2823
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2824 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2825 * This is the ffmpeg/libavcodec API module cleanup function.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2826 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2827 static int vp3_decode_end(AVCodecContext *avctx)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2828 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2829 Vp3DecodeContext *s = avctx->priv_data;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2830
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2831 av_free(s->all_fragments);
2689
ed0ab6f82167 clear blocks after each idct instead of per picture
michael
parents: 2687
diff changeset
2832 av_free(s->coeffs);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2833 av_free(s->coded_fragment_list);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2834 av_free(s->superblock_fragments);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2835 av_free(s->superblock_macroblocks);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2836 av_free(s->macroblock_fragments);
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
2837 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
2838
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2839 /* 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
2840 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
2841 avctx->release_buffer(avctx, &s->golden_frame);
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2842 if (s->last_frame.data[0])
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2843 avctx->release_buffer(avctx, &s->last_frame);
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2844 /* 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
2845 * 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
2846
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2847 return 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2848 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2849
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
2850 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
2851 {
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2852 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
2853 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
2854
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2855 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
2856 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
2857 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
2858 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
2859 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
2860
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
2861 /* 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
2862 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
2863
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2864 /* 3.2.0 aka alpha3 has the same frame orientation as original vp3 */
1626
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2865 /* but previous versions have the image flipped relative to vp3 */
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2866 if (s->theora < 0x030200)
1626
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2867 {
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2868 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
2869 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
2870 }
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2871
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
2872 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
2873 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
2874
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2370
diff changeset
2875 if(avcodec_check_dimensions(avctx, s->width, s->height)){
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2370
diff changeset
2876 s->width= s->height= 0;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2370
diff changeset
2877 return -1;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2370
diff changeset
2878 }
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2370
diff changeset
2879
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
2880 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
2881 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
2882
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2883 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
2884 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
2885
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2886 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
2887 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
2888 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
2889 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
2890
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2891 if (s->theora < 0x030200)
1627
a80b15c0b9d5 theora alpha3 support (with maintaining backward compatibility, maybe we should remove all backward compatibility codes after final theora release?)
alex
parents: 1626
diff changeset
2892 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
2893 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
2894 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
2895
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2896 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
2897
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2898 if (s->theora >= 0x030200)
1627
a80b15c0b9d5 theora alpha3 support (with maintaining backward compatibility, maybe we should remove all backward compatibility codes after final theora release?)
alex
parents: 1626
diff changeset
2899 {
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
2900 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
2901 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
2902 }
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
2903
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
2904 // 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
2905
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2906 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
2907 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
2908
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2909 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
2910 }
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2911
1518
c66cdace3bf6 theora comments skipping
alex
parents: 1516
diff changeset
2912 static int theora_decode_comments(AVCodecContext *avctx, GetBitContext gb)
c66cdace3bf6 theora comments skipping
alex
parents: 1516
diff changeset
2913 {
c66cdace3bf6 theora comments skipping
alex
parents: 1516
diff changeset
2914 int nb_comments, i, tmp;
c66cdace3bf6 theora comments skipping
alex
parents: 1516
diff changeset
2915
2173
380c40efd6bb get_bits(32) fix
michael
parents: 2031
diff changeset
2916 tmp = get_bits_long(&gb, 32);
1664
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2917 tmp = be2me_32(tmp);
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2918 while(tmp--)
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2919 skip_bits(&gb, 8);
1518
c66cdace3bf6 theora comments skipping
alex
parents: 1516
diff changeset
2920
2173
380c40efd6bb get_bits(32) fix
michael
parents: 2031
diff changeset
2921 nb_comments = get_bits_long(&gb, 32);
1664
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2922 nb_comments = be2me_32(nb_comments);
1518
c66cdace3bf6 theora comments skipping
alex
parents: 1516
diff changeset
2923 for (i = 0; i < nb_comments; i++)
c66cdace3bf6 theora comments skipping
alex
parents: 1516
diff changeset
2924 {
2173
380c40efd6bb get_bits(32) fix
michael
parents: 2031
diff changeset
2925 tmp = get_bits_long(&gb, 32);
1664
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2926 tmp = be2me_32(tmp);
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2927 while(tmp--)
1518
c66cdace3bf6 theora comments skipping
alex
parents: 1516
diff changeset
2928 skip_bits(&gb, 8);
c66cdace3bf6 theora comments skipping
alex
parents: 1516
diff changeset
2929 }
c66cdace3bf6 theora comments skipping
alex
parents: 1516
diff changeset
2930
c66cdace3bf6 theora comments skipping
alex
parents: 1516
diff changeset
2931 return 0;
c66cdace3bf6 theora comments skipping
alex
parents: 1516
diff changeset
2932 }
c66cdace3bf6 theora comments skipping
alex
parents: 1516
diff changeset
2933
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
2934 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
2935 {
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2936 Vp3DecodeContext *s = avctx->priv_data;
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2937 int i, n;
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2938
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2939 if (s->theora >= 0x030200) {
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2940 n = get_bits(&gb, 3);
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2941 /* loop filter table */
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2942 for (i = 0; i < 64; i++)
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2943 skip_bits(&gb, n);
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2944 }
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
2945
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2946 if (s->theora >= 0x030200)
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2947 n = get_bits(&gb, 4) + 1;
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2948 else
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2949 n = 16;
1516
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2950 /* 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
2951 for (i = 0; i < 64; i++)
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2952 s->coded_ac_scale_factor[i] = get_bits(&gb, n);
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2953
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2954 if (s->theora >= 0x030200)
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2955 n = get_bits(&gb, 4) + 1;
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2956 else
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2957 n = 16;
1516
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2958 /* 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
2959 for (i = 0; i < 64; i++)
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2960 s->coded_dc_scale_factor[i] = get_bits(&gb, n);
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2961
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2962 if (s->theora >= 0x030200)
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2963 n = get_bits(&gb, 9) + 1;
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2964 else
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2965 n = 3;
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2966 if (n != 3) {
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2967 av_log(NULL,AV_LOG_ERROR, "unsupported nbms : %d\n", n);
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2968 return -1;
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2969 }
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
2970 /* 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
2971 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
2972 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
2973
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2974 /* 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
2975 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
2976 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
2977
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2978 /* 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
2979 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
2980 s->coded_inter_dequant[i] = get_bits(&gb, 8);
1664
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2981
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2982 /* 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
2983
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2984 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
2985
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2986 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
2987 }
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2988
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2989 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
2990 {
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2991 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
2992 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
2993 int ptype;
2533
06985f4138e3 04-vp3 fix(by matthieu castet).patch
michael
parents: 2531
diff changeset
2994 uint8_t *p= avctx->extradata;
06985f4138e3 04-vp3 fix(by matthieu castet).patch
michael
parents: 2531
diff changeset
2995 int op_bytes, i;
1516
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2996
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2997 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
2998
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2999 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
3000 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
3001
2533
06985f4138e3 04-vp3 fix(by matthieu castet).patch
michael
parents: 2531
diff changeset
3002 for(i=0;i<3;i++) {
06985f4138e3 04-vp3 fix(by matthieu castet).patch
michael
parents: 2531
diff changeset
3003 op_bytes = *(p++)<<8;
06985f4138e3 04-vp3 fix(by matthieu castet).patch
michael
parents: 2531
diff changeset
3004 op_bytes += *(p++);
06985f4138e3 04-vp3 fix(by matthieu castet).patch
michael
parents: 2531
diff changeset
3005
06985f4138e3 04-vp3 fix(by matthieu castet).patch
michael
parents: 2531
diff changeset
3006 init_get_bits(&gb, p, op_bytes);
06985f4138e3 04-vp3 fix(by matthieu castet).patch
michael
parents: 2531
diff changeset
3007 p += op_bytes;
1516
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
3008
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
3009 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
3010 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
3011
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
3012 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
3013 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
3014
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
3015 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
3016
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
3017 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
3018 {
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
3019 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
3020 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
3021 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
3022 case 0x81:
1518
c66cdace3bf6 theora comments skipping
alex
parents: 1516
diff changeset
3023 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
3024 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
3025 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
3026 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
3027 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
3028 }
2533
06985f4138e3 04-vp3 fix(by matthieu castet).patch
michael
parents: 2531
diff changeset
3029 }
1516
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
3030
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
3031 vp3_decode_init(avctx);
1516
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
3032 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
3033 }
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
3034
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
3035 AVCodec vp3_decoder = {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
3036 "vp3",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
3037 CODEC_TYPE_VIDEO,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
3038 CODEC_ID_VP3,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
3039 sizeof(Vp3DecodeContext),
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
3040 vp3_decode_init,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
3041 NULL,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
3042 vp3_decode_end,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
3043 vp3_decode_frame,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
3044 0,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
3045 NULL
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
3046 };
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
3047
2665
5ea2a7f74817 theora decoding using libtheora
mru
parents: 2533
diff changeset
3048 #ifndef CONFIG_LIBTHEORA
1516
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
3049 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
3050 "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
3051 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
3052 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
3053 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
3054 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
3055 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
3056 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
3057 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
3058 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
3059 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
3060 };
2665
5ea2a7f74817 theora decoding using libtheora
mru
parents: 2533
diff changeset
3061 #endif