annotate vp3.c @ 2731:0b4b57c4a8f5 libavcodec

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