annotate vp3.c @ 5010:d5ba514e3f4a libavcodec

Add libavcodec to compiler include flags in order to simplify header include paths in the source files. mostly from a patch by Ronald S. Bultje, rbultje ronald.bitfreak net
author diego
date Wed, 16 May 2007 09:51:45 +0000
parents f99e40a7155b
children 2b72f9bc4f06
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 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3940
diff changeset
4 * This file is part of FFmpeg.
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3940
diff changeset
5 *
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3940
diff changeset
6 * FFmpeg is free software; you can redistribute it and/or
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
7 * modify it under the terms of the GNU Lesser General Public
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
8 * License as published by the Free Software Foundation; either
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3940
diff changeset
9 * version 2.1 of the License, or (at your option) any later version.
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
10 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3940
diff changeset
11 * FFmpeg is distributed in the hope that it will be useful,
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
14 * Lesser General Public License for more details.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
15 *
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
16 * You should have received a copy of the GNU Lesser General Public
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3940
diff changeset
17 * License along with FFmpeg; if not, write to the Free Software
3036
0b546eab515d Update licensing information: The FSF changed postal address.
diego
parents: 2979
diff changeset
18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1224
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
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
22 /**
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
23 * @file vp3.c
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
24 * 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
25 *
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
26 * 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
27 * 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
28 * http://multimedia.cx/
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
29 *
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
30 * Theora decoder by Alex Beregszaszi
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
31 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
32
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
33 #include <stdio.h>
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
34 #include <stdlib.h>
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
35 #include <string.h>
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
36 #include <unistd.h>
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
37
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
38 #include "avcodec.h"
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
39 #include "dsputil.h"
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
40 #include "mpegvideo.h"
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
41
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
42 #include "vp3data.h"
4723
b62a3a46856c use generic xiph header spliting func to split theora headers
aurel
parents: 4594
diff changeset
43 #include "xiph.h"
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
44
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
45 #define FRAGMENT_PIXELS 8
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
46
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
47 /*
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
48 * Debugging Variables
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
49 *
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
50 * Define one or more of the following compile-time variables to 1 to obtain
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
51 * elaborate information about certain aspects of the decoding process.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
52 *
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
53 * KEYFRAMES_ONLY: set this to 1 to only see keyframes (VP3 slideshow mode)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
54 * DEBUG_VP3: high-level decoding flow
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
55 * DEBUG_INIT: initialization parameters
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
56 * DEBUG_DEQUANTIZERS: display how the dequanization tables are built
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
57 * DEBUG_BLOCK_CODING: unpacking the superblock/macroblock/fragment coding
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
58 * DEBUG_MODES: unpacking the coding modes for individual fragments
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
59 * DEBUG_VECTORS: display the motion vectors
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
60 * DEBUG_TOKEN: display exhaustive information about each DCT token
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
61 * DEBUG_VLC: display the VLCs as they are extracted from the stream
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
62 * DEBUG_DC_PRED: display the process of reversing DC prediction
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
63 * DEBUG_IDCT: show every detail of the IDCT process
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
64 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
65
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
66 #define KEYFRAMES_ONLY 0
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
67
2945
394ea2703387 10l, left debugging on
alex
parents: 2944
diff changeset
68 #define DEBUG_VP3 0
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
69 #define DEBUG_INIT 0
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
70 #define DEBUG_DEQUANTIZERS 0
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
71 #define DEBUG_BLOCK_CODING 0
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
72 #define DEBUG_MODES 0
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
73 #define DEBUG_VECTORS 0
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
74 #define DEBUG_TOKEN 0
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
75 #define DEBUG_VLC 0
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
76 #define DEBUG_DC_PRED 0
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
77 #define DEBUG_IDCT 0
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
78
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
79 #if DEBUG_VP3
2866
5cbc5bdbfa61 use av_log in debug mode
alex
parents: 2834
diff changeset
80 #define debug_vp3(args...) av_log(NULL, AV_LOG_DEBUG, ## args)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
81 #else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
82 static inline void debug_vp3(const char *format, ...) { }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
83 #endif
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
84
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
85 #if DEBUG_INIT
2866
5cbc5bdbfa61 use av_log in debug mode
alex
parents: 2834
diff changeset
86 #define debug_init(args...) av_log(NULL, AV_LOG_DEBUG, ## args)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
87 #else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
88 static inline void debug_init(const char *format, ...) { }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
89 #endif
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
90
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
91 #if DEBUG_DEQUANTIZERS
2866
5cbc5bdbfa61 use av_log in debug mode
alex
parents: 2834
diff changeset
92 #define debug_dequantizers(args...) av_log(NULL, AV_LOG_DEBUG, ## args)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
93 #else
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
94 static inline void debug_dequantizers(const char *format, ...) { }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
95 #endif
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
96
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
97 #if DEBUG_BLOCK_CODING
2866
5cbc5bdbfa61 use av_log in debug mode
alex
parents: 2834
diff changeset
98 #define debug_block_coding(args...) av_log(NULL, AV_LOG_DEBUG, ## args)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
99 #else
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
100 static inline void debug_block_coding(const char *format, ...) { }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
101 #endif
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
102
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
103 #if DEBUG_MODES
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
104 #define debug_modes(args...) av_log(NULL, AV_LOG_DEBUG, ## args)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
105 #else
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
106 static inline void debug_modes(const char *format, ...) { }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
107 #endif
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
108
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
109 #if DEBUG_VECTORS
2866
5cbc5bdbfa61 use av_log in debug mode
alex
parents: 2834
diff changeset
110 #define debug_vectors(args...) av_log(NULL, AV_LOG_DEBUG, ## args)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
111 #else
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
112 static inline void debug_vectors(const char *format, ...) { }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
113 #endif
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
114
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
115 #if DEBUG_TOKEN
2866
5cbc5bdbfa61 use av_log in debug mode
alex
parents: 2834
diff changeset
116 #define debug_token(args...) av_log(NULL, AV_LOG_DEBUG, ## args)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
117 #else
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
118 static inline void debug_token(const char *format, ...) { }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
119 #endif
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
120
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
121 #if DEBUG_VLC
2866
5cbc5bdbfa61 use av_log in debug mode
alex
parents: 2834
diff changeset
122 #define debug_vlc(args...) av_log(NULL, AV_LOG_DEBUG, ## args)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
123 #else
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
124 static inline void debug_vlc(const char *format, ...) { }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
125 #endif
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
126
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
127 #if DEBUG_DC_PRED
2866
5cbc5bdbfa61 use av_log in debug mode
alex
parents: 2834
diff changeset
128 #define debug_dc_pred(args...) av_log(NULL, AV_LOG_DEBUG, ## args)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
129 #else
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
130 static inline void debug_dc_pred(const char *format, ...) { }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
131 #endif
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
132
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
133 #if DEBUG_IDCT
2866
5cbc5bdbfa61 use av_log in debug mode
alex
parents: 2834
diff changeset
134 #define debug_idct(args...) av_log(NULL, AV_LOG_DEBUG, ## args)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
135 #else
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
136 static inline void debug_idct(const char *format, ...) { }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
137 #endif
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
138
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
139 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
140 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
141 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
142 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
143 } 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
144
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 //FIXME split things out into their own arrays
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
146 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
147 Coeff *next_coeff;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
148 /* address of first pixel taking into account which plane the fragment
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
149 * lives on as well as the plane stride */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
150 int first_pixel;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
151 /* this is the macroblock that the fragment belongs to */
2706
a23c44f7ed60 reduce size of Vp3Fragment from 32byte to 16byte
michael
parents: 2705
diff changeset
152 uint16_t macroblock;
a23c44f7ed60 reduce size of Vp3Fragment from 32byte to 16byte
michael
parents: 2705
diff changeset
153 uint8_t coding_method;
a23c44f7ed60 reduce size of Vp3Fragment from 32byte to 16byte
michael
parents: 2705
diff changeset
154 uint8_t coeff_count;
a23c44f7ed60 reduce size of Vp3Fragment from 32byte to 16byte
michael
parents: 2705
diff changeset
155 int8_t motion_x;
a23c44f7ed60 reduce size of Vp3Fragment from 32byte to 16byte
michael
parents: 2705
diff changeset
156 int8_t motion_y;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
157 } Vp3Fragment;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
158
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
159 #define SB_NOT_CODED 0
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
160 #define SB_PARTIALLY_CODED 1
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
161 #define SB_FULLY_CODED 2
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
162
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
163 #define MODE_INTER_NO_MV 0
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
164 #define MODE_INTRA 1
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
165 #define MODE_INTER_PLUS_MV 2
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
166 #define MODE_INTER_LAST_MV 3
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
167 #define MODE_INTER_PRIOR_LAST 4
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
168 #define MODE_USING_GOLDEN 5
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
169 #define MODE_GOLDEN_MV 6
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
170 #define MODE_INTER_FOURMV 7
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
171 #define CODING_MODE_COUNT 8
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
172
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
173 /* special internal mode */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
174 #define MODE_COPY 8
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
175
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
176 /* There are 6 preset schemes, plus a free-form scheme */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
177 static int ModeAlphabet[7][CODING_MODE_COUNT] =
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
178 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
179 /* this is the custom scheme */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
180 { 0, 0, 0, 0, 0, 0, 0, 0 },
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
181
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
182 /* scheme 1: Last motion vector dominates */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
183 { MODE_INTER_LAST_MV, MODE_INTER_PRIOR_LAST,
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
184 MODE_INTER_PLUS_MV, MODE_INTER_NO_MV,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
185 MODE_INTRA, MODE_USING_GOLDEN,
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
186 MODE_GOLDEN_MV, MODE_INTER_FOURMV },
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
187
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
188 /* scheme 2 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
189 { MODE_INTER_LAST_MV, MODE_INTER_PRIOR_LAST,
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
190 MODE_INTER_NO_MV, MODE_INTER_PLUS_MV,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
191 MODE_INTRA, MODE_USING_GOLDEN,
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
192 MODE_GOLDEN_MV, MODE_INTER_FOURMV },
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
193
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
194 /* scheme 3 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
195 { MODE_INTER_LAST_MV, MODE_INTER_PLUS_MV,
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
196 MODE_INTER_PRIOR_LAST, MODE_INTER_NO_MV,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
197 MODE_INTRA, MODE_USING_GOLDEN,
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
198 MODE_GOLDEN_MV, MODE_INTER_FOURMV },
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
199
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
200 /* scheme 4 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
201 { MODE_INTER_LAST_MV, MODE_INTER_PLUS_MV,
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
202 MODE_INTER_NO_MV, MODE_INTER_PRIOR_LAST,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
203 MODE_INTRA, MODE_USING_GOLDEN,
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
204 MODE_GOLDEN_MV, MODE_INTER_FOURMV },
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
205
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
206 /* scheme 5: No motion vector dominates */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
207 { MODE_INTER_NO_MV, MODE_INTER_LAST_MV,
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
208 MODE_INTER_PRIOR_LAST, MODE_INTER_PLUS_MV,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
209 MODE_INTRA, MODE_USING_GOLDEN,
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
210 MODE_GOLDEN_MV, MODE_INTER_FOURMV },
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
211
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
212 /* scheme 6 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
213 { MODE_INTER_NO_MV, MODE_USING_GOLDEN,
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
214 MODE_INTER_LAST_MV, MODE_INTER_PRIOR_LAST,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
215 MODE_INTER_PLUS_MV, MODE_INTRA,
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
216 MODE_GOLDEN_MV, MODE_INTER_FOURMV },
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 };
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 #define MIN_DEQUANT_VAL 2
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
221
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
222 typedef struct Vp3DecodeContext {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
223 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
224 int theora, theora_tables;
1664
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
225 int version;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
226 int width, height;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
227 AVFrame golden_frame;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
228 AVFrame last_frame;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
229 AVFrame current_frame;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
230 int keyframe;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
231 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
232 int flipped_image;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
233
3492
fa3794c46f21 parse all QIS values (we still ignore them though ...)
michael
parents: 3491
diff changeset
234 int qis[3];
fa3794c46f21 parse all QIS values (we still ignore them though ...)
michael
parents: 3491
diff changeset
235 int nqis;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
236 int quality_index;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
237 int last_quality_index;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
238
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
239 int superblock_count;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
240 int superblock_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
241 int superblock_height;
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
242 int y_superblock_width;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
243 int y_superblock_height;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
244 int c_superblock_width;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
245 int c_superblock_height;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
246 int u_superblock_start;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
247 int v_superblock_start;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
248 unsigned char *superblock_coding;
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 macroblock_count;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
251 int macroblock_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
252 int macroblock_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 int fragment_count;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
255 int fragment_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
256 int fragment_height;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
257
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
258 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
259 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
260 Coeff *next_coeff;
3498
4b040103da35 simplify
michael
parents: 3497
diff changeset
261 int fragment_start[3];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
262
2694
0d229cf036b9 fix idct permutation
michael
parents: 2693
diff changeset
263 ScanTable scantable;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
264
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 /* 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
266 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
267 uint32_t coded_ac_scale_factor[64];
3489
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
268 uint8_t base_matrix[384][64];
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
269 uint8_t qr_count[2][3];
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
270 uint8_t qr_size [2][3][64];
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
271 uint16_t qr_base[2][3][64];
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
272
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
273 /* 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
274 * which of the fragments are coded */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
275 int *coded_fragment_list;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
276 int coded_fragment_list_index;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
277 int pixel_addresses_inited;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
278
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
279 VLC dc_vlc[16];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
280 VLC ac_vlc_1[16];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
281 VLC ac_vlc_2[16];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
282 VLC ac_vlc_3[16];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
283 VLC ac_vlc_4[16];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
284
2702
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
285 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
286 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
287 VLC mode_code_vlc;
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
288 VLC motion_vector_vlc;
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
289
1972
8a556283601d hook up support for SSE2-optimized VP3 IDCT
melanson
parents: 1867
diff changeset
290 /* 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
291 * index into them */
3488
a647bf3a7fa8 replace *_dequant (2 intra, 1 inter) by qmat (3 intra, 3 inter) (needed for theora according to spec)
michael
parents: 3487
diff changeset
292 DECLARE_ALIGNED_16(int16_t, qmat[2][4][64]); //<qmat[is_inter][plane]
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
293
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
294 /* This table contains superblock_count * 16 entries. Each set of 16
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
295 * numbers corresponds to the fragment indices 0..15 of the superblock.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
296 * 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
297 * index. */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
298 int *superblock_fragments;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
299
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
300 /* This table contains superblock_count * 4 entries. Each set of 4
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
301 * numbers corresponds to the macroblock indices 0..3 of the superblock.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
302 * 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
303 * index. */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
304 int *superblock_macroblocks;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
305
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
306 /* This table contains macroblock_count * 6 entries. Each set of 6
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
307 * numbers corresponds to the fragment indices 0..5 which comprise
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
308 * the macroblock (4 Y fragments and 2 C fragments). */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
309 int *macroblock_fragments;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
310 /* This is an array that indicates how a particular macroblock
1244
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
311 * is coded. */
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
312 unsigned char *macroblock_coding;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
313
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
314 int first_coded_y_fragment;
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
315 int first_coded_c_fragment;
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
316 int last_coded_y_fragment;
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
317 int last_coded_c_fragment;
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
318
1406
ae5524a3cd08 MC rounding fixed?
michaelni
parents: 1405
diff changeset
319 uint8_t edge_emu_buffer[9*2048]; //FIXME dynamic alloc
3776
1843a85123b7 fix some signedness warnings
mru
parents: 3585
diff changeset
320 int8_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
321
2723
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
322 /* Huffman decode */
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
323 int hti;
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
324 unsigned int hbits;
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
325 int entries;
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
326 int huff_code_size;
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
327 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
328
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
329 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
330 int bounding_values_array[256];
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
331 } Vp3DecodeContext;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
332
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
333 /************************************************************************
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
334 * VP3 specific functions
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
335 ************************************************************************/
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
336
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 * This function sets up all of the various blocks mappings:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
339 * superblocks <-> fragments, macroblocks <-> fragments,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
340 * superblocks <-> macroblocks
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
341 *
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
342 * Returns 0 is successful; returns 1 if *anything* went wrong.
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
343 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
344 static int init_block_mapping(Vp3DecodeContext *s)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
345 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
346 int i, j;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
347 signed int hilbert_walk_mb[4];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
348
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
349 int current_fragment = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
350 int current_width = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
351 int current_height = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
352 int right_edge = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
353 int bottom_edge = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
354 int superblock_row_inc = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
355 int *hilbert = NULL;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
356 int mapping_index = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
357
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
358 int current_macroblock;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
359 int c_fragment;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
360
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
361 signed char travel_width[16] = {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
362 1, 1, 0, -1,
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
363 0, 0, 1, 0,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
364 1, 0, 1, 0,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
365 0, -1, 0, 1
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
366 };
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
367
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
368 signed char travel_height[16] = {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
369 0, 0, 1, 0,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
370 1, 1, 0, -1,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
371 0, 1, 0, -1,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
372 -1, 0, -1, 0
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
373 };
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
374
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
375 signed char travel_width_mb[4] = {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
376 1, 0, 1, 0
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
377 };
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
378
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
379 signed char travel_height_mb[4] = {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
380 0, 1, 0, -1
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
381 };
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
382
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
383 debug_vp3(" vp3: initialize block mapping tables\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
384
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
385 hilbert_walk_mb[0] = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
386 hilbert_walk_mb[1] = s->macroblock_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
387 hilbert_walk_mb[2] = 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
388 hilbert_walk_mb[3] = -s->macroblock_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
389
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
390 /* iterate through each superblock (all planes) and map the fragments */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
391 for (i = 0; i < s->superblock_count; i++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
392 debug_init(" superblock %d (u starts @ %d, v starts @ %d)\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
393 i, s->u_superblock_start, s->v_superblock_start);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
394
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
395 /* time to re-assign the limits? */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
396 if (i == 0) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
397
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
398 /* start of Y superblocks */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
399 right_edge = s->fragment_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
400 bottom_edge = s->fragment_height;
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
401 current_width = -1;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
402 current_height = 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
403 superblock_row_inc = 3 * s->fragment_width -
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
404 (s->y_superblock_width * 4 - s->fragment_width);
1224
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 /* the first operation for this variable is to advance by 1 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
407 current_fragment = -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
408
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
409 } else if (i == s->u_superblock_start) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
410
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
411 /* start of U superblocks */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
412 right_edge = s->fragment_width / 2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
413 bottom_edge = s->fragment_height / 2;
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
414 current_width = -1;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
415 current_height = 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
416 superblock_row_inc = 3 * (s->fragment_width / 2) -
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
417 (s->c_superblock_width * 4 - s->fragment_width / 2);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
418
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
419 /* the first operation for this variable is to advance by 1 */
3498
4b040103da35 simplify
michael
parents: 3497
diff changeset
420 current_fragment = s->fragment_start[1] - 1;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
421
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
422 } else if (i == s->v_superblock_start) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
423
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
424 /* start of V superblocks */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
425 right_edge = s->fragment_width / 2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
426 bottom_edge = s->fragment_height / 2;
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
427 current_width = -1;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
428 current_height = 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
429 superblock_row_inc = 3 * (s->fragment_width / 2) -
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
430 (s->c_superblock_width * 4 - s->fragment_width / 2);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
431
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
432 /* the first operation for this variable is to advance by 1 */
3498
4b040103da35 simplify
michael
parents: 3497
diff changeset
433 current_fragment = s->fragment_start[2] - 1;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
434
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
435 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
436
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
437 if (current_width >= right_edge - 1) {
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
438 /* 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
439 current_width = -1;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
440 current_height += 4;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
441
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
442 /* fragment is now at the start of a new superblock row */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
443 current_fragment += superblock_row_inc;
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
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
446 /* iterate through all 16 fragments in a superblock */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
447 for (j = 0; j < 16; j++) {
3502
47c9a225c4d4 simplify
michael
parents: 3501
diff changeset
448 current_fragment += travel_width[j] + right_edge * travel_height[j];
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
449 current_width += travel_width[j];
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
450 current_height += travel_height[j];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
451
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
452 /* 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
453 if ((current_width < right_edge) &&
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
454 (current_height < bottom_edge)) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
455 s->superblock_fragments[mapping_index] = current_fragment;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
456 debug_init(" mapping fragment %d to superblock %d, position %d (%d/%d x %d/%d)\n",
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
457 s->superblock_fragments[mapping_index], i, j,
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
458 current_width, right_edge, current_height, bottom_edge);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
459 } else {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
460 s->superblock_fragments[mapping_index] = -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
461 debug_init(" superblock %d, position %d has no fragment (%d/%d x %d/%d)\n",
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
462 i, j,
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
463 current_width, right_edge, current_height, bottom_edge);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
464 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
465
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
466 mapping_index++;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
467 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
468 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
469
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
470 /* initialize the superblock <-> macroblock mapping; iterate through
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
471 * all of the Y plane superblocks to build this mapping */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
472 right_edge = s->macroblock_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
473 bottom_edge = s->macroblock_height;
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
474 current_width = -1;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
475 current_height = 0;
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
476 superblock_row_inc = s->macroblock_width -
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
477 (s->y_superblock_width * 2 - s->macroblock_width);;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
478 hilbert = hilbert_walk_mb;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
479 mapping_index = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
480 current_macroblock = -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
481 for (i = 0; i < s->u_superblock_start; i++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
482
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
483 if (current_width >= right_edge - 1) {
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
484 /* reset width and move to next superblock row */
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
485 current_width = -1;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
486 current_height += 2;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
487
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
488 /* macroblock is now at the start of a new superblock row */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
489 current_macroblock += superblock_row_inc;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
490 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
491
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
492 /* iterate through each potential macroblock in the superblock */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
493 for (j = 0; j < 4; j++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
494 current_macroblock += hilbert_walk_mb[j];
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
495 current_width += travel_width_mb[j];
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
496 current_height += travel_height_mb[j];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
497
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
498 /* 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
499 if ((current_width < right_edge) &&
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
500 (current_height < bottom_edge)) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
501 s->superblock_macroblocks[mapping_index] = current_macroblock;
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
502 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
503 s->superblock_macroblocks[mapping_index], i, j,
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
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 } else {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
506 s->superblock_macroblocks[mapping_index] = -1;
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
507 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
508 i, j,
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
509 current_width, right_edge, current_height, bottom_edge);
1224
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
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
512 mapping_index++;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
513 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
514 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
515
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
516 /* initialize the macroblock <-> fragment mapping */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
517 current_fragment = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
518 current_macroblock = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
519 mapping_index = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
520 for (i = 0; i < s->fragment_height; i += 2) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
521
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
522 for (j = 0; j < s->fragment_width; j += 2) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
523
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
524 debug_init(" macroblock %d contains fragments: ", current_macroblock);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
525 s->all_fragments[current_fragment].macroblock = current_macroblock;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
526 s->macroblock_fragments[mapping_index++] = current_fragment;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
527 debug_init("%d ", current_fragment);
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 if (j + 1 < s->fragment_width) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
530 s->all_fragments[current_fragment + 1].macroblock = current_macroblock;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
531 s->macroblock_fragments[mapping_index++] = current_fragment + 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
532 debug_init("%d ", current_fragment + 1);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
533 } else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
534 s->macroblock_fragments[mapping_index++] = -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
535
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
536 if (i + 1 < s->fragment_height) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
537 s->all_fragments[current_fragment + s->fragment_width].macroblock =
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
538 current_macroblock;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
539 s->macroblock_fragments[mapping_index++] =
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
540 current_fragment + s->fragment_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
541 debug_init("%d ", current_fragment + s->fragment_width);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
542 } else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
543 s->macroblock_fragments[mapping_index++] = -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
544
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
545 if ((j + 1 < s->fragment_width) && (i + 1 < s->fragment_height)) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
546 s->all_fragments[current_fragment + s->fragment_width + 1].macroblock =
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
547 current_macroblock;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
548 s->macroblock_fragments[mapping_index++] =
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
549 current_fragment + s->fragment_width + 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
550 debug_init("%d ", current_fragment + s->fragment_width + 1);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
551 } else
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
552 s->macroblock_fragments[mapping_index++] = -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
553
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
554 /* C planes */
3498
4b040103da35 simplify
michael
parents: 3497
diff changeset
555 c_fragment = s->fragment_start[1] +
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
556 (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
557 s->all_fragments[c_fragment].macroblock = s->macroblock_count;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
558 s->macroblock_fragments[mapping_index++] = c_fragment;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
559 debug_init("%d ", c_fragment);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
560
3498
4b040103da35 simplify
michael
parents: 3497
diff changeset
561 c_fragment = s->fragment_start[2] +
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
562 (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
563 s->all_fragments[c_fragment].macroblock = s->macroblock_count;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
564 s->macroblock_fragments[mapping_index++] = c_fragment;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
565 debug_init("%d ", c_fragment);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
566
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
567 debug_init("\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
568
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
569 if (j + 2 <= s->fragment_width)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
570 current_fragment += 2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
571 else
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
572 current_fragment++;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
573 current_macroblock++;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
574 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
575
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
576 current_fragment += s->fragment_width;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
577 }
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
578
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
579 return 0; /* successful path out */
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
580 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
581
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
582 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
583 * This function wipes out all of the fragment data.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
584 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
585 static void init_frame(Vp3DecodeContext *s, GetBitContext *gb)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
586 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
587 int i;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
588
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
589 /* zero out all of the fragment information */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
590 s->coded_fragment_list_index = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
591 for (i = 0; i < s->fragment_count; i++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
592 s->all_fragments[i].coeff_count = 0;
2721
7a6db2f4e6c0 clean up some warnings and dead code
melanson
parents: 2719
diff changeset
593 s->all_fragments[i].motion_x = 127;
7a6db2f4e6c0 clean up some warnings and dead code
melanson
parents: 2719
diff changeset
594 s->all_fragments[i].motion_y = 127;
7a6db2f4e6c0 clean up some warnings and dead code
melanson
parents: 2719
diff changeset
595 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
596 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
597 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
598 s->coeffs[i].next= NULL;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
599 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
600 }
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 /*
2723
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
603 * 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
604 * frame.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
605 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
606 static void init_dequantizer(Vp3DecodeContext *s)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
607 {
1867
7f7aa6ac3723 cut over to using new VP3 DSP functions and remove the old ones; bring
melanson
parents: 1864
diff changeset
608 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
609 int dc_scale_factor = s->coded_dc_scale_factor[s->quality_index];
3920
3a151ccc6ed7 Remove unused variables and the corresponding warnings along with them.
diego
parents: 3776
diff changeset
610 int i, plane, inter, qri, bmi, bmj, qistart;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
611
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
612 debug_vp3(" vp3: initializing dequantization tables\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
613
3489
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
614 for(inter=0; inter<2; inter++){
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
615 for(plane=0; plane<3; plane++){
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
616 int sum=0;
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
617 for(qri=0; qri<s->qr_count[inter][plane]; qri++){
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
618 sum+= s->qr_size[inter][plane][qri];
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
619 if(s->quality_index <= sum)
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
620 break;
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
621 }
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
622 qistart= sum - s->qr_size[inter][plane][qri];
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
623 bmi= s->qr_base[inter][plane][qri ];
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
624 bmj= s->qr_base[inter][plane][qri+1];
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
625 for(i=0; i<64; i++){
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
626 int coeff= ( 2*(sum -s->quality_index)*s->base_matrix[bmi][i]
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
627 - 2*(qistart-s->quality_index)*s->base_matrix[bmj][i]
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
628 + s->qr_size[inter][plane][qri])
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
629 / (2*s->qr_size[inter][plane][qri]);
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
630
3491
6eadb7c9f569 100l for me
michael
parents: 3490
diff changeset
631 int qmin= 8<<(inter + !i);
3489
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
632 int qscale= i ? ac_scale_factor : dc_scale_factor;
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
633
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4561
diff changeset
634 s->qmat[inter][plane][i]= av_clip((qscale * coeff)/100 * 4, qmin, 4096);
3489
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
635 }
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
636 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
637 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
638
3488
a647bf3a7fa8 replace *_dequant (2 intra, 1 inter) by qmat (3 intra, 3 inter) (needed for theora according to spec)
michael
parents: 3487
diff changeset
639 memset(s->qscale_table, (FFMAX(s->qmat[0][0][1], s->qmat[0][1][1])+8)/16, 512); //FIXME finetune
1224
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
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
642 /*
2723
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
643 * 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
644 * 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
645 */
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
646 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
647 {
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
648 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
649 int filter_limit;
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
650 int x;
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
651
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
652 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
653
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
654 /* set up the bounding values */
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
655 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
656 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
657 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
658 bounding_values[-x] = -x;
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
659 bounding_values[x] = x;
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
660 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
661 }
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
662 }
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
663
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
664 /*
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
665 * This function unpacks all of the superblock/macroblock/fragment coding
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
666 * information from the bitstream.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
667 */
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
668 static int unpack_superblocks(Vp3DecodeContext *s, GetBitContext *gb)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
669 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
670 int bit = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
671 int current_superblock = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
672 int current_run = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
673 int decode_fully_flags = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
674 int decode_partial_blocks = 0;
1272
777d4145cdfb fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents: 1244
diff changeset
675 int first_c_fragment_seen;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
676
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
677 int i, j;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
678 int current_fragment;
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 debug_vp3(" vp3: unpacking superblock coding\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
681
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
682 if (s->keyframe) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
683
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
684 debug_vp3(" keyframe-- all superblocks are fully coded\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
685 memset(s->superblock_coding, SB_FULLY_CODED, s->superblock_count);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
686
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
687 } else {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
688
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
689 /* unpack the list of partially-coded superblocks */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
690 bit = get_bits(gb, 1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
691 /* toggle the bit because as soon as the first run length is
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
692 * fetched the bit will be toggled again */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
693 bit ^= 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
694 while (current_superblock < s->superblock_count) {
2705
2f9f51297218 optimizing rle decoding loops a little
michael
parents: 2704
diff changeset
695 if (current_run-- == 0) {
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
696 bit ^= 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
697 current_run = get_vlc2(gb,
2705
2f9f51297218 optimizing rle decoding loops a little
michael
parents: 2704
diff changeset
698 s->superblock_run_length_vlc.table, 6, 2);
2f9f51297218 optimizing rle decoding loops a little
michael
parents: 2704
diff changeset
699 if (current_run == 33)
2703
3817945001ce replace get_superblock_run_length() with a VLC table
melanson
parents: 2702
diff changeset
700 current_run += get_bits(gb, 12);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
701 debug_block_coding(" setting superblocks %d..%d to %s\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
702 current_superblock,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
703 current_superblock + current_run - 1,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
704 (bit) ? "partially coded" : "not coded");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
705
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
706 /* if any of the superblocks are not partially coded, flag
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
707 * 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
708 if (bit == 0) {
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
709 decode_fully_flags = 1;
1292
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
710 } else {
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
711
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
712 /* 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
713 * superblocks */
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
714 decode_partial_blocks = 1;
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
715 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
716 }
2705
2f9f51297218 optimizing rle decoding loops a little
michael
parents: 2704
diff changeset
717 s->superblock_coding[current_superblock++] = bit;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
718 }
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 /* 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
721 * not marked as partially coded in the previous step */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
722 if (decode_fully_flags) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
723
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
724 current_superblock = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
725 current_run = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
726 bit = get_bits(gb, 1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
727 /* toggle the bit because as soon as the first run length is
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
728 * fetched the bit will be toggled again */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
729 bit ^= 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
730 while (current_superblock < s->superblock_count) {
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 /* skip any superblocks already marked as partially coded */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
733 if (s->superblock_coding[current_superblock] == SB_NOT_CODED) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
734
2705
2f9f51297218 optimizing rle decoding loops a little
michael
parents: 2704
diff changeset
735 if (current_run-- == 0) {
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
736 bit ^= 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
737 current_run = get_vlc2(gb,
2705
2f9f51297218 optimizing rle decoding loops a little
michael
parents: 2704
diff changeset
738 s->superblock_run_length_vlc.table, 6, 2);
2f9f51297218 optimizing rle decoding loops a little
michael
parents: 2704
diff changeset
739 if (current_run == 33)
2703
3817945001ce replace get_superblock_run_length() with a VLC table
melanson
parents: 2702
diff changeset
740 current_run += get_bits(gb, 12);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
741 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
742
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
743 debug_block_coding(" setting superblock %d to %s\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
744 current_superblock,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
745 (bit) ? "fully coded" : "not coded");
2705
2f9f51297218 optimizing rle decoding loops a little
michael
parents: 2704
diff changeset
746 s->superblock_coding[current_superblock] = 2*bit;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
747 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
748 current_superblock++;
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 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
751
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
752 /* if there were partial blocks, initialize bitstream for
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
753 * unpacking fragment codings */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
754 if (decode_partial_blocks) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
755
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
756 current_run = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
757 bit = get_bits(gb, 1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
758 /* toggle the bit because as soon as the first run length is
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
759 * fetched the bit will be toggled again */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
760 bit ^= 1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
761 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
762 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
763
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
764 /* figure out which fragments are coded; iterate through each
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
765 * superblock (all planes) */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
766 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
767 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
768 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
769 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
770 first_c_fragment_seen = 0;
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
771 memset(s->macroblock_coding, MODE_COPY, s->macroblock_count);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
772 for (i = 0; i < s->superblock_count; i++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
773
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
774 /* iterate through all 16 fragments in a superblock */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
775 for (j = 0; j < 16; j++) {
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 /* if the fragment is in bounds, check its coding status */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
778 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
779 if (current_fragment >= s->fragment_count) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1518
diff changeset
780 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
781 current_fragment, s->fragment_count);
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
782 return 1;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
783 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
784 if (current_fragment != -1) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
785 if (s->superblock_coding[i] == SB_NOT_CODED) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
786
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
787 /* copy all the fragments from the prior frame */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
788 s->all_fragments[current_fragment].coding_method =
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
789 MODE_COPY;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
790
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
791 } else if (s->superblock_coding[i] == SB_PARTIALLY_CODED) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
792
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
793 /* fragment may or may not be coded; this is the case
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
794 * that cares about the fragment coding runs */
2705
2f9f51297218 optimizing rle decoding loops a little
michael
parents: 2704
diff changeset
795 if (current_run-- == 0) {
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
796 bit ^= 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
797 current_run = get_vlc2(gb,
2705
2f9f51297218 optimizing rle decoding loops a little
michael
parents: 2704
diff changeset
798 s->fragment_run_length_vlc.table, 5, 2);
1224
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
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
801 if (bit) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
802 /* default mode; actual mode will be decoded in
1272
777d4145cdfb fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents: 1244
diff changeset
803 * the next phase */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
804 s->all_fragments[current_fragment].coding_method =
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
805 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
806 s->all_fragments[current_fragment].next_coeff= s->coeffs + current_fragment;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
807 s->coded_fragment_list[s->coded_fragment_list_index] =
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
808 current_fragment;
3498
4b040103da35 simplify
michael
parents: 3497
diff changeset
809 if ((current_fragment >= s->fragment_start[1]) &&
1272
777d4145cdfb fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents: 1244
diff changeset
810 (s->last_coded_y_fragment == -1) &&
777d4145cdfb fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents: 1244
diff changeset
811 (!first_c_fragment_seen)) {
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
812 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
813 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
814 first_c_fragment_seen = 1;
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
815 }
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
816 s->coded_fragment_list_index++;
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
817 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
818 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
819 i, current_fragment);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
820 } else {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
821 /* not coded; copy this fragment from the prior frame */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
822 s->all_fragments[current_fragment].coding_method =
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
823 MODE_COPY;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
824 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
825 i, current_fragment);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
826 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
827
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
828 } else {
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 /* fragments are fully coded in this superblock; actual
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
831 * coding will be determined in next step */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
832 s->all_fragments[current_fragment].coding_method =
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
833 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
834 s->all_fragments[current_fragment].next_coeff= s->coeffs + current_fragment;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
835 s->coded_fragment_list[s->coded_fragment_list_index] =
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
836 current_fragment;
3498
4b040103da35 simplify
michael
parents: 3497
diff changeset
837 if ((current_fragment >= s->fragment_start[1]) &&
1272
777d4145cdfb fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents: 1244
diff changeset
838 (s->last_coded_y_fragment == -1) &&
777d4145cdfb fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents: 1244
diff changeset
839 (!first_c_fragment_seen)) {
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
840 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
841 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
842 first_c_fragment_seen = 1;
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
843 }
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
844 s->coded_fragment_list_index++;
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
845 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
846 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
847 i, current_fragment);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
848 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
849 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
850 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
851 }
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
852
1272
777d4145cdfb fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents: 1244
diff changeset
853 if (!first_c_fragment_seen)
777d4145cdfb fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents: 1244
diff changeset
854 /* 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
855 s->last_coded_y_fragment = s->coded_fragment_list_index - 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
856 else
1292
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
857 /* 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
858 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
859
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
860 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
861 s->coded_fragment_list_index,
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
862 s->first_coded_y_fragment,
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
863 s->last_coded_y_fragment,
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
864 s->first_coded_c_fragment,
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
865 s->last_coded_c_fragment);
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
866
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
867 return 0;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
868 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
869
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 * This function unpacks all the coding mode data for individual macroblocks
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
872 * from the bitstream.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
873 */
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
874 static int unpack_modes(Vp3DecodeContext *s, GetBitContext *gb)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
875 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
876 int i, j, k;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
877 int scheme;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
878 int current_macroblock;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
879 int current_fragment;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
880 int coding_mode;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
881
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
882 debug_vp3(" vp3: unpacking encoding modes\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
883
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
884 if (s->keyframe) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
885 debug_vp3(" keyframe-- all blocks are coded as INTRA\n");
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 for (i = 0; i < s->fragment_count; i++)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
888 s->all_fragments[i].coding_method = MODE_INTRA;
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 } else {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
891
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
892 /* fetch the mode coding scheme for this frame */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
893 scheme = get_bits(gb, 3);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
894 debug_modes(" using mode alphabet %d\n", scheme);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
895
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
896 /* is it a custom coding scheme? */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
897 if (scheme == 0) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
898 debug_modes(" custom mode alphabet ahead:\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
899 for (i = 0; i < 8; i++)
1233
5d66713e97e2 correct the custom coding mode alphabet, add some validation on the
tmmm
parents: 1230
diff changeset
900 ModeAlphabet[scheme][get_bits(gb, 3)] = i;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
901 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
902
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
903 for (i = 0; i < 8; i++)
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
904 debug_modes(" mode[%d][%d] = %d\n", scheme, i,
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
905 ModeAlphabet[scheme][i]);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
906
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
907 /* iterate through all of the macroblocks that contain 1 or more
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
908 * coded fragments */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
909 for (i = 0; i < s->u_superblock_start; i++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
910
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
911 for (j = 0; j < 4; j++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
912 current_macroblock = s->superblock_macroblocks[i * 4 + j];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
913 if ((current_macroblock == -1) ||
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
914 (s->macroblock_coding[current_macroblock] == MODE_COPY))
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
915 continue;
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
916 if (current_macroblock >= s->macroblock_count) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1518
diff changeset
917 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
918 current_macroblock, s->macroblock_count);
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
919 return 1;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
920 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
921
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
922 /* mode 7 means get 3 bits for each coding mode */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
923 if (scheme == 7)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
924 coding_mode = get_bits(gb, 3);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
925 else
2702
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
926 coding_mode = ModeAlphabet[scheme]
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
927 [get_vlc2(gb, s->mode_code_vlc.table, 3, 3)];
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
928
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
929 s->macroblock_coding[current_macroblock] = coding_mode;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
930 for (k = 0; k < 6; k++) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
931 current_fragment =
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
932 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
933 if (current_fragment == -1)
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
934 continue;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
935 if (current_fragment >= s->fragment_count) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1518
diff changeset
936 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
937 current_fragment, s->fragment_count);
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
938 return 1;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
939 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
940 if (s->all_fragments[current_fragment].coding_method !=
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
941 MODE_COPY)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
942 s->all_fragments[current_fragment].coding_method =
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
943 coding_mode;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
944 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
945
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
946 debug_modes(" coding method for macroblock starting @ fragment %d = %d\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
947 s->macroblock_fragments[current_macroblock * 6], coding_mode);
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 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
950 }
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
951
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
952 return 0;
1229
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
953 }
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
954
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
955 /*
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
956 * This function unpacks all the motion vectors for the individual
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
957 * macroblocks from the bitstream.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
958 */
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
959 static int unpack_vectors(Vp3DecodeContext *s, GetBitContext *gb)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
960 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
961 int i, j, k;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
962 int coding_mode;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
963 int motion_x[6];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
964 int motion_y[6];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
965 int last_motion_x = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
966 int last_motion_y = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
967 int prior_last_motion_x = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
968 int prior_last_motion_y = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
969 int current_macroblock;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
970 int current_fragment;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
971
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
972 debug_vp3(" vp3: unpacking motion vectors\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
973 if (s->keyframe) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
974
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
975 debug_vp3(" keyframe-- there are no motion vectors\n");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
976
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
977 } else {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
978
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
979 memset(motion_x, 0, 6 * sizeof(int));
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
980 memset(motion_y, 0, 6 * sizeof(int));
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
981
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
982 /* 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
983 coding_mode = get_bits(gb, 1);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
984 debug_vectors(" using %s scheme for unpacking motion vectors\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
985 (coding_mode == 0) ? "VLC" : "fixed-length");
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
986
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
987 /* iterate through all of the macroblocks that contain 1 or more
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
988 * coded fragments */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
989 for (i = 0; i < s->u_superblock_start; i++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
990
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
991 for (j = 0; j < 4; j++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
992 current_macroblock = s->superblock_macroblocks[i * 4 + j];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
993 if ((current_macroblock == -1) ||
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
994 (s->macroblock_coding[current_macroblock] == MODE_COPY))
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
995 continue;
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
996 if (current_macroblock >= s->macroblock_count) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1518
diff changeset
997 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
998 current_macroblock, s->macroblock_count);
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
999 return 1;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1000 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1001
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1002 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
1003 if (current_fragment >= s->fragment_count) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1518
diff changeset
1004 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
1005 current_fragment, s->fragment_count);
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1006 return 1;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1007 }
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
1008 switch (s->macroblock_coding[current_macroblock]) {
1224
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 case MODE_INTER_PLUS_MV:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1011 case MODE_GOLDEN_MV:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1012 /* all 6 fragments use the same motion vector */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1013 if (coding_mode == 0) {
2702
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
1014 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
1015 motion_y[0] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)];
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1016 } else {
2719
5444d77adcbe another bitstream extraction to optimize: fixed-length motion vectors
melanson
parents: 2718
diff changeset
1017 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
1018 motion_y[0] = fixed_motion_vector_table[get_bits(gb, 6)];
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1019 }
2719
5444d77adcbe another bitstream extraction to optimize: fixed-length motion vectors
melanson
parents: 2718
diff changeset
1020
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1021 for (k = 1; k < 6; k++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1022 motion_x[k] = motion_x[0];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1023 motion_y[k] = motion_y[0];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1024 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1025
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1026 /* 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
1027 if (s->macroblock_coding[current_macroblock] ==
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1028 MODE_INTER_PLUS_MV) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1029 prior_last_motion_x = last_motion_x;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1030 prior_last_motion_y = last_motion_y;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1031 last_motion_x = motion_x[0];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1032 last_motion_y = motion_y[0];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1033 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1034 break;
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 case MODE_INTER_FOURMV:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1037 /* fetch 4 vectors from the bitstream, one for each
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1038 * Y fragment, then average for the C fragment vectors */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1039 motion_x[4] = motion_y[4] = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1040 for (k = 0; k < 4; k++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1041 if (coding_mode == 0) {
2709
a119d4eb53d7 fix 4MV MC and reinstate new MC VLC
melanson
parents: 2706
diff changeset
1042 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
1043 motion_y[k] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)];
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1044 } else {
2719
5444d77adcbe another bitstream extraction to optimize: fixed-length motion vectors
melanson
parents: 2718
diff changeset
1045 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
1046 motion_y[k] = fixed_motion_vector_table[get_bits(gb, 6)];
1224
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 motion_x[4] += motion_x[k];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1049 motion_y[4] += motion_y[k];
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
3487
26d3704e12c0 use RSHIFT
michael
parents: 3486
diff changeset
1052 motion_x[5]=
26d3704e12c0 use RSHIFT
michael
parents: 3486
diff changeset
1053 motion_x[4]= RSHIFT(motion_x[4], 2);
26d3704e12c0 use RSHIFT
michael
parents: 3486
diff changeset
1054 motion_y[5]=
26d3704e12c0 use RSHIFT
michael
parents: 3486
diff changeset
1055 motion_y[4]= RSHIFT(motion_y[4], 2);
1224
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 /* vector maintenance; vector[3] is treated as the
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1058 * last vector in this case */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1059 prior_last_motion_x = last_motion_x;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1060 prior_last_motion_y = last_motion_y;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1061 last_motion_x = motion_x[3];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1062 last_motion_y = motion_y[3];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1063 break;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1064
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1065 case MODE_INTER_LAST_MV:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1066 /* all 6 fragments use the last motion vector */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1067 motion_x[0] = last_motion_x;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1068 motion_y[0] = last_motion_y;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1069 for (k = 1; k < 6; k++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1070 motion_x[k] = motion_x[0];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1071 motion_y[k] = motion_y[0];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1072 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1073
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1074 /* no vector maintenance (last vector remains the
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1075 * last vector) */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1076 break;
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 case MODE_INTER_PRIOR_LAST:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1079 /* all 6 fragments use the motion vector prior to the
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1080 * last motion vector */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1081 motion_x[0] = prior_last_motion_x;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1082 motion_y[0] = prior_last_motion_y;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1083 for (k = 1; k < 6; k++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1084 motion_x[k] = motion_x[0];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1085 motion_y[k] = motion_y[0];
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
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1088 /* vector maintenance */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1089 prior_last_motion_x = last_motion_x;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1090 prior_last_motion_y = last_motion_y;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1091 last_motion_x = motion_x[0];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1092 last_motion_y = motion_y[0];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1093 break;
1229
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
1094
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
1095 default:
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
1096 /* 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
1097 memset(motion_x, 0, 6 * sizeof(int));
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
1098 memset(motion_y, 0, 6 * sizeof(int));
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
1099
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
1100 /* no vector maintenance */
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
1101 break;
1224
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 /* assign the motion vectors to the correct fragments */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1105 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
1106 current_fragment,
1292
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
1107 s->macroblock_coding[current_macroblock]);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1108 for (k = 0; k < 6; k++) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1109 current_fragment =
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1110 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
1111 if (current_fragment == -1)
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1112 continue;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1113 if (current_fragment >= s->fragment_count) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1518
diff changeset
1114 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
1115 current_fragment, s->fragment_count);
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1116 return 1;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1117 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1118 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
1119 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
1120 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
1121 k, current_fragment, motion_x[k], motion_y[k]);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1122 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1123 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1124 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1125 }
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1126
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1127 return 0;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1128 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1129
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1130 /*
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1131 * 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
1132 * 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
1133 * 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
1134 * 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
1135 * levels (since different coefficient types require different VLC tables.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1136 *
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1137 * 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
1138 * 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
1139 * 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
1140 * be passed into the next call to this same function.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1141 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1142 static int unpack_vlcs(Vp3DecodeContext *s, GetBitContext *gb,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1143 VLC *table, int coeff_index,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1144 int first_fragment, int last_fragment,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1145 int eob_run)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1146 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1147 int i;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1148 int token;
2712
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1149 int zero_run = 0;
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1150 DCTELEM coeff = 0;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1151 Vp3Fragment *fragment;
2694
0d229cf036b9 fix idct permutation
michael
parents: 2693
diff changeset
1152 uint8_t *perm= s->scantable.permutated;
2712
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1153 int bits_to_get;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1154
1272
777d4145cdfb fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents: 1244
diff changeset
1155 if ((first_fragment >= s->fragment_count) ||
1244
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
1156 (last_fragment >= s->fragment_count)) {
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
1157
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1518
diff changeset
1158 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
1159 first_fragment, last_fragment);
1272
777d4145cdfb fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents: 1244
diff changeset
1160 return 0;
1244
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
1161 }
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
1162
1236
d6e4784ffc16 dump the shady binary search logic (the part that binary searches
tmmm
parents: 1233
diff changeset
1163 for (i = first_fragment; i <= last_fragment; i++) {
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1164
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1165 fragment = &s->all_fragments[s->coded_fragment_list[i]];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1166 if (fragment->coeff_count > coeff_index)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1167 continue;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1168
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1169 if (!eob_run) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1170 /* decode a VLC into a token */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1171 token = get_vlc2(gb, table->table, 5, 3);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1172 debug_vlc(" token = %2d, ", token);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1173 /* 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
1174 if (token <= 6) {
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1175 eob_run = eob_run_base[token];
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1176 if (eob_run_get_bits[token])
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1177 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
1178 coeff = zero_run = 0;
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1179 } else {
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1180 bits_to_get = coeff_get_bits[token];
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1181 if (!bits_to_get)
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1182 coeff = coeff_tables[token][0];
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1183 else
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1184 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
1185
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1186 zero_run = zero_run_base[token];
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1187 if (zero_run_get_bits[token])
9c1a436dac6b replace unpack_token() with a series of lookup tables
melanson
parents: 2709
diff changeset
1188 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
1189 }
1224
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 if (!eob_run) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1193 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
1194 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
1195 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
1196 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
1197 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
1198 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
1199 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
1200 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1201 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
1202 s->coded_fragment_list[i], fragment->next_coeff[coeff_index]);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1203 } 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
1204 fragment->coeff_count |= 128;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1205 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
1206 s->coded_fragment_list[i], fragment->coeff_count&127);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1207 eob_run--;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1208 }
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
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1211 return eob_run;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1212 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1213
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 * This function unpacks all of the DCT coefficient data from the
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1216 * bitstream.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1217 */
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1218 static int unpack_dct_coeffs(Vp3DecodeContext *s, GetBitContext *gb)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1219 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1220 int i;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1221 int dc_y_table;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1222 int dc_c_table;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1223 int ac_y_table;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1224 int ac_c_table;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1225 int residual_eob_run = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1226
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1227 /* fetch the DC table indices */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1228 dc_y_table = get_bits(gb, 4);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1229 dc_c_table = get_bits(gb, 4);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1230
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1231 /* unpack the Y plane DC coefficients */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1232 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
1233 dc_y_table);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1234 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
1235 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
1236
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1237 /* unpack the C plane DC coefficients */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1238 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
1239 dc_c_table);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1240 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
1241 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
1242
1233
5d66713e97e2 correct the custom coding mode alphabet, add some validation on the
tmmm
parents: 1230
diff changeset
1243 /* fetch the AC table indices */
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1244 ac_y_table = get_bits(gb, 4);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1245 ac_c_table = get_bits(gb, 4);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1246
1233
5d66713e97e2 correct the custom coding mode alphabet, add some validation on the
tmmm
parents: 1230
diff changeset
1247 /* unpack the group 1 AC coefficients (coeffs 1-5) */
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1248 for (i = 1; i <= 5; i++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1249
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1250 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
1251 i, ac_y_table);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1252 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
1253 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
1254
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1255 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
1256 i, ac_c_table);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1257 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
1258 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
1259 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1260
1233
5d66713e97e2 correct the custom coding mode alphabet, add some validation on the
tmmm
parents: 1230
diff changeset
1261 /* unpack the group 2 AC coefficients (coeffs 6-14) */
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1262 for (i = 6; i <= 14; i++) {
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 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
1265 i, ac_y_table);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1266 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
1267 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
1268
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1269 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
1270 i, ac_c_table);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1271 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
1272 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
1273 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1274
1233
5d66713e97e2 correct the custom coding mode alphabet, add some validation on the
tmmm
parents: 1230
diff changeset
1275 /* unpack the group 3 AC coefficients (coeffs 15-27) */
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1276 for (i = 15; i <= 27; i++) {
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 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
1279 i, ac_y_table);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1280 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
1281 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
1282
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1283 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
1284 i, ac_c_table);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1285 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
1286 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
1287 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1288
1233
5d66713e97e2 correct the custom coding mode alphabet, add some validation on the
tmmm
parents: 1230
diff changeset
1289 /* unpack the group 4 AC coefficients (coeffs 28-63) */
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1290 for (i = 28; i <= 63; i++) {
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 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
1293 i, ac_y_table);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1294 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
1295 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
1296
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1297 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
1298 i, ac_c_table);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1299 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
1300 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
1301 }
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1302
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1303 return 0;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1304 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1305
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1306 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1307 * This function reverses the DC prediction for each coded fragment in
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1308 * the frame. Much of this function is adapted directly from the original
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1309 * VP3 source code.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1310 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1311 #define COMPATIBLE_FRAME(x) \
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1312 (compatible_frame[s->all_fragments[x].coding_method] == current_frame_type)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1313 #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
1314 #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
1315
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1316 static void reverse_dc_prediction(Vp3DecodeContext *s,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1317 int first_fragment,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1318 int fragment_width,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1319 int fragment_height)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1320 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1321
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1322 #define PUL 8
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1323 #define PU 4
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1324 #define PUR 2
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1325 #define PL 1
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 int x, y;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1328 int i = first_fragment;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1329
3940
706df96b36a1 fix decoding of ED-small-sample-file.ogg
michael
parents: 3920
diff changeset
1330 int predicted_dc;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1331
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1332 /* 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
1333 int vl, vul, vu, vur;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1334
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1335 /* indices for the left, up-left, up, and up-right fragments */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1336 int l, ul, u, ur;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1337
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1338 /*
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1339 * The 6 fields mean:
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1340 * 0: up-left multiplier
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1341 * 1: up multiplier
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1342 * 2: up-right multiplier
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1343 * 3: left multiplier
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1344 */
3501
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1345 int predictor_transform[16][4] = {
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1346 { 0, 0, 0, 0},
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1347 { 0, 0, 0,128}, // PL
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1348 { 0, 0,128, 0}, // PUR
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1349 { 0, 0, 53, 75}, // PUR|PL
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1350 { 0,128, 0, 0}, // PU
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1351 { 0, 64, 0, 64}, // PU|PL
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1352 { 0,128, 0, 0}, // PU|PUR
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1353 { 0, 0, 53, 75}, // PU|PUR|PL
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1354 {128, 0, 0, 0}, // PUL
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1355 { 0, 0, 0,128}, // PUL|PL
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1356 { 64, 0, 64, 0}, // PUL|PUR
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1357 { 0, 0, 53, 75}, // PUL|PUR|PL
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1358 { 0,128, 0, 0}, // PUL|PU
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1359 {-104,116, 0,116}, // PUL|PU|PL
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1360 { 24, 80, 24, 0}, // PUL|PU|PUR
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1361 {-104,116, 0,116} // PUL|PU|PUR|PL
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1362 };
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1363
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1364 /* 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
1365 * 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
1366 * have a frame number of 0. That means INTRA blocks can only predict
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1367 * from other INTRA blocks. There are 2 golden frame coding types;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1368 * blocks encoding in these modes can only predict from other blocks
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1369 * that were encoded with these 1 of these 2 modes. */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1370 unsigned char compatible_frame[8] = {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1371 1, /* MODE_INTER_NO_MV */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1372 0, /* MODE_INTRA */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1373 1, /* MODE_INTER_PLUS_MV */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1374 1, /* MODE_INTER_LAST_MV */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1375 1, /* MODE_INTER_PRIOR_MV */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1376 2, /* MODE_USING_GOLDEN */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1377 2, /* MODE_GOLDEN_MV */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1378 1 /* MODE_INTER_FOUR_MV */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1379 };
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1380 int current_frame_type;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1381
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1382 /* 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
1383 short last_dc[3];
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1384
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1385 int transform = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1386
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1387 debug_vp3(" vp3: reversing DC prediction\n");
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 vul = vu = vur = vl = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1390 last_dc[0] = last_dc[1] = last_dc[2] = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1391
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1392 /* for each fragment row... */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1393 for (y = 0; y < fragment_height; y++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1394
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1395 /* for each fragment in a row... */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1396 for (x = 0; x < fragment_width; x++, i++) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1397
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1398 /* reverse prediction if this block was coded */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1399 if (s->all_fragments[i].coding_method != MODE_COPY) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1400
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1401 current_frame_type =
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1402 compatible_frame[s->all_fragments[i].coding_method];
3501
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1403 debug_dc_pred(" frag %d: orig DC = %d, ",
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1404 i, DC_COEFF(i));
3500
2ff5efa33e3a simplification
michael
parents: 3499
diff changeset
1405
2ff5efa33e3a simplification
michael
parents: 3499
diff changeset
1406 transform= 0;
2ff5efa33e3a simplification
michael
parents: 3499
diff changeset
1407 if(x){
2ff5efa33e3a simplification
michael
parents: 3499
diff changeset
1408 l= i-1;
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
1409 vl = DC_COEFF(l);
3501
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1410 if(FRAME_CODED(l) && COMPATIBLE_FRAME(l))
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1411 transform |= PL;
3500
2ff5efa33e3a simplification
michael
parents: 3499
diff changeset
1412 }
2ff5efa33e3a simplification
michael
parents: 3499
diff changeset
1413 if(y){
2ff5efa33e3a simplification
michael
parents: 3499
diff changeset
1414 u= i-fragment_width;
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
1415 vu = DC_COEFF(u);
3501
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1416 if(FRAME_CODED(u) && COMPATIBLE_FRAME(u))
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1417 transform |= PU;
3500
2ff5efa33e3a simplification
michael
parents: 3499
diff changeset
1418 if(x){
2ff5efa33e3a simplification
michael
parents: 3499
diff changeset
1419 ul= i-fragment_width-1;
2ff5efa33e3a simplification
michael
parents: 3499
diff changeset
1420 vul = DC_COEFF(ul);
3501
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1421 if(FRAME_CODED(ul) && COMPATIBLE_FRAME(ul))
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1422 transform |= PUL;
3500
2ff5efa33e3a simplification
michael
parents: 3499
diff changeset
1423 }
2ff5efa33e3a simplification
michael
parents: 3499
diff changeset
1424 if(x + 1 < fragment_width){
2ff5efa33e3a simplification
michael
parents: 3499
diff changeset
1425 ur= i-fragment_width+1;
2ff5efa33e3a simplification
michael
parents: 3499
diff changeset
1426 vur = DC_COEFF(ur);
3501
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1427 if(FRAME_CODED(ur) && COMPATIBLE_FRAME(ur))
f77ee674da6f more simplifications
michael
parents: 3500
diff changeset
1428 transform |= PUR;
3500
2ff5efa33e3a simplification
michael
parents: 3499
diff changeset
1429 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1430 }
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 debug_dc_pred("transform = %d, ", transform);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1433
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1434 if (transform == 0) {
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 /* if there were no fragments to predict from, use last
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1437 * 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
1438 predicted_dc = last_dc[current_frame_type];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1439 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
1440 current_frame_type, DC_COEFF(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 } else {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1443
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1444 /* apply the appropriate predictor transform */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1445 predicted_dc =
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1446 (predictor_transform[transform][0] * vul) +
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1447 (predictor_transform[transform][1] * vu) +
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1448 (predictor_transform[transform][2] * vur) +
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1449 (predictor_transform[transform][3] * vl);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1450
3502
47c9a225c4d4 simplify
michael
parents: 3501
diff changeset
1451 predicted_dc /= 128;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1452
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1453 /* check for outranging on the [ul u l] and
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1454 * [ul u ur l] predictors */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1455 if ((transform == 13) || (transform == 15)) {
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1456 if (FFABS(predicted_dc - vu) > 128)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1457 predicted_dc = vu;
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1458 else if (FFABS(predicted_dc - vl) > 128)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1459 predicted_dc = vl;
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1460 else if (FFABS(predicted_dc - vul) > 128)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1461 predicted_dc = vul;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1462 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1463
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1464 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
1465 DC_COEFF(i));
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1466 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1467
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
1468 /* 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
1469 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
1470 *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
1471 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
1472 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
1473 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
1474 }
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
1475 s->coeffs[i].coeff += predicted_dc;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1476 /* 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
1477 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
1478 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
1479 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
1480 // 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
1481 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
1482 (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
1483 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1484 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1485 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1486 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1487 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1488
2723
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
1489
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
1490 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
1491 int *bounding_values);
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
1492 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
1493 int *bounding_values);
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
1494
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1495 /*
2722
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1496 * Perform the final rendering for a particular slice of data.
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1497 * The slice number ranges from 0..(macroblock_height - 1).
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1498 */
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1499 static void render_slice(Vp3DecodeContext *s, int slice)
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1500 {
3498
4b040103da35 simplify
michael
parents: 3497
diff changeset
1501 int x;
2722
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1502 int m, n;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1503 int16_t *dequantizer;
3089
072dbc669253 MSVC-compatible __align8/__align16 declaration
diego
parents: 3036
diff changeset
1504 DECLARE_ALIGNED_16(DCTELEM, block[64]);
2722
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1505 int motion_x = 0xdeadbeef, motion_y = 0xdeadbeef;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1506 int motion_halfpel_index;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1507 uint8_t *motion_source;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1508 int plane;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1509 int current_macroblock_entry = slice * s->macroblock_width * 6;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1510
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1511 if (slice >= s->macroblock_height)
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1512 return;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1513
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1514 for (plane = 0; plane < 3; plane++) {
3498
4b040103da35 simplify
michael
parents: 3497
diff changeset
1515 uint8_t *output_plane = s->current_frame.data [plane];
4b040103da35 simplify
michael
parents: 3497
diff changeset
1516 uint8_t * last_plane = s-> last_frame.data [plane];
4b040103da35 simplify
michael
parents: 3497
diff changeset
1517 uint8_t *golden_plane = s-> golden_frame.data [plane];
4b040103da35 simplify
michael
parents: 3497
diff changeset
1518 int stride = s->current_frame.linesize[plane];
4b040103da35 simplify
michael
parents: 3497
diff changeset
1519 int plane_width = s->width >> !!plane;
4b040103da35 simplify
michael
parents: 3497
diff changeset
1520 int plane_height = s->height >> !!plane;
4b040103da35 simplify
michael
parents: 3497
diff changeset
1521 int y = slice * FRAGMENT_PIXELS << !plane ;
4b040103da35 simplify
michael
parents: 3497
diff changeset
1522 int slice_height = y + (FRAGMENT_PIXELS << !plane);
4b040103da35 simplify
michael
parents: 3497
diff changeset
1523 int i = s->macroblock_fragments[current_macroblock_entry + plane + 3*!!plane];
4b040103da35 simplify
michael
parents: 3497
diff changeset
1524
4b040103da35 simplify
michael
parents: 3497
diff changeset
1525 if (!s->flipped_image) stride = -stride;
4b040103da35 simplify
michael
parents: 3497
diff changeset
1526
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1527
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1528 if(FFABS(stride) > 2048)
2722
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1529 return; //various tables are fixed size
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1530
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1531 /* for each fragment row in the slice (both of them)... */
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1532 for (; y < slice_height; y += 8) {
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1533
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1534 /* for each fragment in a row... */
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1535 for (x = 0; x < plane_width; x += 8, i++) {
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1536
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1537 if ((i < 0) || (i >= s->fragment_count)) {
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1538 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
1539 return;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1540 }
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1541
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1542 /* transform if this block was coded */
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1543 if ((s->all_fragments[i].coding_method != MODE_COPY) &&
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1544 !((s->avctx->flags & CODEC_FLAG_GRAY) && plane)) {
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1545
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1546 if ((s->all_fragments[i].coding_method == MODE_USING_GOLDEN) ||
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1547 (s->all_fragments[i].coding_method == MODE_GOLDEN_MV))
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1548 motion_source= golden_plane;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1549 else
2722
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1550 motion_source= last_plane;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1551
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1552 motion_source += s->all_fragments[i].first_pixel;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1553 motion_halfpel_index = 0;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1554
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1555 /* sort out the motion vector if this fragment is coded
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1556 * using a motion vector method */
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1557 if ((s->all_fragments[i].coding_method > MODE_INTRA) &&
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1558 (s->all_fragments[i].coding_method != MODE_USING_GOLDEN)) {
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1559 int src_x, src_y;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1560 motion_x = s->all_fragments[i].motion_x;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1561 motion_y = s->all_fragments[i].motion_y;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1562 if(plane){
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1563 motion_x= (motion_x>>1) | (motion_x&1);
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1564 motion_y= (motion_y>>1) | (motion_y&1);
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1565 }
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1566
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1567 src_x= (motion_x>>1) + x;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1568 src_y= (motion_y>>1) + y;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1569 if ((motion_x == 127) || (motion_y == 127))
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1570 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
1571
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1572 motion_halfpel_index = motion_x & 0x01;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1573 motion_source += (motion_x >> 1);
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1574
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1575 motion_halfpel_index |= (motion_y & 0x01) << 1;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1576 motion_source += ((motion_y >> 1) * stride);
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1577
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1578 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
1579 uint8_t *temp= s->edge_emu_buffer;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1580 if(stride<0) temp -= 9*stride;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1581 else temp += 9*stride;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1582
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1583 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
1584 motion_source= temp;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1585 }
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1586 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1587
2722
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1588
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1589 /* first, take care of copying a block from either the
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1590 * previous or the golden frame */
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1591 if (s->all_fragments[i].coding_method != MODE_INTRA) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1592 /* Note, it is possible to implement all MC cases with
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1593 put_no_rnd_pixels_l2 which would look more like the
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1594 VP3 source but this would be slower as
2722
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1595 put_no_rnd_pixels_tab is better optimzed */
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1596 if(motion_halfpel_index != 3){
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1597 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
1598 output_plane + s->all_fragments[i].first_pixel,
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1599 motion_source, stride, 8);
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1600 }else{
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1601 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
1602 s->dsp.put_no_rnd_pixels_l2[1](
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1603 output_plane + s->all_fragments[i].first_pixel,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1604 motion_source - d,
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1605 motion_source + stride + 1 + d,
2722
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1606 stride, 8);
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1607 }
3488
a647bf3a7fa8 replace *_dequant (2 intra, 1 inter) by qmat (3 intra, 3 inter) (needed for theora according to spec)
michael
parents: 3487
diff changeset
1608 dequantizer = s->qmat[1][plane];
2722
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1609 }else{
3488
a647bf3a7fa8 replace *_dequant (2 intra, 1 inter) by qmat (3 intra, 3 inter) (needed for theora according to spec)
michael
parents: 3487
diff changeset
1610 dequantizer = s->qmat[0][plane];
2722
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1611 }
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1612
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1613 /* dequantize the DCT coefficients */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1614 debug_idct("fragment %d, coding mode %d, DC = %d, dequant = %d:\n",
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1615 i, s->all_fragments[i].coding_method,
2722
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1616 DC_COEFF(i), dequantizer[0]);
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1617
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1618 if(s->avctx->idct_algo==FF_IDCT_VP3){
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1619 Coeff *coeff= s->coeffs + i;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1620 memset(block, 0, sizeof(block));
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1621 while(coeff->next){
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1622 block[coeff->index]= coeff->coeff * dequantizer[coeff->index];
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1623 coeff= coeff->next;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1624 }
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1625 }else{
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1626 Coeff *coeff= s->coeffs + i;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1627 memset(block, 0, sizeof(block));
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1628 while(coeff->next){
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1629 block[coeff->index]= (coeff->coeff * dequantizer[coeff->index] + 2)>>2;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1630 coeff= coeff->next;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1631 }
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1632 }
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1633
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1634 /* invert DCT and place (or add) in final output */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1635
2722
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1636 if (s->all_fragments[i].coding_method == MODE_INTRA) {
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1637 if(s->avctx->idct_algo!=FF_IDCT_VP3)
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1638 block[0] += 128<<3;
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1639 s->dsp.idct_put(
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1640 output_plane + s->all_fragments[i].first_pixel,
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1641 stride,
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1642 block);
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1643 } else {
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1644 s->dsp.idct_add(
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1645 output_plane + s->all_fragments[i].first_pixel,
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1646 stride,
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1647 block);
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1648 }
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1649
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1650 debug_idct("block after idct_%s():\n",
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1651 (s->all_fragments[i].coding_method == MODE_INTRA)?
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1652 "put" : "add");
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1653 for (m = 0; m < 8; m++) {
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1654 for (n = 0; n < 8; n++) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1655 debug_idct(" %3d", *(output_plane +
2722
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1656 s->all_fragments[i].first_pixel + (m * stride + n)));
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1657 }
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1658 debug_idct("\n");
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1659 }
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1660 debug_idct("\n");
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1661
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1662 } else {
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1663
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1664 /* copy directly from the previous frame */
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1665 s->dsp.put_pixels_tab[1][0](
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1666 output_plane + s->all_fragments[i].first_pixel,
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1667 last_plane + s->all_fragments[i].first_pixel,
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1668 stride, 8);
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1669
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1670 }
2724
546993e42dbc disable broken loop filter optimization
michael
parents: 2723
diff changeset
1671 #if 0
2726
77ba1f653619 fix bugs in new loop filter code; also, refrain from filtering against
melanson
parents: 2724
diff changeset
1672 /* perform the left edge filter if:
77ba1f653619 fix bugs in new loop filter code; also, refrain from filtering against
melanson
parents: 2724
diff changeset
1673 * - 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
1674 * - 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
1675 * - 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
1676 * 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
1677 * 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
1678 * 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
1679 if ((x > 0) &&
2726
77ba1f653619 fix bugs in new loop filter code; also, refrain from filtering against
melanson
parents: 2724
diff changeset
1680 ((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
1681 ((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
1682 (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
1683 horizontal_filter(
2726
77ba1f653619 fix bugs in new loop filter code; also, refrain from filtering against
melanson
parents: 2724
diff changeset
1684 output_plane + s->all_fragments[i].first_pixel + 7*stride,
3497
3a7844f83df4 fix loop filter
michael
parents: 3492
diff changeset
1685 -stride, s->bounding_values_array + 127);
2723
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
1686 }
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
1687
2726
77ba1f653619 fix bugs in new loop filter code; also, refrain from filtering against
melanson
parents: 2724
diff changeset
1688 /* perform the top edge filter if:
77ba1f653619 fix bugs in new loop filter code; also, refrain from filtering against
melanson
parents: 2724
diff changeset
1689 * - 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
1690 * - 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
1691 * - 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
1692 * 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
1693 * 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
1694 * 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
1695 if ((y > 0) &&
77ba1f653619 fix bugs in new loop filter code; also, refrain from filtering against
melanson
parents: 2724
diff changeset
1696 ((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
1697 ((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
1698 (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
1699 vertical_filter(
2726
77ba1f653619 fix bugs in new loop filter code; also, refrain from filtering against
melanson
parents: 2724
diff changeset
1700 output_plane + s->all_fragments[i].first_pixel - stride,
3497
3a7844f83df4 fix loop filter
michael
parents: 3492
diff changeset
1701 -stride, s->bounding_values_array + 127);
2723
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
1702 }
2724
546993e42dbc disable broken loop filter optimization
michael
parents: 2723
diff changeset
1703 #endif
2722
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1704 }
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1705 }
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1706 }
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1707
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1708 /* this looks like a good place for slice dispatch... */
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1709 /* algorithm:
2723
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
1710 * 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
1711 * 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
1712 * else if (slice > 0)
2722
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1713 * dispatch (slice - 1);
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1714 */
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1715
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1716 emms_c();
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1717 }
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
1718
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1719 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
1720 int *bounding_values)
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1721 {
2699
1b4a3c083f9d some optimizations gcc should have done (10% faster loop filter)
michael
parents: 2698
diff changeset
1722 unsigned char *end;
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1723 int filter_value;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1724
3497
3a7844f83df4 fix loop filter
michael
parents: 3492
diff changeset
1725 for (end= first_pixel + 8*stride; first_pixel != end; first_pixel += stride) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1726 filter_value =
2699
1b4a3c083f9d some optimizations gcc should have done (10% faster loop filter)
michael
parents: 2698
diff changeset
1727 (first_pixel[-2] - first_pixel[ 1])
1b4a3c083f9d some optimizations gcc should have done (10% faster loop filter)
michael
parents: 2698
diff changeset
1728 +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
1729 filter_value = bounding_values[(filter_value + 4) >> 3];
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4561
diff changeset
1730 first_pixel[-1] = av_clip_uint8(first_pixel[-1] + filter_value);
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4561
diff changeset
1731 first_pixel[ 0] = av_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
1732 }
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1733 }
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1734
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1735 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
1736 int *bounding_values)
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1737 {
2699
1b4a3c083f9d some optimizations gcc should have done (10% faster loop filter)
michael
parents: 2698
diff changeset
1738 unsigned char *end;
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1739 int filter_value;
2699
1b4a3c083f9d some optimizations gcc should have done (10% faster loop filter)
michael
parents: 2698
diff changeset
1740 const int nstride= -stride;
1b4a3c083f9d some optimizations gcc should have done (10% faster loop filter)
michael
parents: 2698
diff changeset
1741
1b4a3c083f9d some optimizations gcc should have done (10% faster loop filter)
michael
parents: 2698
diff changeset
1742 for (end= first_pixel + 8; first_pixel < end; first_pixel++) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1743 filter_value =
2699
1b4a3c083f9d some optimizations gcc should have done (10% faster loop filter)
michael
parents: 2698
diff changeset
1744 (first_pixel[2 * nstride] - first_pixel[ stride])
1b4a3c083f9d some optimizations gcc should have done (10% faster loop filter)
michael
parents: 2698
diff changeset
1745 +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
1746 filter_value = bounding_values[(filter_value + 4) >> 3];
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4561
diff changeset
1747 first_pixel[nstride] = av_clip_uint8(first_pixel[nstride] + filter_value);
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4561
diff changeset
1748 first_pixel[0] = av_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
1749 }
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1750 }
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1751
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1752 static void apply_loop_filter(Vp3DecodeContext *s)
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1753 {
3498
4b040103da35 simplify
michael
parents: 3497
diff changeset
1754 int plane;
4b040103da35 simplify
michael
parents: 3497
diff changeset
1755 int x, y;
2723
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
1756 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
1757
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
1758 #if 0
2686
979a847cb943 various 10l fixes for the loop filter
michael
parents: 2684
diff changeset
1759 int bounding_values_array[256];
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1760 int filter_limit;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1761
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1762 /* find the right loop limit value */
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1763 for (x = 63; x >= 0; x--) {
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1764 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
1765 break;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1766 }
2686
979a847cb943 various 10l fixes for the loop filter
michael
parents: 2684
diff changeset
1767 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
1768
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1769 /* set up the bounding values */
2686
979a847cb943 various 10l fixes for the loop filter
michael
parents: 2684
diff changeset
1770 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
1771 for (x = 0; x < filter_limit; x++) {
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1772 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
1773 bounding_values[-x] = -x;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1774 bounding_values[x] = x;
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1775 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
1776 }
2723
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
1777 #endif
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1778
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1779 for (plane = 0; plane < 3; plane++) {
3498
4b040103da35 simplify
michael
parents: 3497
diff changeset
1780 int width = s->fragment_width >> !!plane;
4b040103da35 simplify
michael
parents: 3497
diff changeset
1781 int height = s->fragment_height >> !!plane;
4b040103da35 simplify
michael
parents: 3497
diff changeset
1782 int fragment = s->fragment_start [plane];
4b040103da35 simplify
michael
parents: 3497
diff changeset
1783 int stride = s->current_frame.linesize[plane];
4b040103da35 simplify
michael
parents: 3497
diff changeset
1784 uint8_t *plane_data = s->current_frame.data [plane];
3497
3a7844f83df4 fix loop filter
michael
parents: 3492
diff changeset
1785 if (!s->flipped_image) stride = -stride;
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1786
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1787 for (y = 0; y < height; y++) {
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1788
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1789 for (x = 0; x < width; x++) {
2687
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
1790 START_TIMER
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1791 /* 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
1792 if ((x > 0) &&
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1793 (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
1794 horizontal_filter(
3497
3a7844f83df4 fix loop filter
michael
parents: 3492
diff changeset
1795 plane_data + s->all_fragments[fragment].first_pixel,
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1796 stride, bounding_values);
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1797 }
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1798
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1799 /* 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
1800 if ((y > 0) &&
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1801 (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
1802 vertical_filter(
3497
3a7844f83df4 fix loop filter
michael
parents: 3492
diff changeset
1803 plane_data + s->all_fragments[fragment].first_pixel,
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1804 stride, bounding_values);
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1805 }
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1806
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1807 /* 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
1808 * 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
1809 * 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
1810 if ((x < width - 1) &&
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1811 (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
1812 (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
1813 horizontal_filter(
3497
3a7844f83df4 fix loop filter
michael
parents: 3492
diff changeset
1814 plane_data + s->all_fragments[fragment + 1].first_pixel,
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1815 stride, bounding_values);
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1816 }
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1817
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1818 /* 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
1819 * 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
1820 * 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
1821 if ((y < height - 1) &&
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1822 (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
1823 (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
1824 vertical_filter(
3497
3a7844f83df4 fix loop filter
michael
parents: 3492
diff changeset
1825 plane_data + s->all_fragments[fragment + width].first_pixel,
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1826 stride, bounding_values);
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1827 }
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1828
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1829 fragment++;
2687
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
1830 STOP_TIMER("loop filter")
2531
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1831 }
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1832 }
eed7d92a1dfc VP3 post-processing loop filter; disabled until the correct final step
melanson
parents: 2466
diff changeset
1833 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1834 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1835
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1836 /*
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1837 * This function computes the first pixel addresses for each fragment.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1838 * 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
1839 * so that it has access to the plane strides.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1840 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1841 static void vp3_calculate_pixel_addresses(Vp3DecodeContext *s)
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1842 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1843
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1844 int i, x, y;
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 /* figure out the first pixel addresses for each of the fragments */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1847 /* Y plane */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1848 i = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1849 for (y = s->fragment_height; y > 0; y--) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1850 for (x = 0; x < s->fragment_width; x++) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1851 s->all_fragments[i++].first_pixel =
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1852 s->golden_frame.linesize[0] * y * FRAGMENT_PIXELS -
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1853 s->golden_frame.linesize[0] +
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1854 x * FRAGMENT_PIXELS;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1855 debug_init(" fragment %d, first pixel @ %d\n",
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1856 i-1, s->all_fragments[i-1].first_pixel);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1857 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1858 }
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 /* U plane */
3498
4b040103da35 simplify
michael
parents: 3497
diff changeset
1861 i = s->fragment_start[1];
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1862 for (y = s->fragment_height / 2; y > 0; y--) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1863 for (x = 0; x < s->fragment_width / 2; x++) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1864 s->all_fragments[i++].first_pixel =
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1865 s->golden_frame.linesize[1] * y * FRAGMENT_PIXELS -
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1866 s->golden_frame.linesize[1] +
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1867 x * FRAGMENT_PIXELS;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1868 debug_init(" fragment %d, first pixel @ %d\n",
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1869 i-1, s->all_fragments[i-1].first_pixel);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1870 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1871 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1872
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1873 /* V plane */
3498
4b040103da35 simplify
michael
parents: 3497
diff changeset
1874 i = s->fragment_start[2];
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1875 for (y = s->fragment_height / 2; y > 0; y--) {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1876 for (x = 0; x < s->fragment_width / 2; x++) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1877 s->all_fragments[i++].first_pixel =
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1878 s->golden_frame.linesize[2] * y * FRAGMENT_PIXELS -
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1879 s->golden_frame.linesize[2] +
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1880 x * FRAGMENT_PIXELS;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1881 debug_init(" fragment %d, first pixel @ %d\n",
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1882 i-1, s->all_fragments[i-1].first_pixel);
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 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1885 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1886
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
1887 /* FIXME: this should be merged with the above! */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1888 static void theora_calculate_pixel_addresses(Vp3DecodeContext *s)
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
1889 {
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
1890
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
1891 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
1892
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
1893 /* 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
1894 /* 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
1895 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
1896 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
1897 for (x = 0; x < s->fragment_width; x++) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1898 s->all_fragments[i++].first_pixel =
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
1899 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
1900 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
1901 x * FRAGMENT_PIXELS;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1902 debug_init(" fragment %d, first pixel @ %d\n",
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
1903 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
1904 }
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
1905 }
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
1906
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
1907 /* U plane */
3498
4b040103da35 simplify
michael
parents: 3497
diff changeset
1908 i = s->fragment_start[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
1909 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
1910 for (x = 0; x < s->fragment_width / 2; x++) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1911 s->all_fragments[i++].first_pixel =
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
1912 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
1913 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
1914 x * FRAGMENT_PIXELS;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1915 debug_init(" fragment %d, first pixel @ %d\n",
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
1916 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
1917 }
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
1918 }
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
1919
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
1920 /* V plane */
3498
4b040103da35 simplify
michael
parents: 3497
diff changeset
1921 i = s->fragment_start[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
1922 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
1923 for (x = 0; x < s->fragment_width / 2; x++) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1924 s->all_fragments[i++].first_pixel =
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
1925 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
1926 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
1927 x * FRAGMENT_PIXELS;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1928 debug_init(" fragment %d, first pixel @ %d\n",
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
1929 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
1930 }
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
1931 }
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
1932 }
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
1933
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1934 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1935 * This is the ffmpeg/libavcodec API init function.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1936 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1937 static int vp3_decode_init(AVCodecContext *avctx)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1938 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1939 Vp3DecodeContext *s = avctx->priv_data;
3489
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
1940 int i, inter, plane;
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1941 int c_width;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1942 int c_height;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1943 int y_superblock_count;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1944 int c_superblock_count;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1945
1664
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
1946 if (avctx->codec_tag == MKTAG('V','P','3','0'))
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1947 s->version = 0;
1664
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
1948 else
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1949 s->version = 1;
1664
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
1950
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1951 s->avctx = avctx;
1292
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
1952 s->width = (avctx->width + 15) & 0xFFFFFFF0;
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
1953 s->height = (avctx->height + 15) & 0xFFFFFFF0;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1954 avctx->pix_fmt = PIX_FMT_YUV420P;
2693
02925a3903b6 porting vp3 idct over to lavc idct api
michael
parents: 2692
diff changeset
1955 if(avctx->idct_algo==FF_IDCT_AUTO)
02925a3903b6 porting vp3 idct over to lavc idct api
michael
parents: 2692
diff changeset
1956 avctx->idct_algo=FF_IDCT_VP3;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1957 dsputil_init(&s->dsp, avctx);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1958
2694
0d229cf036b9 fix idct permutation
michael
parents: 2693
diff changeset
1959 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
1960
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1961 /* initialize to an impossible value which will force a recalculation
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1962 * in the first frame decode */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1963 s->quality_index = -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1964
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1965 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
1966 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
1967 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
1968
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1969 /* 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
1970 c_width = s->width / 2;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1971 c_height = s->height / 2;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1972 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
1973 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
1974 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
1975
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1976 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
1977 s->u_superblock_start = y_superblock_count;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1978 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
1979 s->superblock_coding = av_malloc(s->superblock_count);
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 s->macroblock_width = (s->width + 15) / 16;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1982 s->macroblock_height = (s->height + 15) / 16;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1983 s->macroblock_count = s->macroblock_width * s->macroblock_height;
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 s->fragment_width = s->width / FRAGMENT_PIXELS;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1986 s->fragment_height = s->height / FRAGMENT_PIXELS;
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 /* fragment count covers all 8x8 blocks for all 3 planes */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1989 s->fragment_count = s->fragment_width * s->fragment_height * 3 / 2;
3498
4b040103da35 simplify
michael
parents: 3497
diff changeset
1990 s->fragment_start[1] = s->fragment_width * s->fragment_height;
4b040103da35 simplify
michael
parents: 3497
diff changeset
1991 s->fragment_start[2] = s->fragment_width * s->fragment_height * 5 / 4;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
1992
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
1993 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
1994 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
1995 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
1996 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
1997 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
1998 s->c_superblock_width, s->c_superblock_height, c_superblock_count);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
1999 debug_init(" total superblocks = %d, U starts @ %d, V starts @ %d\n",
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2000 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
2001 debug_init(" macroblocks: %d x %d, %d total\n",
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2002 s->macroblock_width, s->macroblock_height, s->macroblock_count);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2003 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
2004 s->fragment_count,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2005 s->fragment_width,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2006 s->fragment_height,
3498
4b040103da35 simplify
michael
parents: 3497
diff changeset
2007 s->fragment_start[1],
4b040103da35 simplify
michael
parents: 3497
diff changeset
2008 s->fragment_start[2]);
1224
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 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
2011 s->coeffs = av_malloc(s->fragment_count * sizeof(Coeff) * 65);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2012 s->coded_fragment_list = av_malloc(s->fragment_count * sizeof(int));
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2013 s->pixel_addresses_inited = 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2014
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
2015 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
2016 {
3585
6506f95498dc cleanup
michael
parents: 3512
diff changeset
2017 for (i = 0; i < 64; i++) {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2018 s->coded_dc_scale_factor[i] = vp31_dc_scale_factor[i];
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2019 s->coded_ac_scale_factor[i] = vp31_ac_scale_factor[i];
3489
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2020 s->base_matrix[0][i] = vp31_intra_y_dequant[i];
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2021 s->base_matrix[1][i] = vp31_intra_c_dequant[i];
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2022 s->base_matrix[2][i] = vp31_inter_dequant[i];
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2023 s->filter_limit_values[i] = vp31_filter_limit_values[i];
3585
6506f95498dc cleanup
michael
parents: 3512
diff changeset
2024 }
2718
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2025
3489
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2026 for(inter=0; inter<2; inter++){
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2027 for(plane=0; plane<3; plane++){
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2028 s->qr_count[inter][plane]= 1;
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2029 s->qr_size [inter][plane][0]= 63;
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2030 s->qr_base [inter][plane][0]=
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2031 s->qr_base [inter][plane][1]= 2*inter + (!!plane)*!inter;
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2032 }
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2033 }
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2034
2718
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2035 /* init VLC tables */
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2036 for (i = 0; i < 16; i++) {
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2037
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2038 /* DC histograms */
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2039 init_vlc(&s->dc_vlc[i], 5, 32,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2040 &dc_bias[i][0][1], 4, 2,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2041 &dc_bias[i][0][0], 4, 2, 0);
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2042
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2043 /* group 1 AC histograms */
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2044 init_vlc(&s->ac_vlc_1[i], 5, 32,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2045 &ac_bias_0[i][0][1], 4, 2,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2046 &ac_bias_0[i][0][0], 4, 2, 0);
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2047
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2048 /* group 2 AC histograms */
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2049 init_vlc(&s->ac_vlc_2[i], 5, 32,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2050 &ac_bias_1[i][0][1], 4, 2,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2051 &ac_bias_1[i][0][0], 4, 2, 0);
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2052
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2053 /* group 3 AC histograms */
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2054 init_vlc(&s->ac_vlc_3[i], 5, 32,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2055 &ac_bias_2[i][0][1], 4, 2,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2056 &ac_bias_2[i][0][0], 4, 2, 0);
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2057
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2058 /* group 4 AC histograms */
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2059 init_vlc(&s->ac_vlc_4[i], 5, 32,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2060 &ac_bias_3[i][0][1], 4, 2,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2061 &ac_bias_3[i][0][0], 4, 2, 0);
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2062 }
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2063 } else {
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2064 for (i = 0; i < 16; i++) {
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2065
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2066 /* DC histograms */
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2067 init_vlc(&s->dc_vlc[i], 5, 32,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2068 &s->huffman_table[i][0][1], 4, 2,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2069 &s->huffman_table[i][0][0], 4, 2, 0);
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2070
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2071 /* group 1 AC histograms */
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2072 init_vlc(&s->ac_vlc_1[i], 5, 32,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2073 &s->huffman_table[i+16][0][1], 4, 2,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2074 &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
2075
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2076 /* group 2 AC histograms */
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2077 init_vlc(&s->ac_vlc_2[i], 5, 32,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2078 &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
2079 &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
2080
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2081 /* group 3 AC histograms */
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2082 init_vlc(&s->ac_vlc_3[i], 5, 32,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2083 &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
2084 &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
2085
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2086 /* group 4 AC histograms */
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2087 init_vlc(&s->ac_vlc_4[i], 5, 32,
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2088 &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
2089 &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
2090 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2091 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2092
2703
3817945001ce replace get_superblock_run_length() with a VLC table
melanson
parents: 2702
diff changeset
2093 init_vlc(&s->superblock_run_length_vlc, 6, 34,
3817945001ce replace get_superblock_run_length() with a VLC table
melanson
parents: 2702
diff changeset
2094 &superblock_run_length_vlc_table[0][1], 4, 2,
3817945001ce replace get_superblock_run_length() with a VLC table
melanson
parents: 2702
diff changeset
2095 &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
2096
2942
868c48736d1c fixed long standing off-by-one bug (fixes playback on ppc)
alex
parents: 2866
diff changeset
2097 init_vlc(&s->fragment_run_length_vlc, 5, 30,
2702
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
2098 &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
2099 &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
2100
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
2101 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
2102 &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
2103 &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
2104
5a4e5225cbb6 use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents: 2699
diff changeset
2105 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
2106 &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
2107 &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
2108
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2109 /* work out the block mapping tables */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2110 s->superblock_fragments = av_malloc(s->superblock_count * 16 * sizeof(int));
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2111 s->superblock_macroblocks = av_malloc(s->superblock_count * 4 * sizeof(int));
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2112 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
2113 s->macroblock_coding = av_malloc(s->macroblock_count + 1);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2114 init_block_mapping(s);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2115
1229
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2116 for (i = 0; i < 3; i++) {
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2117 s->current_frame.data[i] = NULL;
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2118 s->last_frame.data[i] = NULL;
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2119 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
2120 }
184c480cefc3 fix decoder so that ffmpeg does not crash, at least not right away
tmmm
parents: 1224
diff changeset
2121
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2122 return 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2123 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2124
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2125 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2126 * This is the ffmpeg/libavcodec API frame decode function.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2127 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
2128 static int vp3_decode_frame(AVCodecContext *avctx,
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2129 void *data, int *data_size,
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2130 uint8_t *buf, int buf_size)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2131 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2132 Vp3DecodeContext *s = avctx->priv_data;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2133 GetBitContext gb;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2134 static int counter = 0;
2722
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
2135 int i;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2136
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2137 init_get_bits(&gb, buf, buf_size * 8);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
2138
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
2139 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
2140 {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2141 av_log(avctx, AV_LOG_ERROR, "Header packet passed to frame decoder, skipping\n");
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2142 return -1;
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
2143 }
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2144
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2145 s->keyframe = !get_bits1(&gb);
1664
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2146 if (!s->theora)
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2147 skip_bits(&gb, 1);
1664
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2148 s->last_quality_index = s->quality_index;
3492
fa3794c46f21 parse all QIS values (we still ignore them though ...)
michael
parents: 3491
diff changeset
2149
fa3794c46f21 parse all QIS values (we still ignore them though ...)
michael
parents: 3491
diff changeset
2150 s->nqis=0;
fa3794c46f21 parse all QIS values (we still ignore them though ...)
michael
parents: 3491
diff changeset
2151 do{
fa3794c46f21 parse all QIS values (we still ignore them though ...)
michael
parents: 3491
diff changeset
2152 s->qis[s->nqis++]= get_bits(&gb, 6);
fa3794c46f21 parse all QIS values (we still ignore them though ...)
michael
parents: 3491
diff changeset
2153 } while(s->theora >= 0x030200 && s->nqis<3 && get_bits1(&gb));
fa3794c46f21 parse all QIS values (we still ignore them though ...)
michael
parents: 3491
diff changeset
2154
fa3794c46f21 parse all QIS values (we still ignore them though ...)
michael
parents: 3491
diff changeset
2155 s->quality_index= s->qis[0];
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2156
1667
720c073661a1 FF_DEBUG_PICT_INFO and CODEC_FLAG_GRAY support
alex
parents: 1664
diff changeset
2157 if (s->avctx->debug & FF_DEBUG_PICT_INFO)
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2158 av_log(s->avctx, AV_LOG_INFO, " VP3 %sframe #%d: Q index = %d\n",
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2159 s->keyframe?"key":"", counter, s->quality_index);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2160 counter++;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2161
2723
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
2162 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
2163 init_dequantizer(s);
2723
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
2164 init_loop_filter(s);
5ae980827158 apply the loop filter to fragments as they are rendered into the final
melanson
parents: 2722
diff changeset
2165 }
1292
f7b3fa4bb7ae revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents: 1282
diff changeset
2166
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2167 if (s->keyframe) {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2168 if (!s->theora)
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2169 {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2170 skip_bits(&gb, 4); /* width code */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2171 skip_bits(&gb, 4); /* height code */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2172 if (s->version)
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2173 {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2174 s->version = get_bits(&gb, 5);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2175 if (counter == 1)
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2176 av_log(s->avctx, AV_LOG_DEBUG, "VP version: %d\n", s->version);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2177 }
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2178 }
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2179 if (s->version || s->theora)
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2180 {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2181 if (get_bits1(&gb))
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2182 av_log(s->avctx, AV_LOG_ERROR, "Warning, unsupported keyframe coding type?!\n");
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2183 skip_bits(&gb, 2); /* reserved? */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2184 }
1664
1c7ded3c2b25 more correct header parsing
alex
parents: 1627
diff changeset
2185
1244
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
2186 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
2187 if (s->golden_frame.data[0])
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
2188 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
2189 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
2190 } else {
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
2191 if (s->golden_frame.data[0])
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
2192 avctx->release_buffer(avctx, &s->golden_frame);
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
2193 if (s->last_frame.data[0])
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
2194 avctx->release_buffer(avctx, &s->last_frame);
a02df1ba6c7f fix image buffer leak on keyframes, add more error condition checks
tmmm
parents: 1240
diff changeset
2195 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2196
1405
e69f99ade5b0 fix AVFrame.reference (the frames are used for decoding future frames so it should be !=0)
michaelni
parents: 1355
diff changeset
2197 s->golden_frame.reference = 3;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2198 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
2199 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
2200 return -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2201 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2202
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2203 /* golden frame is also the current frame */
3486
5ee0e924432f useless memcpy
michael
parents: 3485
diff changeset
2204 s->current_frame= s->golden_frame;
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2205
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2206 /* time to figure out pixel addresses? */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2207 if (!s->pixel_addresses_inited)
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2208 {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2209 if (!s->flipped_image)
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2210 vp3_calculate_pixel_addresses(s);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2211 else
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2212 theora_calculate_pixel_addresses(s);
3512
feace06d4184 Do not crash when the first frame is not a keyframe (and thus none of the
reimar
parents: 3502
diff changeset
2213 s->pixel_addresses_inited = 1;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2214 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2215 } else {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2216 /* 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
2217 s->current_frame.reference = 3;
3512
feace06d4184 Do not crash when the first frame is not a keyframe (and thus none of the
reimar
parents: 3502
diff changeset
2218 if (!s->pixel_addresses_inited) {
feace06d4184 Do not crash when the first frame is not a keyframe (and thus none of the
reimar
parents: 3502
diff changeset
2219 av_log(s->avctx, AV_LOG_ERROR, "vp3: first frame not a keyframe\n");
feace06d4184 Do not crash when the first frame is not a keyframe (and thus none of the
reimar
parents: 3502
diff changeset
2220 return -1;
feace06d4184 Do not crash when the first frame is not a keyframe (and thus none of the
reimar
parents: 3502
diff changeset
2221 }
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2222 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
2223 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
2224 return -1;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2225 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2226 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2227
1407
69f4f4fb8a50 fixing chroma MC
michaelni
parents: 1406
diff changeset
2228 s->current_frame.qscale_table= s->qscale_table; //FIXME allocate individual tables per AVFrame
69f4f4fb8a50 fixing chroma MC
michaelni
parents: 1406
diff changeset
2229 s->current_frame.qstride= 0;
69f4f4fb8a50 fixing chroma MC
michaelni
parents: 1406
diff changeset
2230
2687
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2231 {START_TIMER
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2232 init_frame(s, &gb);
2687
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2233 STOP_TIMER("init_frame")}
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2234
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2235 #if KEYFRAMES_ONLY
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2236 if (!s->keyframe) {
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2237
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2238 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
2239 s->current_frame.linesize[0] * s->height);
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2240 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
2241 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
2242 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
2243 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
2244
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2245 } else {
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2246 #endif
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2247
2687
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2248 {START_TIMER
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2249 if (unpack_superblocks(s, &gb)){
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2250 av_log(s->avctx, AV_LOG_ERROR, "error in unpack_superblocks\n");
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2251 return -1;
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2252 }
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2253 STOP_TIMER("unpack_superblocks")}
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2254 {START_TIMER
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2255 if (unpack_modes(s, &gb)){
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2256 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
2257 return -1;
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2258 }
2687
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2259 STOP_TIMER("unpack_modes")}
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2260 {START_TIMER
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2261 if (unpack_vectors(s, &gb)){
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2262 av_log(s->avctx, AV_LOG_ERROR, "error in unpack_vectors\n");
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2263 return -1;
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2264 }
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2265 STOP_TIMER("unpack_vectors")}
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2266 {START_TIMER
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2267 if (unpack_dct_coeffs(s, &gb)){
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2268 av_log(s->avctx, AV_LOG_ERROR, "error in unpack_dct_coeffs\n");
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2269 return -1;
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2270 }
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2271 STOP_TIMER("unpack_dct_coeffs")}
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2272 {START_TIMER
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2273
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2274 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
2275 if ((avctx->flags & CODEC_FLAG_GRAY) == 0) {
3498
4b040103da35 simplify
michael
parents: 3497
diff changeset
2276 reverse_dc_prediction(s, s->fragment_start[1],
1355
1c05f4290517 added the official VP3 IDCT (C implementation) as well as a grayscale
tmmm
parents: 1292
diff changeset
2277 s->fragment_width / 2, s->fragment_height / 2);
3498
4b040103da35 simplify
michael
parents: 3497
diff changeset
2278 reverse_dc_prediction(s, s->fragment_start[2],
1355
1c05f4290517 added the official VP3 IDCT (C implementation) as well as a grayscale
tmmm
parents: 1292
diff changeset
2279 s->fragment_width / 2, s->fragment_height / 2);
2722
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
2280 }
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
2281 STOP_TIMER("reverse_dc_prediction")}
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
2282 {START_TIMER
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
2283
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
2284 for (i = 0; i < s->macroblock_height; i++)
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
2285 render_slice(s, i);
b552196f4123 render by the slice rather than the plane
melanson
parents: 2721
diff changeset
2286 STOP_TIMER("render_fragments")}
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2287
2687
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2288 {START_TIMER
2724
546993e42dbc disable broken loop filter optimization
michael
parents: 2723
diff changeset
2289 apply_loop_filter(s);
2687
fa86fa423e92 some benchmarking code
michael
parents: 2686
diff changeset
2290 STOP_TIMER("apply_loop_filter")}
1238
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2291 #if KEYFRAMES_ONLY
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2292 }
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2293 #endif
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2294
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2295 *data_size=sizeof(AVFrame);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2296 *(AVFrame*)data= s->current_frame;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2297
1229
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2298 /* 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
2299 * golden frame */
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2300 if ((s->last_frame.data[0]) &&
cefec170ee46 fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents: 1227
diff changeset
2301 (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
2302 avctx->release_buffer(avctx, &s->last_frame);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2303
1227
184c480cefc3 fix decoder so that ffmpeg does not crash, at least not right away
tmmm
parents: 1224
diff changeset
2304 /* shuffle frames (last = current) */
3486
5ee0e924432f useless memcpy
michael
parents: 3485
diff changeset
2305 s->last_frame= s->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
2306 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
2307
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2308 return buf_size;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2309 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2310
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2311 /*
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2312 * This is the ffmpeg/libavcodec API module cleanup function.
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2313 */
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2314 static int vp3_decode_end(AVCodecContext *avctx)
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2315 {
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2316 Vp3DecodeContext *s = avctx->priv_data;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2317
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2318 av_free(s->all_fragments);
2689
ed0ab6f82167 clear blocks after each idct instead of per picture
michael
parents: 2687
diff changeset
2319 av_free(s->coeffs);
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2320 av_free(s->coded_fragment_list);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2321 av_free(s->superblock_fragments);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2322 av_free(s->superblock_macroblocks);
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2323 av_free(s->macroblock_fragments);
1240
c95ff60bc1a1 fix motion vector decoding bug and reinstate interframes
tmmm
parents: 1239
diff changeset
2324 av_free(s->macroblock_coding);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
2325
1224
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2326 /* 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
2327 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
2328 avctx->release_buffer(avctx, &s->golden_frame);
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2329 if (s->last_frame.data[0])
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2330 avctx->release_buffer(avctx, &s->last_frame);
6eab0df78d47 squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents: 1236
diff changeset
2331 /* 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
2332 * 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
2333
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2334 return 0;
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2335 }
3fa9a3de913f first pass at a new VP3 video decoder
tmmm
parents:
diff changeset
2336
2718
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2337 static int read_huffman_tree(AVCodecContext *avctx, GetBitContext *gb)
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2338 {
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2339 Vp3DecodeContext *s = avctx->priv_data;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2340
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2341 if (get_bits(gb, 1)) {
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2342 int token;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2343 if (s->entries >= 32) { /* overflow */
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2344 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
2345 return -1;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2346 }
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2347 token = get_bits(gb, 5);
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2348 //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
2349 s->huffman_table[s->hti][token][0] = s->hbits;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2350 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
2351 s->entries++;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2352 }
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2353 else {
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2354 if (s->huff_code_size >= 32) {/* overflow */
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2355 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
2356 return -1;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2357 }
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2358 s->huff_code_size++;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2359 s->hbits <<= 1;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2360 read_huffman_tree(avctx, gb);
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2361 s->hbits |= 1;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2362 read_huffman_tree(avctx, gb);
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2363 s->hbits >>= 1;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2364 s->huff_code_size--;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2365 }
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2366 return 0;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2367 }
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2368
4826
9ca9a53a848b Only compile in Theora-specific functions if the Theora decoder has been
diego
parents: 4825
diff changeset
2369 #ifdef CONFIG_THEORA_DECODER
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2370 static int theora_decode_header(AVCodecContext *avctx, GetBitContext *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
2371 {
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2372 Vp3DecodeContext *s = avctx->priv_data;
4935
b34f448e1a12 fix display of theora videos with visible size smaller than encoded size
aurel
parents: 4826
diff changeset
2373 int visible_width, visible_height;
3483
26b0ce29f5f5 cleanup
michael
parents: 3145
diff changeset
2374
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2375 s->theora = get_bits_long(gb, 24);
3483
26b0ce29f5f5 cleanup
michael
parents: 3145
diff changeset
2376 av_log(avctx, AV_LOG_INFO, "Theora bitstream version %X\n", s->theora);
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
2377
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2378 /* 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
2379 /* but previous versions have the image flipped relative to vp3 */
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2380 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
2381 {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2382 s->flipped_image = 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
2383 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
2384 }
f74ae637ffa9 finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents: 1598
diff changeset
2385
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2386 s->width = get_bits(gb, 16) << 4;
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2387 s->height = get_bits(gb, 16) << 4;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
2388
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2370
diff changeset
2389 if(avcodec_check_dimensions(avctx, s->width, s->height)){
2943
6bf62c1cf1b6 Fixing theora _again_. DONT BOTHER BREAKING THIS AGAIN. Added support for Theora 3.4 and stream created by Elphel cameras are decodable.
alex
parents: 2942
diff changeset
2390 av_log(avctx, AV_LOG_ERROR, "Invalid dimensions (%dx%d)\n", s->width, s->height);
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2370
diff changeset
2391 s->width= s->height= 0;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2370
diff changeset
2392 return -1;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2370
diff changeset
2393 }
2943
6bf62c1cf1b6 Fixing theora _again_. DONT BOTHER BREAKING THIS AGAIN. Added support for Theora 3.4 and stream created by Elphel cameras are decodable.
alex
parents: 2942
diff changeset
2394
6bf62c1cf1b6 Fixing theora _again_. DONT BOTHER BREAKING THIS AGAIN. Added support for Theora 3.4 and stream created by Elphel cameras are decodable.
alex
parents: 2942
diff changeset
2395 if (s->theora >= 0x030400)
6bf62c1cf1b6 Fixing theora _again_. DONT BOTHER BREAKING THIS AGAIN. Added support for Theora 3.4 and stream created by Elphel cameras are decodable.
alex
parents: 2942
diff changeset
2396 {
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2397 skip_bits(gb, 32); /* total number of superblocks in a frame */
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2398 // fixme, the next field is 36bits long
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2399 skip_bits(gb, 32); /* total number of blocks in a frame */
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2400 skip_bits(gb, 4); /* total number of blocks in a frame */
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2401 skip_bits(gb, 32); /* total number of macroblocks in a frame */
2943
6bf62c1cf1b6 Fixing theora _again_. DONT BOTHER BREAKING THIS AGAIN. Added support for Theora 3.4 and stream created by Elphel cameras are decodable.
alex
parents: 2942
diff changeset
2402 }
4935
b34f448e1a12 fix display of theora videos with visible size smaller than encoded size
aurel
parents: 4826
diff changeset
2403
b34f448e1a12 fix display of theora videos with visible size smaller than encoded size
aurel
parents: 4826
diff changeset
2404 visible_width = get_bits_long(gb, 24);
b34f448e1a12 fix display of theora videos with visible size smaller than encoded size
aurel
parents: 4826
diff changeset
2405 visible_height = get_bits_long(gb, 24);
1516
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2406
4936
2e400c0e99f6 cosmetics: fix inconsistent indentation
aurel
parents: 4935
diff changeset
2407 if (s->theora >= 0x030200) {
2e400c0e99f6 cosmetics: fix inconsistent indentation
aurel
parents: 4935
diff changeset
2408 skip_bits(gb, 8); /* offset x */
2e400c0e99f6 cosmetics: fix inconsistent indentation
aurel
parents: 4935
diff changeset
2409 skip_bits(gb, 8); /* offset y */
2e400c0e99f6 cosmetics: fix inconsistent indentation
aurel
parents: 4935
diff changeset
2410 }
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2411
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2412 skip_bits(gb, 32); /* fps numerator */
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2413 skip_bits(gb, 32); /* fps denumerator */
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2414 skip_bits(gb, 24); /* aspect numerator */
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2415 skip_bits(gb, 24); /* aspect denumerator */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
2416
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2417 if (s->theora < 0x030200)
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2418 skip_bits(gb, 5); /* keyframe frequency force */
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2419 skip_bits(gb, 8); /* colorspace */
2943
6bf62c1cf1b6 Fixing theora _again_. DONT BOTHER BREAKING THIS AGAIN. Added support for Theora 3.4 and stream created by Elphel cameras are decodable.
alex
parents: 2942
diff changeset
2420 if (s->theora >= 0x030400)
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2421 skip_bits(gb, 2); /* pixel format: 420,res,422,444 */
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2422 skip_bits(gb, 24); /* bitrate */
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2423
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2424 skip_bits(gb, 6); /* quality hint */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
2425
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2426 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
2427 {
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2428 skip_bits(gb, 5); /* keyframe frequency force */
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2429
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2430 if (s->theora < 0x030400)
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2431 skip_bits(gb, 5); /* spare bits */
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
2432 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
2433
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2434 // align_get_bits(gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
2435
4935
b34f448e1a12 fix display of theora videos with visible size smaller than encoded size
aurel
parents: 4826
diff changeset
2436 if ( visible_width <= s->width && visible_width > s->width-16
b34f448e1a12 fix display of theora videos with visible size smaller than encoded size
aurel
parents: 4826
diff changeset
2437 && visible_height <= s->height && visible_height > s->height-16)
b34f448e1a12 fix display of theora videos with visible size smaller than encoded size
aurel
parents: 4826
diff changeset
2438 avcodec_set_dimensions(avctx, visible_width, visible_height);
b34f448e1a12 fix display of theora videos with visible size smaller than encoded size
aurel
parents: 4826
diff changeset
2439 else
b34f448e1a12 fix display of theora videos with visible size smaller than encoded size
aurel
parents: 4826
diff changeset
2440 avcodec_set_dimensions(avctx, s->width, s->height);
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
2441
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2442 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
2443 }
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2444
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2445 static int theora_decode_tables(AVCodecContext *avctx, GetBitContext *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
2446 {
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2447 Vp3DecodeContext *s = avctx->priv_data;
3489
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2448 int i, n, matrices, inter, plane;
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2449
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2450 if (s->theora >= 0x030200) {
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2451 n = get_bits(gb, 3);
2731
0b4b57c4a8f5 read loop filter limit values from Theora header, courtesy of Matthieu
melanson
parents: 2726
diff changeset
2452 /* loop filter limit values table */
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2453 for (i = 0; i < 64; i++)
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2454 s->filter_limit_values[i] = get_bits(gb, n);
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2455 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
2456
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2457 if (s->theora >= 0x030200)
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2458 n = get_bits(gb, 4) + 1;
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2459 else
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2460 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
2461 /* 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
2462 for (i = 0; i < 64; i++)
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2463 s->coded_ac_scale_factor[i] = get_bits(gb, n);
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2464
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2465 if (s->theora >= 0x030200)
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2466 n = get_bits(gb, 4) + 1;
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2467 else
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2468 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
2469 /* 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
2470 for (i = 0; i < 64; i++)
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2471 s->coded_dc_scale_factor[i] = get_bits(gb, n);
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2472
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2473 if (s->theora >= 0x030200)
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2474 matrices = get_bits(gb, 9) + 1;
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2475 else
2944
3785497656c9 Correctly skip unknown matrices (patch by Matthieu Castet) and disable comment reading
alex
parents: 2943
diff changeset
2476 matrices = 3;
3489
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2477
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2478 if(matrices > 384){
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2479 av_log(avctx, AV_LOG_ERROR, "invalid number of base matrixes\n");
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2480 return -1;
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2481 }
3489
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2482
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2483 for(n=0; n<matrices; n++){
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2484 for (i = 0; i < 64; i++)
3489
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2485 s->base_matrix[n][i]= get_bits(gb, 8);
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2486 }
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2487
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2488 for (inter = 0; inter <= 1; inter++) {
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2489 for (plane = 0; plane <= 2; plane++) {
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2490 int newqr= 1;
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2491 if (inter || plane > 0)
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2492 newqr = get_bits(gb, 1);
2718
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2493 if (!newqr) {
3489
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2494 int qtj, plj;
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2495 if(inter && get_bits(gb, 1)){
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2496 qtj = 0;
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2497 plj = plane;
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2498 }else{
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2499 qtj= (3*inter + plane - 1) / 3;
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2500 plj= (plane + 2) % 3;
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2501 }
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2502 s->qr_count[inter][plane]= s->qr_count[qtj][plj];
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2503 memcpy(s->qr_size[inter][plane], s->qr_size[qtj][plj], sizeof(s->qr_size[0][0]));
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2504 memcpy(s->qr_base[inter][plane], s->qr_base[qtj][plj], sizeof(s->qr_base[0][0]));
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2505 } else {
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2506 int qri= 0;
2718
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2507 int qi = 0;
3489
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2508
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2509 for(;;){
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2510 i= get_bits(gb, av_log2(matrices-1)+1);
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2511 if(i>= matrices){
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2512 av_log(avctx, AV_LOG_ERROR, "invalid base matrix index\n");
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2513 return -1;
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2514 }
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2515 s->qr_base[inter][plane][qri]= i;
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2516 if(qi >= 63)
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2517 break;
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2518 i = get_bits(gb, av_log2(63-qi)+1) + 1;
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2519 s->qr_size[inter][plane][qri++]= i;
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2520 qi += i;
2718
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2521 }
3489
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2522
2944
3785497656c9 Correctly skip unknown matrices (patch by Matthieu Castet) and disable comment reading
alex
parents: 2943
diff changeset
2523 if (qi > 63) {
2943
6bf62c1cf1b6 Fixing theora _again_. DONT BOTHER BREAKING THIS AGAIN. Added support for Theora 3.4 and stream created by Elphel cameras are decodable.
alex
parents: 2942
diff changeset
2524 av_log(avctx, AV_LOG_ERROR, "invalid qi %d > 63\n", qi);
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2525 return -1;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2526 }
3489
9aacd9410e57 attempt to implement xiphs useless and stupid quantization matrix mess
michael
parents: 3488
diff changeset
2527 s->qr_count[inter][plane]= qri;
2718
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2528 }
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2529 }
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2530 }
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2531
2944
3785497656c9 Correctly skip unknown matrices (patch by Matthieu Castet) and disable comment reading
alex
parents: 2943
diff changeset
2532 /* Huffman tables */
2718
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2533 for (s->hti = 0; s->hti < 80; s->hti++) {
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2534 s->entries = 0;
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2535 s->huff_code_size = 1;
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2536 if (!get_bits(gb, 1)) {
2718
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2537 s->hbits = 0;
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2538 read_huffman_tree(avctx, gb);
2718
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2539 s->hbits = 1;
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2540 read_huffman_tree(avctx, gb);
2718
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2541 }
158dc437c783 read Huffman tables from Theora header (patch courtesy of
melanson
parents: 2714
diff changeset
2542 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
2543
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
2544 s->theora_tables = 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
2545
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
2546 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
2547 }
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2548
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2549 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
2550 {
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2551 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
2552 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
2553 int ptype;
4723
b62a3a46856c use generic xiph header spliting func to split theora headers
aurel
parents: 4594
diff changeset
2554 uint8_t *header_start[3];
b62a3a46856c use generic xiph header spliting func to split theora headers
aurel
parents: 4594
diff changeset
2555 int header_len[3];
b62a3a46856c use generic xiph header spliting func to split theora headers
aurel
parents: 4594
diff changeset
2556 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
2557
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
2558 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
2559
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2560 if (!avctx->extradata_size)
2943
6bf62c1cf1b6 Fixing theora _again_. DONT BOTHER BREAKING THIS AGAIN. Added support for Theora 3.4 and stream created by Elphel cameras are decodable.
alex
parents: 2942
diff changeset
2561 {
6bf62c1cf1b6 Fixing theora _again_. DONT BOTHER BREAKING THIS AGAIN. Added support for Theora 3.4 and stream created by Elphel cameras are decodable.
alex
parents: 2942
diff changeset
2562 av_log(avctx, AV_LOG_ERROR, "Missing extradata!\n");
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2563 return -1;
2943
6bf62c1cf1b6 Fixing theora _again_. DONT BOTHER BREAKING THIS AGAIN. Added support for Theora 3.4 and stream created by Elphel cameras are decodable.
alex
parents: 2942
diff changeset
2564 }
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
2565
4723
b62a3a46856c use generic xiph header spliting func to split theora headers
aurel
parents: 4594
diff changeset
2566 if (ff_split_xiph_headers(avctx->extradata, avctx->extradata_size,
b62a3a46856c use generic xiph header spliting func to split theora headers
aurel
parents: 4594
diff changeset
2567 42, header_start, header_len) < 0) {
b62a3a46856c use generic xiph header spliting func to split theora headers
aurel
parents: 4594
diff changeset
2568 av_log(avctx, AV_LOG_ERROR, "Corrupt extradata\n");
b62a3a46856c use generic xiph header spliting func to split theora headers
aurel
parents: 4594
diff changeset
2569 return -1;
b62a3a46856c use generic xiph header spliting func to split theora headers
aurel
parents: 4594
diff changeset
2570 }
b62a3a46856c use generic xiph header spliting func to split theora headers
aurel
parents: 4594
diff changeset
2571
2533
06985f4138e3 04-vp3 fix(by matthieu castet).patch
michael
parents: 2531
diff changeset
2572 for(i=0;i<3;i++) {
4723
b62a3a46856c use generic xiph header spliting func to split theora headers
aurel
parents: 4594
diff changeset
2573 init_get_bits(&gb, header_start[i], header_len[i]);
1516
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2574
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2575 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
2576 debug_vp3("Theora headerpacket type: %x\n", ptype);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
2577
2943
6bf62c1cf1b6 Fixing theora _again_. DONT BOTHER BREAKING THIS AGAIN. Added support for Theora 3.4 and stream created by Elphel cameras are decodable.
alex
parents: 2942
diff changeset
2578 if (!(ptype & 0x80))
6bf62c1cf1b6 Fixing theora _again_. DONT BOTHER BREAKING THIS AGAIN. Added support for Theora 3.4 and stream created by Elphel cameras are decodable.
alex
parents: 2942
diff changeset
2579 {
6bf62c1cf1b6 Fixing theora _again_. DONT BOTHER BREAKING THIS AGAIN. Added support for Theora 3.4 and stream created by Elphel cameras are decodable.
alex
parents: 2942
diff changeset
2580 av_log(avctx, AV_LOG_ERROR, "Invalid extradata!\n");
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2581 // return -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
2582 }
2943
6bf62c1cf1b6 Fixing theora _again_. DONT BOTHER BREAKING THIS AGAIN. Added support for Theora 3.4 and stream created by Elphel cameras are decodable.
alex
parents: 2942
diff changeset
2583
4561
726deec26122 cosmetics: aswell --> as well typo fix
diego
parents: 4342
diff changeset
2584 // FIXME: Check for this as well.
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
2585 skip_bits(&gb, 6*8); /* "theora" */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2945
diff changeset
2586
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
2587 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
2588 {
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2589 case 0x80:
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2590 theora_decode_header(avctx, &gb);
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2591 break;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2592 case 0x81:
2944
3785497656c9 Correctly skip unknown matrices (patch by Matthieu Castet) and disable comment reading
alex
parents: 2943
diff changeset
2593 // FIXME: is this needed? it breaks sometimes
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2594 // theora_decode_comments(avctx, gb);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2595 break;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2596 case 0x82:
3484
9a70c6d3c653 check how many bits are left after decoding extradata
michael
parents: 3483
diff changeset
2597 theora_decode_tables(avctx, &gb);
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2598 break;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2599 default:
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2600 av_log(avctx, AV_LOG_ERROR, "Unknown Theora config packet: %d\n", ptype&~0x80);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2601 break;
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
2602 }
4723
b62a3a46856c use generic xiph header spliting func to split theora headers
aurel
parents: 4594
diff changeset
2603 if(8*header_len[i] != get_bits_count(&gb))
b62a3a46856c use generic xiph header spliting func to split theora headers
aurel
parents: 4594
diff changeset
2604 av_log(avctx, AV_LOG_ERROR, "%d bits left in packet %X\n", 8*header_len[i] - get_bits_count(&gb), ptype);
3490
b43d45362038 fix playback of theora.ogg on mphq patch by (matthieu castet %% castet dat matthieu ot free dat fr %%)
michael
parents: 3489
diff changeset
2605 if (s->theora < 0x030200)
b43d45362038 fix playback of theora.ogg on mphq patch by (matthieu castet %% castet dat matthieu ot free dat fr %%)
michael
parents: 3489
diff changeset
2606 break;
2533
06985f4138e3 04-vp3 fix(by matthieu castet).patch
michael
parents: 2531
diff changeset
2607 }
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
2608
2678
44abbda868c5 fix theora header parsing
mru
parents: 2665
diff changeset
2609 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
2610 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
2611 }
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2612
0f0e9dfa6723 theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents: 1463
diff changeset
2613 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
2614 "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
2615 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
2616 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
2617 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
2618 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
2619 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
2620 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
2621 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
2622 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
2623 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
2624 };
4823
cff8c7ecac71 Fix compilation when Theora decoder is disabled, but VP3 is enabled.
diego
parents: 4801
diff changeset
2625 #endif
4825
3f32f0e5a77b cosmetics: Move one code block to save an #ifdef in the next commit.
diego
parents: 4824
diff changeset
2626
3f32f0e5a77b cosmetics: Move one code block to save an #ifdef in the next commit.
diego
parents: 4824
diff changeset
2627 AVCodec vp3_decoder = {
3f32f0e5a77b cosmetics: Move one code block to save an #ifdef in the next commit.
diego
parents: 4824
diff changeset
2628 "vp3",
3f32f0e5a77b cosmetics: Move one code block to save an #ifdef in the next commit.
diego
parents: 4824
diff changeset
2629 CODEC_TYPE_VIDEO,
3f32f0e5a77b cosmetics: Move one code block to save an #ifdef in the next commit.
diego
parents: 4824
diff changeset
2630 CODEC_ID_VP3,
3f32f0e5a77b cosmetics: Move one code block to save an #ifdef in the next commit.
diego
parents: 4824
diff changeset
2631 sizeof(Vp3DecodeContext),
3f32f0e5a77b cosmetics: Move one code block to save an #ifdef in the next commit.
diego
parents: 4824
diff changeset
2632 vp3_decode_init,
3f32f0e5a77b cosmetics: Move one code block to save an #ifdef in the next commit.
diego
parents: 4824
diff changeset
2633 NULL,
3f32f0e5a77b cosmetics: Move one code block to save an #ifdef in the next commit.
diego
parents: 4824
diff changeset
2634 vp3_decode_end,
3f32f0e5a77b cosmetics: Move one code block to save an #ifdef in the next commit.
diego
parents: 4824
diff changeset
2635 vp3_decode_frame,
3f32f0e5a77b cosmetics: Move one code block to save an #ifdef in the next commit.
diego
parents: 4824
diff changeset
2636 0,
3f32f0e5a77b cosmetics: Move one code block to save an #ifdef in the next commit.
diego
parents: 4824
diff changeset
2637 NULL
3f32f0e5a77b cosmetics: Move one code block to save an #ifdef in the next commit.
diego
parents: 4824
diff changeset
2638 };