Mercurial > libavcodec.hg
annotate vc1.c @ 9437:8aa2e86549cd libavcodec
VC1: Do qpel when needed for both MVs in a B frame
author | conrad |
---|---|
date | Tue, 14 Apr 2009 19:26:33 +0000 |
parents | 25b3650b4db5 |
children | ef3a7b711cc0 |
rev | line source |
---|---|
3359 | 1 /* |
2 * VC-1 and WMV3 decoder | |
4605 | 3 * Copyright (c) 2006-2007 Konstantin Shishkov |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4 * Partly based on vc9.c (c) 2005 Anonymous, Alex Beregszaszi, Michael Niedermayer |
3359 | 5 * |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3920
diff
changeset
|
6 * This file is part of FFmpeg. |
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3920
diff
changeset
|
7 * |
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3920
diff
changeset
|
8 * FFmpeg is free software; you can redistribute it and/or |
3359 | 9 * modify it under the terms of the GNU Lesser General Public |
10 * 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:
3920
diff
changeset
|
11 * version 2.1 of the License, or (at your option) any later version. |
3359 | 12 * |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3920
diff
changeset
|
13 * FFmpeg is distributed in the hope that it will be useful, |
3359 | 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
16 * Lesser General Public License for more details. | |
17 * | |
18 * 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:
3920
diff
changeset
|
19 * License along with FFmpeg; if not, write to the Free Software |
3359 | 20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
21 */ | |
22 | |
23 /** | |
8718
e9d9d946f213
Use full internal pathname in doxygen @file directives.
diego
parents:
8692
diff
changeset
|
24 * @file libavcodec/vc1.c |
3359 | 25 * VC-1 and WMV3 decoder |
26 * | |
27 */ | |
9011
90c99bda19f5
Approved hunks for VAAPI / our new shiny hwaccel API
michael
parents:
8955
diff
changeset
|
28 #include "internal.h" |
3359 | 29 #include "dsputil.h" |
30 #include "avcodec.h" | |
31 #include "mpegvideo.h" | |
4926 | 32 #include "vc1.h" |
3359 | 33 #include "vc1data.h" |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
34 #include "vc1acdata.h" |
4965 | 35 #include "msmpeg4data.h" |
5605 | 36 #include "unary.h" |
5849 | 37 #include "simple_idct.h" |
8627
d6bab465b82c
moves mid_pred() into mathops.h (with arch specific code split by directory)
aurel
parents:
8624
diff
changeset
|
38 #include "mathops.h" |
8631
2d7269e13a8d
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents:
8627
diff
changeset
|
39 #include "vdpau_internal.h" |
3359 | 40 |
41 #undef NDEBUG | |
42 #include <assert.h> | |
43 | |
44 #define MB_INTRA_VLC_BITS 9 | |
45 #define DC_VLC_BITS 9 | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
46 #define AC_VLC_BITS 9 |
3359 | 47 static const uint16_t table_mb_intra[64][2]; |
48 | |
49 | |
50 /** | |
51 * Init VC-1 specific tables and VC1Context members | |
52 * @param v The VC1Context to initialize | |
53 * @return Status | |
54 */ | |
55 static int vc1_init_common(VC1Context *v) | |
56 { | |
57 static int done = 0; | |
58 int i = 0; | |
59 | |
60 v->hrd_rate = v->hrd_buffer = NULL; | |
61 | |
62 /* VLC tables */ | |
63 if(!done) | |
64 { | |
65 done = 1; | |
4949 | 66 init_vlc(&ff_vc1_bfraction_vlc, VC1_BFRACTION_VLC_BITS, 23, |
67 ff_vc1_bfraction_bits, 1, 1, | |
9393 | 68 ff_vc1_bfraction_codes, 1, 1, INIT_VLC_USE_STATIC); |
4949 | 69 init_vlc(&ff_vc1_norm2_vlc, VC1_NORM2_VLC_BITS, 4, |
70 ff_vc1_norm2_bits, 1, 1, | |
9393 | 71 ff_vc1_norm2_codes, 1, 1, INIT_VLC_USE_STATIC); |
4949 | 72 init_vlc(&ff_vc1_norm6_vlc, VC1_NORM6_VLC_BITS, 64, |
73 ff_vc1_norm6_bits, 1, 1, | |
9393 | 74 ff_vc1_norm6_codes, 2, 2, INIT_VLC_USE_STATIC); |
4949 | 75 init_vlc(&ff_vc1_imode_vlc, VC1_IMODE_VLC_BITS, 7, |
76 ff_vc1_imode_bits, 1, 1, | |
9393 | 77 ff_vc1_imode_codes, 1, 1, INIT_VLC_USE_STATIC); |
3359 | 78 for (i=0; i<3; i++) |
79 { | |
4949 | 80 init_vlc(&ff_vc1_ttmb_vlc[i], VC1_TTMB_VLC_BITS, 16, |
81 ff_vc1_ttmb_bits[i], 1, 1, | |
9393 | 82 ff_vc1_ttmb_codes[i], 2, 2, INIT_VLC_USE_STATIC); |
4949 | 83 init_vlc(&ff_vc1_ttblk_vlc[i], VC1_TTBLK_VLC_BITS, 8, |
84 ff_vc1_ttblk_bits[i], 1, 1, | |
9393 | 85 ff_vc1_ttblk_codes[i], 1, 1, INIT_VLC_USE_STATIC); |
4949 | 86 init_vlc(&ff_vc1_subblkpat_vlc[i], VC1_SUBBLKPAT_VLC_BITS, 15, |
87 ff_vc1_subblkpat_bits[i], 1, 1, | |
9393 | 88 ff_vc1_subblkpat_codes[i], 1, 1, INIT_VLC_USE_STATIC); |
3359 | 89 } |
90 for(i=0; i<4; i++) | |
91 { | |
4949 | 92 init_vlc(&ff_vc1_4mv_block_pattern_vlc[i], VC1_4MV_BLOCK_PATTERN_VLC_BITS, 16, |
93 ff_vc1_4mv_block_pattern_bits[i], 1, 1, | |
9393 | 94 ff_vc1_4mv_block_pattern_codes[i], 1, 1, INIT_VLC_USE_STATIC); |
4949 | 95 init_vlc(&ff_vc1_cbpcy_p_vlc[i], VC1_CBPCY_P_VLC_BITS, 64, |
96 ff_vc1_cbpcy_p_bits[i], 1, 1, | |
9393 | 97 ff_vc1_cbpcy_p_codes[i], 2, 2, INIT_VLC_USE_STATIC); |
4949 | 98 init_vlc(&ff_vc1_mv_diff_vlc[i], VC1_MV_DIFF_VLC_BITS, 73, |
99 ff_vc1_mv_diff_bits[i], 1, 1, | |
9393 | 100 ff_vc1_mv_diff_codes[i], 2, 2, INIT_VLC_USE_STATIC); |
3359 | 101 } |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
102 for(i=0; i<8; i++) |
4949 | 103 init_vlc(&ff_vc1_ac_coeff_table[i], AC_VLC_BITS, vc1_ac_sizes[i], |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
104 &vc1_ac_tables[i][0][1], 8, 4, |
9393 | 105 &vc1_ac_tables[i][0][0], 8, 4, INIT_VLC_USE_STATIC); |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
106 init_vlc(&ff_msmp4_mb_i_vlc, MB_INTRA_VLC_BITS, 64, |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
107 &ff_msmp4_mb_i_table[0][1], 4, 2, |
9393 | 108 &ff_msmp4_mb_i_table[0][0], 4, 2, INIT_VLC_USE_STATIC); |
3359 | 109 } |
110 | |
111 /* Other defaults */ | |
112 v->pq = -1; | |
113 v->mvrange = 0; /* 7.1.1.18, p80 */ | |
114 | |
115 return 0; | |
116 } | |
117 | |
118 /***********************************************************************/ | |
119 /** | |
8685 | 120 * @defgroup vc1bitplane VC-1 Bitplane decoding |
3359 | 121 * @see 8.7, p56 |
122 * @{ | |
123 */ | |
124 | |
8685 | 125 /** |
3359 | 126 * Imode types |
127 * @{ | |
128 */ | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
129 enum Imode { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
130 IMODE_RAW, |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
131 IMODE_NORM2, |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
132 IMODE_DIFF2, |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
133 IMODE_NORM6, |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
134 IMODE_DIFF6, |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
135 IMODE_ROWSKIP, |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
136 IMODE_COLSKIP |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
137 }; |
3359 | 138 /** @} */ //imode defines |
139 | |
140 /** Decode rows by checking if they are skipped | |
141 * @param plane Buffer to store decoded bits | |
142 * @param[in] width Width of this buffer | |
143 * @param[in] height Height of this buffer | |
144 * @param[in] stride of this buffer | |
145 */ | |
146 static void decode_rowskip(uint8_t* plane, int width, int height, int stride, GetBitContext *gb){ | |
147 int x, y; | |
148 | |
149 for (y=0; y<height; y++){ | |
5513 | 150 if (!get_bits1(gb)) //rowskip |
3359 | 151 memset(plane, 0, width); |
152 else | |
153 for (x=0; x<width; x++) | |
5513 | 154 plane[x] = get_bits1(gb); |
3359 | 155 plane += stride; |
156 } | |
157 } | |
158 | |
159 /** Decode columns by checking if they are skipped | |
160 * @param plane Buffer to store decoded bits | |
161 * @param[in] width Width of this buffer | |
162 * @param[in] height Height of this buffer | |
163 * @param[in] stride of this buffer | |
5299
4623928e3b9e
Replace non-existing @fixme doxygen tags with @todo.
diego
parents:
5228
diff
changeset
|
164 * @todo FIXME: Optimize |
3359 | 165 */ |
166 static void decode_colskip(uint8_t* plane, int width, int height, int stride, GetBitContext *gb){ | |
167 int x, y; | |
168 | |
169 for (x=0; x<width; x++){ | |
5513 | 170 if (!get_bits1(gb)) //colskip |
3359 | 171 for (y=0; y<height; y++) |
172 plane[y*stride] = 0; | |
173 else | |
174 for (y=0; y<height; y++) | |
5513 | 175 plane[y*stride] = get_bits1(gb); |
3359 | 176 plane ++; |
177 } | |
178 } | |
179 | |
180 /** Decode a bitplane's bits | |
8685 | 181 * @param data bitplane where to store the decode bits |
182 * @param[out] raw_flag pointer to the flag indicating that this bitplane is not coded explicitly | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
183 * @param v VC-1 context for bit reading and logging |
3359 | 184 * @return Status |
5299
4623928e3b9e
Replace non-existing @fixme doxygen tags with @todo.
diego
parents:
5228
diff
changeset
|
185 * @todo FIXME: Optimize |
3359 | 186 */ |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
187 static int bitplane_decoding(uint8_t* data, int *raw_flag, VC1Context *v) |
3359 | 188 { |
189 GetBitContext *gb = &v->s.gb; | |
190 | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
191 int imode, x, y, code, offset; |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
192 uint8_t invert, *planep = data; |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
193 int width, height, stride; |
3359 | 194 |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
195 width = v->s.mb_width; |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
196 height = v->s.mb_height; |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
197 stride = v->s.mb_stride; |
5513 | 198 invert = get_bits1(gb); |
4949 | 199 imode = get_vlc2(gb, ff_vc1_imode_vlc.table, VC1_IMODE_VLC_BITS, 1); |
3359 | 200 |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
201 *raw_flag = 0; |
3359 | 202 switch (imode) |
203 { | |
204 case IMODE_RAW: | |
205 //Data is actually read in the MB layer (same for all tests == "raw") | |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
206 *raw_flag = 1; //invert ignored |
3359 | 207 return invert; |
208 case IMODE_DIFF2: | |
209 case IMODE_NORM2: | |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
210 if ((height * width) & 1) |
3359 | 211 { |
5513 | 212 *planep++ = get_bits1(gb); |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
213 offset = 1; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
214 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
215 else offset = 0; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
216 // decode bitplane as one long line |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
217 for (y = offset; y < height * width; y += 2) { |
4949 | 218 code = get_vlc2(gb, ff_vc1_norm2_vlc.table, VC1_NORM2_VLC_BITS, 1); |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
219 *planep++ = code & 1; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
220 offset++; |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
221 if(offset == width) { |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
222 offset = 0; |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
223 planep += stride - width; |
3359 | 224 } |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
225 *planep++ = code >> 1; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
226 offset++; |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
227 if(offset == width) { |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
228 offset = 0; |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
229 planep += stride - width; |
3359 | 230 } |
231 } | |
232 break; | |
233 case IMODE_DIFF6: | |
234 case IMODE_NORM6: | |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
235 if(!(height % 3) && (width % 3)) { // use 2x3 decoding |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
236 for(y = 0; y < height; y+= 3) { |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
237 for(x = width & 1; x < width; x += 2) { |
4949 | 238 code = get_vlc2(gb, ff_vc1_norm6_vlc.table, VC1_NORM6_VLC_BITS, 2); |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
239 if(code < 0){ |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
240 av_log(v->s.avctx, AV_LOG_DEBUG, "invalid NORM-6 VLC\n"); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
241 return -1; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
242 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
243 planep[x + 0] = (code >> 0) & 1; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
244 planep[x + 1] = (code >> 1) & 1; |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
245 planep[x + 0 + stride] = (code >> 2) & 1; |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
246 planep[x + 1 + stride] = (code >> 3) & 1; |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
247 planep[x + 0 + stride * 2] = (code >> 4) & 1; |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
248 planep[x + 1 + stride * 2] = (code >> 5) & 1; |
3359 | 249 } |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
250 planep += stride * 3; |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
251 } |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
252 if(width & 1) decode_colskip(data, 1, height, stride, &v->s.gb); |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
253 } else { // 3x2 |
3405
58c4fd135462
Correctly choose global transform mode, MV mode and fix bitplane decoding
kostya
parents:
3404
diff
changeset
|
254 planep += (height & 1) * stride; |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
255 for(y = height & 1; y < height; y += 2) { |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
256 for(x = width % 3; x < width; x += 3) { |
4949 | 257 code = get_vlc2(gb, ff_vc1_norm6_vlc.table, VC1_NORM6_VLC_BITS, 2); |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
258 if(code < 0){ |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
259 av_log(v->s.avctx, AV_LOG_DEBUG, "invalid NORM-6 VLC\n"); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
260 return -1; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
261 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
262 planep[x + 0] = (code >> 0) & 1; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
263 planep[x + 1] = (code >> 1) & 1; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
264 planep[x + 2] = (code >> 2) & 1; |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
265 planep[x + 0 + stride] = (code >> 3) & 1; |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
266 planep[x + 1 + stride] = (code >> 4) & 1; |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
267 planep[x + 2 + stride] = (code >> 5) & 1; |
3359 | 268 } |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
269 planep += stride * 2; |
3359 | 270 } |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
271 x = width % 3; |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
272 if(x) decode_colskip(data , x, height , stride, &v->s.gb); |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
273 if(height & 1) decode_rowskip(data+x, width - x, 1, stride, &v->s.gb); |
3359 | 274 } |
275 break; | |
276 case IMODE_ROWSKIP: | |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
277 decode_rowskip(data, width, height, stride, &v->s.gb); |
3359 | 278 break; |
279 case IMODE_COLSKIP: | |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
280 decode_colskip(data, width, height, stride, &v->s.gb); |
3359 | 281 break; |
282 default: break; | |
283 } | |
284 | |
285 /* Applying diff operator */ | |
286 if (imode == IMODE_DIFF2 || imode == IMODE_DIFF6) | |
287 { | |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
288 planep = data; |
3359 | 289 planep[0] ^= invert; |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
290 for (x=1; x<width; x++) |
3359 | 291 planep[x] ^= planep[x-1]; |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
292 for (y=1; y<height; y++) |
3359 | 293 { |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
294 planep += stride; |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
295 planep[0] ^= planep[-stride]; |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
296 for (x=1; x<width; x++) |
3359 | 297 { |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
298 if (planep[x-1] != planep[x-stride]) planep[x] ^= invert; |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
299 else planep[x] ^= planep[x-1]; |
3359 | 300 } |
301 } | |
302 } | |
303 else if (invert) | |
304 { | |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
305 planep = data; |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
306 for (x=0; x<stride*height; x++) planep[x] = !planep[x]; //FIXME stride |
3359 | 307 } |
308 return (imode<<1) + invert; | |
309 } | |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
310 |
3359 | 311 /** @} */ //Bitplane group |
312 | |
7355 | 313 /** |
314 * VC-1 in-loop deblocking filter for one line | |
315 * @param src source block type | |
8685 | 316 * @param stride block stride |
7355 | 317 * @param pq block quantizer |
318 * @return whether other 3 pairs should be filtered or not | |
319 * @see 8.6 | |
320 */ | |
8955
e03f0d4f9e3d
cosmetics: 'void/int inline' --> 'inline void/int' to avoid warnings of the type
diego
parents:
8718
diff
changeset
|
321 static av_always_inline int vc1_filter_line(uint8_t* src, int stride, int pq){ |
7355 | 322 uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; |
323 | |
8623
8f9f86b93f88
Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents:
8584
diff
changeset
|
324 int a0 = (2*(src[-2*stride] - src[ 1*stride]) - 5*(src[-1*stride] - src[ 0*stride]) + 4) >> 3; |
8f9f86b93f88
Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents:
8584
diff
changeset
|
325 int a0_sign = a0 >> 31; /* Store sign */ |
8f9f86b93f88
Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents:
8584
diff
changeset
|
326 a0 = (a0 ^ a0_sign) - a0_sign; /* a0 = FFABS(a0); */ |
8f9f86b93f88
Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents:
8584
diff
changeset
|
327 if(a0 < pq){ |
8f9f86b93f88
Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents:
8584
diff
changeset
|
328 int a1 = FFABS((2*(src[-4*stride] - src[-1*stride]) - 5*(src[-3*stride] - src[-2*stride]) + 4) >> 3); |
8f9f86b93f88
Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents:
8584
diff
changeset
|
329 int a2 = FFABS((2*(src[ 0*stride] - src[ 3*stride]) - 5*(src[ 1*stride] - src[ 2*stride]) + 4) >> 3); |
8f9f86b93f88
Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents:
8584
diff
changeset
|
330 if(a1 < a0 || a2 < a0){ |
8f9f86b93f88
Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents:
8584
diff
changeset
|
331 int clip = src[-1*stride] - src[ 0*stride]; |
8f9f86b93f88
Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents:
8584
diff
changeset
|
332 int clip_sign = clip >> 31; |
8f9f86b93f88
Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents:
8584
diff
changeset
|
333 clip = ((clip ^ clip_sign) - clip_sign)>>1; |
7355 | 334 if(clip){ |
8623
8f9f86b93f88
Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents:
8584
diff
changeset
|
335 int a3 = FFMIN(a1, a2); |
8f9f86b93f88
Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents:
8584
diff
changeset
|
336 int d = 5 * (a3 - a0); |
8f9f86b93f88
Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents:
8584
diff
changeset
|
337 int d_sign = (d >> 31); |
8f9f86b93f88
Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents:
8584
diff
changeset
|
338 d = ((d ^ d_sign) - d_sign) >> 3; |
8f9f86b93f88
Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents:
8584
diff
changeset
|
339 d_sign ^= a0_sign; |
8f9f86b93f88
Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents:
8584
diff
changeset
|
340 |
8624 | 341 if( d_sign ^ clip_sign ) |
8623
8f9f86b93f88
Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents:
8584
diff
changeset
|
342 d = 0; |
8f9f86b93f88
Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents:
8584
diff
changeset
|
343 else{ |
8f9f86b93f88
Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents:
8584
diff
changeset
|
344 d = FFMIN(d, clip); |
8f9f86b93f88
Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents:
8584
diff
changeset
|
345 d = (d ^ d_sign) - d_sign; /* Restore sign */ |
8f9f86b93f88
Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents:
8584
diff
changeset
|
346 src[-1*stride] = cm[src[-1*stride] - d]; |
8f9f86b93f88
Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents:
8584
diff
changeset
|
347 src[ 0*stride] = cm[src[ 0*stride] + d]; |
8f9f86b93f88
Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents:
8584
diff
changeset
|
348 } |
8f9f86b93f88
Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents:
8584
diff
changeset
|
349 return 1; |
7355 | 350 } |
351 } | |
352 } | |
8623
8f9f86b93f88
Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents:
8584
diff
changeset
|
353 return 0; |
7355 | 354 } |
355 | |
356 /** | |
357 * VC-1 in-loop deblocking filter | |
358 * @param src source block type | |
8685 | 359 * @param step distance between horizontally adjacent elements |
360 * @param stride distance between vertically adjacent elements | |
7355 | 361 * @param len edge length to filter (4 or 8 pixels) |
362 * @param pq block quantizer | |
363 * @see 8.6 | |
364 */ | |
365 static void vc1_loop_filter(uint8_t* src, int step, int stride, int len, int pq) | |
366 { | |
367 int i; | |
368 int filt3; | |
369 | |
370 for(i = 0; i < len; i += 4){ | |
371 filt3 = vc1_filter_line(src + 2*step, stride, pq); | |
372 if(filt3){ | |
373 vc1_filter_line(src + 0*step, stride, pq); | |
374 vc1_filter_line(src + 1*step, stride, pq); | |
375 vc1_filter_line(src + 3*step, stride, pq); | |
376 } | |
377 src += step * 4; | |
378 } | |
379 } | |
380 | |
381 static void vc1_loop_filter_iblk(MpegEncContext *s, int pq) | |
382 { | |
383 int i, j; | |
384 if(!s->first_slice_line) | |
385 vc1_loop_filter(s->dest[0], 1, s->linesize, 16, pq); | |
386 vc1_loop_filter(s->dest[0] + 8*s->linesize, 1, s->linesize, 16, pq); | |
387 for(i = !s->mb_x*8; i < 16; i += 8) | |
388 vc1_loop_filter(s->dest[0] + i, s->linesize, 1, 16, pq); | |
389 for(j = 0; j < 2; j++){ | |
390 if(!s->first_slice_line) | |
391 vc1_loop_filter(s->dest[j+1], 1, s->uvlinesize, 8, pq); | |
392 if(s->mb_x) | |
393 vc1_loop_filter(s->dest[j+1], s->uvlinesize, 1, 8, pq); | |
394 } | |
395 } | |
396 | |
3359 | 397 /***********************************************************************/ |
398 /** VOP Dquant decoding | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
399 * @param v VC-1 Context |
3359 | 400 */ |
401 static int vop_dquant_decoding(VC1Context *v) | |
402 { | |
403 GetBitContext *gb = &v->s.gb; | |
404 int pqdiff; | |
405 | |
406 //variable size | |
407 if (v->dquant == 2) | |
408 { | |
409 pqdiff = get_bits(gb, 3); | |
410 if (pqdiff == 7) v->altpq = get_bits(gb, 5); | |
411 else v->altpq = v->pq + pqdiff + 1; | |
412 } | |
413 else | |
414 { | |
5513 | 415 v->dquantfrm = get_bits1(gb); |
3359 | 416 if ( v->dquantfrm ) |
417 { | |
418 v->dqprofile = get_bits(gb, 2); | |
419 switch (v->dqprofile) | |
420 { | |
421 case DQPROFILE_SINGLE_EDGE: | |
422 case DQPROFILE_DOUBLE_EDGES: | |
423 v->dqsbedge = get_bits(gb, 2); | |
424 break; | |
425 case DQPROFILE_ALL_MBS: | |
5513 | 426 v->dqbilevel = get_bits1(gb); |
5682
8bf94c994691
In case when any quantizer may occur, HALFPQ should be zero
kostya
parents:
5605
diff
changeset
|
427 if(!v->dqbilevel) |
8bf94c994691
In case when any quantizer may occur, HALFPQ should be zero
kostya
parents:
5605
diff
changeset
|
428 v->halfpq = 0; |
3359 | 429 default: break; //Forbidden ? |
430 } | |
3451 | 431 if (v->dqbilevel || v->dqprofile != DQPROFILE_ALL_MBS) |
3359 | 432 { |
433 pqdiff = get_bits(gb, 3); | |
434 if (pqdiff == 7) v->altpq = get_bits(gb, 5); | |
435 else v->altpq = v->pq + pqdiff + 1; | |
436 } | |
437 } | |
438 } | |
439 return 0; | |
440 } | |
441 | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
442 /** Put block onto picture |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
443 */ |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
444 static void vc1_put_block(VC1Context *v, DCTELEM block[6][64]) |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
445 { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
446 uint8_t *Y; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
447 int ys, us, vs; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
448 DSPContext *dsp = &v->s.dsp; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
449 |
3522 | 450 if(v->rangeredfrm) { |
451 int i, j, k; | |
452 for(k = 0; k < 6; k++) | |
453 for(j = 0; j < 8; j++) | |
454 for(i = 0; i < 8; i++) | |
455 block[k][i + j*8] = ((block[k][i + j*8] - 128) << 1) + 128; | |
456 | |
457 } | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
458 ys = v->s.current_picture.linesize[0]; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
459 us = v->s.current_picture.linesize[1]; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
460 vs = v->s.current_picture.linesize[2]; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
461 Y = v->s.dest[0]; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
462 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
463 dsp->put_pixels_clamped(block[0], Y, ys); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
464 dsp->put_pixels_clamped(block[1], Y + 8, ys); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
465 Y += ys * 8; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
466 dsp->put_pixels_clamped(block[2], Y, ys); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
467 dsp->put_pixels_clamped(block[3], Y + 8, ys); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
468 |
3521 | 469 if(!(v->s.flags & CODEC_FLAG_GRAY)) { |
470 dsp->put_pixels_clamped(block[4], v->s.dest[1], us); | |
471 dsp->put_pixels_clamped(block[5], v->s.dest[2], vs); | |
472 } | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
473 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
474 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
475 /** Do motion compensation over 1 macroblock |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
476 * Mostly adapted hpel_motion and qpel_motion from mpegvideo.c |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
477 */ |
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
478 static void vc1_mc_1mv(VC1Context *v, int dir) |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
479 { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
480 MpegEncContext *s = &v->s; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
481 DSPContext *dsp = &v->s.dsp; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
482 uint8_t *srcY, *srcU, *srcV; |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
483 int dxy, uvdxy, mx, my, uvmx, uvmy, src_x, src_y, uvsrc_x, uvsrc_y; |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
484 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
485 if(!v->s.last_picture.data[0])return; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
486 |
3689 | 487 mx = s->mv[dir][0][0]; |
488 my = s->mv[dir][0][1]; | |
489 | |
490 // store motion vectors for further use in B frames | |
6481 | 491 if(s->pict_type == FF_P_TYPE) { |
3689 | 492 s->current_picture.motion_val[1][s->block_index[0]][0] = mx; |
493 s->current_picture.motion_val[1][s->block_index[0]][1] = my; | |
494 } | |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
495 uvmx = (mx + ((mx & 3) == 3)) >> 1; |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
496 uvmy = (my + ((my & 3) == 3)) >> 1; |
4258
4d2f162506e3
10e6l FastUVMC was done right but in the wrong place
kostya
parents:
4247
diff
changeset
|
497 if(v->fastuvmc) { |
4d2f162506e3
10e6l FastUVMC was done right but in the wrong place
kostya
parents:
4247
diff
changeset
|
498 uvmx = uvmx + ((uvmx<0)?(uvmx&1):-(uvmx&1)); |
4d2f162506e3
10e6l FastUVMC was done right but in the wrong place
kostya
parents:
4247
diff
changeset
|
499 uvmy = uvmy + ((uvmy<0)?(uvmy&1):-(uvmy&1)); |
4d2f162506e3
10e6l FastUVMC was done right but in the wrong place
kostya
parents:
4247
diff
changeset
|
500 } |
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
501 if(!dir) { |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
502 srcY = s->last_picture.data[0]; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
503 srcU = s->last_picture.data[1]; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
504 srcV = s->last_picture.data[2]; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
505 } else { |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
506 srcY = s->next_picture.data[0]; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
507 srcU = s->next_picture.data[1]; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
508 srcV = s->next_picture.data[2]; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
509 } |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
510 |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
511 src_x = s->mb_x * 16 + (mx >> 2); |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
512 src_y = s->mb_y * 16 + (my >> 2); |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
513 uvsrc_x = s->mb_x * 8 + (uvmx >> 2); |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
514 uvsrc_y = s->mb_y * 8 + (uvmy >> 2); |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
515 |
4681 | 516 if(v->profile != PROFILE_ADVANCED){ |
517 src_x = av_clip( src_x, -16, s->mb_width * 16); | |
518 src_y = av_clip( src_y, -16, s->mb_height * 16); | |
519 uvsrc_x = av_clip(uvsrc_x, -8, s->mb_width * 8); | |
520 uvsrc_y = av_clip(uvsrc_y, -8, s->mb_height * 8); | |
521 }else{ | |
522 src_x = av_clip( src_x, -17, s->avctx->coded_width); | |
523 src_y = av_clip( src_y, -18, s->avctx->coded_height + 1); | |
524 uvsrc_x = av_clip(uvsrc_x, -8, s->avctx->coded_width >> 1); | |
525 uvsrc_y = av_clip(uvsrc_y, -8, s->avctx->coded_height >> 1); | |
526 } | |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
527 |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
528 srcY += src_y * s->linesize + src_x; |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
529 srcU += uvsrc_y * s->uvlinesize + uvsrc_x; |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
530 srcV += uvsrc_y * s->uvlinesize + uvsrc_x; |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
531 |
3521 | 532 /* for grayscale we should not try to read from unknown area */ |
533 if(s->flags & CODEC_FLAG_GRAY) { | |
534 srcU = s->edge_emu_buffer + 18 * s->linesize; | |
535 srcV = s->edge_emu_buffer + 18 * s->linesize; | |
536 } | |
537 | |
3522 | 538 if(v->rangeredfrm || (v->mv_mode == MV_PMODE_INTENSITY_COMP) |
3528
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
539 || (unsigned)(src_x - s->mspel) > s->h_edge_pos - (mx&3) - 16 - s->mspel*3 |
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
540 || (unsigned)(src_y - s->mspel) > s->v_edge_pos - (my&3) - 16 - s->mspel*3){ |
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
541 uint8_t *uvbuf= s->edge_emu_buffer + 19 * s->linesize; |
3359 | 542 |
3528
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
543 srcY -= s->mspel * (1 + s->linesize); |
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
544 ff_emulated_edge_mc(s->edge_emu_buffer, srcY, s->linesize, 17+s->mspel*2, 17+s->mspel*2, |
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
545 src_x - s->mspel, src_y - s->mspel, s->h_edge_pos, s->v_edge_pos); |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
546 srcY = s->edge_emu_buffer; |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
547 ff_emulated_edge_mc(uvbuf , srcU, s->uvlinesize, 8+1, 8+1, |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
548 uvsrc_x, uvsrc_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1); |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
549 ff_emulated_edge_mc(uvbuf + 16, srcV, s->uvlinesize, 8+1, 8+1, |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
550 uvsrc_x, uvsrc_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1); |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
551 srcU = uvbuf; |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
552 srcV = uvbuf + 16; |
3522 | 553 /* if we deal with range reduction we need to scale source blocks */ |
554 if(v->rangeredfrm) { | |
555 int i, j; | |
556 uint8_t *src, *src2; | |
557 | |
558 src = srcY; | |
3528
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
559 for(j = 0; j < 17 + s->mspel*2; j++) { |
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
560 for(i = 0; i < 17 + s->mspel*2; i++) src[i] = ((src[i] - 128) >> 1) + 128; |
3522 | 561 src += s->linesize; |
562 } | |
563 src = srcU; src2 = srcV; | |
564 for(j = 0; j < 9; j++) { | |
565 for(i = 0; i < 9; i++) { | |
566 src[i] = ((src[i] - 128) >> 1) + 128; | |
567 src2[i] = ((src2[i] - 128) >> 1) + 128; | |
568 } | |
569 src += s->uvlinesize; | |
570 src2 += s->uvlinesize; | |
571 } | |
572 } | |
3406 | 573 /* if we deal with intensity compensation we need to scale source blocks */ |
574 if(v->mv_mode == MV_PMODE_INTENSITY_COMP) { | |
575 int i, j; | |
576 uint8_t *src, *src2; | |
577 | |
578 src = srcY; | |
3528
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
579 for(j = 0; j < 17 + s->mspel*2; j++) { |
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
580 for(i = 0; i < 17 + s->mspel*2; i++) src[i] = v->luty[src[i]]; |
3406 | 581 src += s->linesize; |
582 } | |
583 src = srcU; src2 = srcV; | |
584 for(j = 0; j < 9; j++) { | |
585 for(i = 0; i < 9; i++) { | |
586 src[i] = v->lutuv[src[i]]; | |
587 src2[i] = v->lutuv[src2[i]]; | |
588 } | |
589 src += s->uvlinesize; | |
590 src2 += s->uvlinesize; | |
591 } | |
592 } | |
3528
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
593 srcY += s->mspel * (1 + s->linesize); |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
594 } |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
595 |
3528
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
596 if(s->mspel) { |
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
597 dxy = ((my & 3) << 2) | (mx & 3); |
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
598 dsp->put_vc1_mspel_pixels_tab[dxy](s->dest[0] , srcY , s->linesize, v->rnd); |
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
599 dsp->put_vc1_mspel_pixels_tab[dxy](s->dest[0] + 8, srcY + 8, s->linesize, v->rnd); |
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
600 srcY += s->linesize * 8; |
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
601 dsp->put_vc1_mspel_pixels_tab[dxy](s->dest[0] + 8 * s->linesize , srcY , s->linesize, v->rnd); |
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
602 dsp->put_vc1_mspel_pixels_tab[dxy](s->dest[0] + 8 * s->linesize + 8, srcY + 8, s->linesize, v->rnd); |
3654
565d9ddd8eb3
Motion compensation for luma always use halfpel precision.
kostya
parents:
3573
diff
changeset
|
603 } else { // hpel mc - always used for luma |
565d9ddd8eb3
Motion compensation for luma always use halfpel precision.
kostya
parents:
3573
diff
changeset
|
604 dxy = (my & 2) | ((mx & 2) >> 1); |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
605 |
3474 | 606 if(!v->rnd) |
607 dsp->put_pixels_tab[0][dxy](s->dest[0], srcY, s->linesize, 16); | |
608 else | |
609 dsp->put_no_rnd_pixels_tab[0][dxy](s->dest[0], srcY, s->linesize, 16); | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
610 } |
3521 | 611 |
612 if(s->flags & CODEC_FLAG_GRAY) return; | |
3655 | 613 /* Chroma MC always uses qpel bilinear */ |
3474 | 614 uvdxy = ((uvmy & 3) << 2) | (uvmx & 3); |
3664
de842f000384
Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents:
3656
diff
changeset
|
615 uvmx = (uvmx&3)<<1; |
de842f000384
Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents:
3656
diff
changeset
|
616 uvmy = (uvmy&3)<<1; |
de842f000384
Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents:
3656
diff
changeset
|
617 if(!v->rnd){ |
de842f000384
Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents:
3656
diff
changeset
|
618 dsp->put_h264_chroma_pixels_tab[0](s->dest[1], srcU, s->uvlinesize, 8, uvmx, uvmy); |
de842f000384
Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents:
3656
diff
changeset
|
619 dsp->put_h264_chroma_pixels_tab[0](s->dest[2], srcV, s->uvlinesize, 8, uvmx, uvmy); |
de842f000384
Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents:
3656
diff
changeset
|
620 }else{ |
de842f000384
Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents:
3656
diff
changeset
|
621 dsp->put_no_rnd_h264_chroma_pixels_tab[0](s->dest[1], srcU, s->uvlinesize, 8, uvmx, uvmy); |
de842f000384
Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents:
3656
diff
changeset
|
622 dsp->put_no_rnd_h264_chroma_pixels_tab[0](s->dest[2], srcV, s->uvlinesize, 8, uvmx, uvmy); |
de842f000384
Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents:
3656
diff
changeset
|
623 } |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
624 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
625 |
3396 | 626 /** Do motion compensation for 4-MV macroblock - luminance block |
627 */ | |
628 static void vc1_mc_4mv_luma(VC1Context *v, int n) | |
629 { | |
630 MpegEncContext *s = &v->s; | |
631 DSPContext *dsp = &v->s.dsp; | |
632 uint8_t *srcY; | |
633 int dxy, mx, my, src_x, src_y; | |
634 int off; | |
635 | |
636 if(!v->s.last_picture.data[0])return; | |
637 mx = s->mv[0][n][0]; | |
638 my = s->mv[0][n][1]; | |
639 srcY = s->last_picture.data[0]; | |
640 | |
641 off = s->linesize * 4 * (n&2) + (n&1) * 8; | |
642 | |
643 src_x = s->mb_x * 16 + (n&1) * 8 + (mx >> 2); | |
644 src_y = s->mb_y * 16 + (n&2) * 4 + (my >> 2); | |
645 | |
4681 | 646 if(v->profile != PROFILE_ADVANCED){ |
647 src_x = av_clip( src_x, -16, s->mb_width * 16); | |
648 src_y = av_clip( src_y, -16, s->mb_height * 16); | |
649 }else{ | |
650 src_x = av_clip( src_x, -17, s->avctx->coded_width); | |
651 src_y = av_clip( src_y, -18, s->avctx->coded_height + 1); | |
652 } | |
3396 | 653 |
654 srcY += src_y * s->linesize + src_x; | |
655 | |
3548
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
656 if(v->rangeredfrm || (v->mv_mode == MV_PMODE_INTENSITY_COMP) |
3552
4a0f82c8dc43
Bicubic interpolation requires two additional pixels for block
kostya
parents:
3548
diff
changeset
|
657 || (unsigned)(src_x - s->mspel) > s->h_edge_pos - (mx&3) - 8 - s->mspel*2 |
4a0f82c8dc43
Bicubic interpolation requires two additional pixels for block
kostya
parents:
3548
diff
changeset
|
658 || (unsigned)(src_y - s->mspel) > s->v_edge_pos - (my&3) - 8 - s->mspel*2){ |
3528
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
659 srcY -= s->mspel * (1 + s->linesize); |
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
660 ff_emulated_edge_mc(s->edge_emu_buffer, srcY, s->linesize, 9+s->mspel*2, 9+s->mspel*2, |
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
661 src_x - s->mspel, src_y - s->mspel, s->h_edge_pos, s->v_edge_pos); |
3396 | 662 srcY = s->edge_emu_buffer; |
3522 | 663 /* if we deal with range reduction we need to scale source blocks */ |
664 if(v->rangeredfrm) { | |
665 int i, j; | |
666 uint8_t *src; | |
667 | |
668 src = srcY; | |
3528
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
669 for(j = 0; j < 9 + s->mspel*2; j++) { |
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
670 for(i = 0; i < 9 + s->mspel*2; i++) src[i] = ((src[i] - 128) >> 1) + 128; |
3522 | 671 src += s->linesize; |
672 } | |
673 } | |
3548
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
674 /* if we deal with intensity compensation we need to scale source blocks */ |
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
675 if(v->mv_mode == MV_PMODE_INTENSITY_COMP) { |
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
676 int i, j; |
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
677 uint8_t *src; |
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
678 |
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
679 src = srcY; |
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
680 for(j = 0; j < 9 + s->mspel*2; j++) { |
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
681 for(i = 0; i < 9 + s->mspel*2; i++) src[i] = v->luty[src[i]]; |
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
682 src += s->linesize; |
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
683 } |
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
684 } |
3528
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
685 srcY += s->mspel * (1 + s->linesize); |
3396 | 686 } |
687 | |
3528
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
688 if(s->mspel) { |
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
689 dxy = ((my & 3) << 2) | (mx & 3); |
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
690 dsp->put_vc1_mspel_pixels_tab[dxy](s->dest[0] + off, srcY, s->linesize, v->rnd); |
3654
565d9ddd8eb3
Motion compensation for luma always use halfpel precision.
kostya
parents:
3573
diff
changeset
|
691 } else { // hpel mc - always used for luma |
565d9ddd8eb3
Motion compensation for luma always use halfpel precision.
kostya
parents:
3573
diff
changeset
|
692 dxy = (my & 2) | ((mx & 2) >> 1); |
3474 | 693 if(!v->rnd) |
694 dsp->put_pixels_tab[1][dxy](s->dest[0] + off, srcY, s->linesize, 8); | |
695 else | |
696 dsp->put_no_rnd_pixels_tab[1][dxy](s->dest[0] + off, srcY, s->linesize, 8); | |
3396 | 697 } |
698 } | |
699 | |
700 static inline int median4(int a, int b, int c, int d) | |
701 { | |
3404 | 702 if(a < b) { |
3430
d0e85690841d
Improve chroma MC: correct case for FASTUVMC=1, use slower but correct /2, and always use halfpel MC.
kostya
parents:
3429
diff
changeset
|
703 if(c < d) return (FFMIN(b, d) + FFMAX(a, c)) / 2; |
d0e85690841d
Improve chroma MC: correct case for FASTUVMC=1, use slower but correct /2, and always use halfpel MC.
kostya
parents:
3429
diff
changeset
|
704 else return (FFMIN(b, c) + FFMAX(a, d)) / 2; |
3404 | 705 } else { |
3430
d0e85690841d
Improve chroma MC: correct case for FASTUVMC=1, use slower but correct /2, and always use halfpel MC.
kostya
parents:
3429
diff
changeset
|
706 if(c < d) return (FFMIN(a, d) + FFMAX(b, c)) / 2; |
d0e85690841d
Improve chroma MC: correct case for FASTUVMC=1, use slower but correct /2, and always use halfpel MC.
kostya
parents:
3429
diff
changeset
|
707 else return (FFMIN(a, c) + FFMAX(b, d)) / 2; |
3404 | 708 } |
3396 | 709 } |
710 | |
711 | |
712 /** Do motion compensation for 4-MV macroblock - both chroma blocks | |
713 */ | |
714 static void vc1_mc_4mv_chroma(VC1Context *v) | |
715 { | |
716 MpegEncContext *s = &v->s; | |
717 DSPContext *dsp = &v->s.dsp; | |
718 uint8_t *srcU, *srcV; | |
719 int uvdxy, uvmx, uvmy, uvsrc_x, uvsrc_y; | |
720 int i, idx, tx = 0, ty = 0; | |
721 int mvx[4], mvy[4], intra[4]; | |
722 static const int count[16] = { 0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4}; | |
723 | |
724 if(!v->s.last_picture.data[0])return; | |
3521 | 725 if(s->flags & CODEC_FLAG_GRAY) return; |
3396 | 726 |
727 for(i = 0; i < 4; i++) { | |
728 mvx[i] = s->mv[0][i][0]; | |
729 mvy[i] = s->mv[0][i][1]; | |
730 intra[i] = v->mb_type[0][s->block_index[i]]; | |
731 } | |
732 | |
733 /* calculate chroma MV vector from four luma MVs */ | |
3419 | 734 idx = (intra[3] << 3) | (intra[2] << 2) | (intra[1] << 1) | intra[0]; |
3396 | 735 if(!idx) { // all blocks are inter |
736 tx = median4(mvx[0], mvx[1], mvx[2], mvx[3]); | |
737 ty = median4(mvy[0], mvy[1], mvy[2], mvy[3]); | |
738 } else if(count[idx] == 1) { // 3 inter blocks | |
739 switch(idx) { | |
740 case 0x1: | |
741 tx = mid_pred(mvx[1], mvx[2], mvx[3]); | |
3419 | 742 ty = mid_pred(mvy[1], mvy[2], mvy[3]); |
3396 | 743 break; |
744 case 0x2: | |
745 tx = mid_pred(mvx[0], mvx[2], mvx[3]); | |
3419 | 746 ty = mid_pred(mvy[0], mvy[2], mvy[3]); |
3396 | 747 break; |
748 case 0x4: | |
749 tx = mid_pred(mvx[0], mvx[1], mvx[3]); | |
3419 | 750 ty = mid_pred(mvy[0], mvy[1], mvy[3]); |
3396 | 751 break; |
752 case 0x8: | |
753 tx = mid_pred(mvx[0], mvx[1], mvx[2]); | |
3419 | 754 ty = mid_pred(mvy[0], mvy[1], mvy[2]); |
3396 | 755 break; |
756 } | |
757 } else if(count[idx] == 2) { | |
758 int t1 = 0, t2 = 0; | |
759 for(i=0; i<3;i++) if(!intra[i]) {t1 = i; break;} | |
760 for(i= t1+1; i<4; i++)if(!intra[i]) {t2 = i; break;} | |
3430
d0e85690841d
Improve chroma MC: correct case for FASTUVMC=1, use slower but correct /2, and always use halfpel MC.
kostya
parents:
3429
diff
changeset
|
761 tx = (mvx[t1] + mvx[t2]) / 2; |
d0e85690841d
Improve chroma MC: correct case for FASTUVMC=1, use slower but correct /2, and always use halfpel MC.
kostya
parents:
3429
diff
changeset
|
762 ty = (mvy[t1] + mvy[t2]) / 2; |
4683 | 763 } else { |
764 s->current_picture.motion_val[1][s->block_index[0]][0] = 0; | |
765 s->current_picture.motion_val[1][s->block_index[0]][1] = 0; | |
3396 | 766 return; //no need to do MC for inter blocks |
4683 | 767 } |
3396 | 768 |
3689 | 769 s->current_picture.motion_val[1][s->block_index[0]][0] = tx; |
770 s->current_picture.motion_val[1][s->block_index[0]][1] = ty; | |
3396 | 771 uvmx = (tx + ((tx&3) == 3)) >> 1; |
772 uvmy = (ty + ((ty&3) == 3)) >> 1; | |
4258
4d2f162506e3
10e6l FastUVMC was done right but in the wrong place
kostya
parents:
4247
diff
changeset
|
773 if(v->fastuvmc) { |
4d2f162506e3
10e6l FastUVMC was done right but in the wrong place
kostya
parents:
4247
diff
changeset
|
774 uvmx = uvmx + ((uvmx<0)?(uvmx&1):-(uvmx&1)); |
4d2f162506e3
10e6l FastUVMC was done right but in the wrong place
kostya
parents:
4247
diff
changeset
|
775 uvmy = uvmy + ((uvmy<0)?(uvmy&1):-(uvmy&1)); |
4d2f162506e3
10e6l FastUVMC was done right but in the wrong place
kostya
parents:
4247
diff
changeset
|
776 } |
3396 | 777 |
778 uvsrc_x = s->mb_x * 8 + (uvmx >> 2); | |
779 uvsrc_y = s->mb_y * 8 + (uvmy >> 2); | |
780 | |
4681 | 781 if(v->profile != PROFILE_ADVANCED){ |
782 uvsrc_x = av_clip(uvsrc_x, -8, s->mb_width * 8); | |
783 uvsrc_y = av_clip(uvsrc_y, -8, s->mb_height * 8); | |
784 }else{ | |
785 uvsrc_x = av_clip(uvsrc_x, -8, s->avctx->coded_width >> 1); | |
786 uvsrc_y = av_clip(uvsrc_y, -8, s->avctx->coded_height >> 1); | |
787 } | |
4680 | 788 |
3396 | 789 srcU = s->last_picture.data[1] + uvsrc_y * s->uvlinesize + uvsrc_x; |
790 srcV = s->last_picture.data[2] + uvsrc_y * s->uvlinesize + uvsrc_x; | |
3548
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
791 if(v->rangeredfrm || (v->mv_mode == MV_PMODE_INTENSITY_COMP) |
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
792 || (unsigned)uvsrc_x > (s->h_edge_pos >> 1) - 9 |
3511 | 793 || (unsigned)uvsrc_y > (s->v_edge_pos >> 1) - 9){ |
3396 | 794 ff_emulated_edge_mc(s->edge_emu_buffer , srcU, s->uvlinesize, 8+1, 8+1, |
795 uvsrc_x, uvsrc_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1); | |
796 ff_emulated_edge_mc(s->edge_emu_buffer + 16, srcV, s->uvlinesize, 8+1, 8+1, | |
797 uvsrc_x, uvsrc_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1); | |
798 srcU = s->edge_emu_buffer; | |
799 srcV = s->edge_emu_buffer + 16; | |
3522 | 800 |
801 /* if we deal with range reduction we need to scale source blocks */ | |
802 if(v->rangeredfrm) { | |
803 int i, j; | |
804 uint8_t *src, *src2; | |
805 | |
806 src = srcU; src2 = srcV; | |
807 for(j = 0; j < 9; j++) { | |
808 for(i = 0; i < 9; i++) { | |
809 src[i] = ((src[i] - 128) >> 1) + 128; | |
810 src2[i] = ((src2[i] - 128) >> 1) + 128; | |
811 } | |
812 src += s->uvlinesize; | |
813 src2 += s->uvlinesize; | |
814 } | |
815 } | |
3548
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
816 /* if we deal with intensity compensation we need to scale source blocks */ |
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
817 if(v->mv_mode == MV_PMODE_INTENSITY_COMP) { |
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
818 int i, j; |
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
819 uint8_t *src, *src2; |
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
820 |
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
821 src = srcU; src2 = srcV; |
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
822 for(j = 0; j < 9; j++) { |
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
823 for(i = 0; i < 9; i++) { |
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
824 src[i] = v->lutuv[src[i]]; |
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
825 src2[i] = v->lutuv[src2[i]]; |
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
826 } |
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
827 src += s->uvlinesize; |
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
828 src2 += s->uvlinesize; |
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
829 } |
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
830 } |
3396 | 831 } |
832 | |
3655 | 833 /* Chroma MC always uses qpel bilinear */ |
3474 | 834 uvdxy = ((uvmy & 3) << 2) | (uvmx & 3); |
3664
de842f000384
Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents:
3656
diff
changeset
|
835 uvmx = (uvmx&3)<<1; |
de842f000384
Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents:
3656
diff
changeset
|
836 uvmy = (uvmy&3)<<1; |
de842f000384
Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents:
3656
diff
changeset
|
837 if(!v->rnd){ |
de842f000384
Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents:
3656
diff
changeset
|
838 dsp->put_h264_chroma_pixels_tab[0](s->dest[1], srcU, s->uvlinesize, 8, uvmx, uvmy); |
de842f000384
Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents:
3656
diff
changeset
|
839 dsp->put_h264_chroma_pixels_tab[0](s->dest[2], srcV, s->uvlinesize, 8, uvmx, uvmy); |
de842f000384
Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents:
3656
diff
changeset
|
840 }else{ |
de842f000384
Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents:
3656
diff
changeset
|
841 dsp->put_no_rnd_h264_chroma_pixels_tab[0](s->dest[1], srcU, s->uvlinesize, 8, uvmx, uvmy); |
de842f000384
Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents:
3656
diff
changeset
|
842 dsp->put_no_rnd_h264_chroma_pixels_tab[0](s->dest[2], srcV, s->uvlinesize, 8, uvmx, uvmy); |
de842f000384
Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents:
3656
diff
changeset
|
843 } |
3396 | 844 } |
845 | |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
846 static int decode_sequence_header_adv(VC1Context *v, GetBitContext *gb); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
847 |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
848 /** |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
849 * Decode Simple/Main Profiles sequence header |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
850 * @see Figure 7-8, p16-17 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
851 * @param avctx Codec context |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
852 * @param gb GetBit context initialized from Codec context extra_data |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
853 * @return Status |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
854 */ |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
855 static int decode_sequence_header(AVCodecContext *avctx, GetBitContext *gb) |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
856 { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
857 VC1Context *v = avctx->priv_data; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
858 |
3692 | 859 av_log(avctx, AV_LOG_DEBUG, "Header: %0X\n", show_bits(gb, 32)); |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
860 v->profile = get_bits(gb, 2); |
4604 | 861 if (v->profile == PROFILE_COMPLEX) |
3359 | 862 { |
4604 | 863 av_log(avctx, AV_LOG_ERROR, "WMV3 Complex Profile is not fully supported\n"); |
3359 | 864 } |
865 | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
866 if (v->profile == PROFILE_ADVANCED) |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
867 { |
6145
ddf5d7fae101
Select scan tables for 8x4 and 4x8 blocks only once.
kostya
parents:
6099
diff
changeset
|
868 v->zz_8x4 = ff_vc1_adv_progressive_8x4_zz; |
ddf5d7fae101
Select scan tables for 8x4 and 4x8 blocks only once.
kostya
parents:
6099
diff
changeset
|
869 v->zz_4x8 = ff_vc1_adv_progressive_4x8_zz; |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
870 return decode_sequence_header_adv(v, gb); |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
871 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
872 else |
3359 | 873 { |
7136 | 874 v->zz_8x4 = wmv2_scantableA; |
875 v->zz_4x8 = wmv2_scantableB; | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
876 v->res_sm = get_bits(gb, 2); //reserved |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
877 if (v->res_sm) |
3359 | 878 { |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
879 av_log(avctx, AV_LOG_ERROR, |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
880 "Reserved RES_SM=%i is forbidden\n", v->res_sm); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
881 return -1; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
882 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
883 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
884 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
885 // (fps-2)/4 (->30) |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
886 v->frmrtq_postproc = get_bits(gb, 3); //common |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
887 // (bitrate-32kbps)/64kbps |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
888 v->bitrtq_postproc = get_bits(gb, 5); //common |
5513 | 889 v->s.loop_filter = get_bits1(gb); //common |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
890 if(v->s.loop_filter == 1 && v->profile == PROFILE_SIMPLE) |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
891 { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
892 av_log(avctx, AV_LOG_ERROR, |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
893 "LOOPFILTER shell not be enabled in simple profile\n"); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
894 } |
7846 | 895 if(v->s.avctx->skip_loop_filter >= AVDISCARD_ALL) |
896 v->s.loop_filter = 0; | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
897 |
5513 | 898 v->res_x8 = get_bits1(gb); //reserved |
899 v->multires = get_bits1(gb); | |
900 v->res_fasttx = get_bits1(gb); | |
3691
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
901 if (!v->res_fasttx) |
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
902 { |
6001 | 903 v->s.dsp.vc1_inv_trans_8x8 = ff_simple_idct; |
904 v->s.dsp.vc1_inv_trans_8x4 = ff_simple_idct84_add; | |
905 v->s.dsp.vc1_inv_trans_4x8 = ff_simple_idct48_add; | |
6008 | 906 v->s.dsp.vc1_inv_trans_4x4 = ff_simple_idct44_add; |
3359 | 907 } |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
908 |
5513 | 909 v->fastuvmc = get_bits1(gb); //common |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
910 if (!v->profile && !v->fastuvmc) |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
911 { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
912 av_log(avctx, AV_LOG_ERROR, |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
913 "FASTUVMC unavailable in Simple Profile\n"); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
914 return -1; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
915 } |
5513 | 916 v->extended_mv = get_bits1(gb); //common |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
917 if (!v->profile && v->extended_mv) |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
918 { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
919 av_log(avctx, AV_LOG_ERROR, |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
920 "Extended MVs unavailable in Simple Profile\n"); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
921 return -1; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
922 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
923 v->dquant = get_bits(gb, 2); //common |
5513 | 924 v->vstransform = get_bits1(gb); //common |
925 | |
926 v->res_transtab = get_bits1(gb); | |
3691
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
927 if (v->res_transtab) |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
928 { |
3691
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
929 av_log(avctx, AV_LOG_ERROR, |
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
930 "1 for reserved RES_TRANSTAB is forbidden\n"); |
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
931 return -1; |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
932 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
933 |
5513 | 934 v->overlap = get_bits1(gb); //common |
935 | |
936 v->s.resync_marker = get_bits1(gb); | |
937 v->rangered = get_bits1(gb); | |
3691
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
938 if (v->rangered && v->profile == PROFILE_SIMPLE) |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
939 { |
3691
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
940 av_log(avctx, AV_LOG_INFO, |
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
941 "RANGERED should be set to 0 in simple profile\n"); |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
942 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
943 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
944 v->s.max_b_frames = avctx->max_b_frames = get_bits(gb, 3); //common |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
945 v->quantizer_mode = get_bits(gb, 2); //common |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
946 |
5513 | 947 v->finterpflag = get_bits1(gb); //common |
948 v->res_rtm_flag = get_bits1(gb); //reserved | |
3691
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
949 if (!v->res_rtm_flag) |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
950 { |
3538
f26bf13bbb69
Don't try to decode P-frames from old WMV3 variant until their format is figured
kostya
parents:
3528
diff
changeset
|
951 // av_log(avctx, AV_LOG_ERROR, |
f26bf13bbb69
Don't try to decode P-frames from old WMV3 variant until their format is figured
kostya
parents:
3528
diff
changeset
|
952 // "0 for reserved RES_RTM_FLAG is forbidden\n"); |
3691
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
953 av_log(avctx, AV_LOG_ERROR, |
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
954 "Old WMV3 version detected, only I-frames will be decoded\n"); |
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
955 //return -1; |
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
956 } |
4742 | 957 //TODO: figure out what they mean (always 0x402F) |
958 if(!v->res_fasttx) skip_bits(gb, 16); | |
3691
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
959 av_log(avctx, AV_LOG_DEBUG, |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
960 "Profile %i:\nfrmrtq_postproc=%i, bitrtq_postproc=%i\n" |
3457 | 961 "LoopFilter=%i, MultiRes=%i, FastUVMC=%i, Extended MV=%i\n" |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
962 "Rangered=%i, VSTransform=%i, Overlap=%i, SyncMarker=%i\n" |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
963 "DQuant=%i, Quantizer mode=%i, Max B frames=%i\n", |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
964 v->profile, v->frmrtq_postproc, v->bitrtq_postproc, |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
965 v->s.loop_filter, v->multires, v->fastuvmc, v->extended_mv, |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
966 v->rangered, v->vstransform, v->overlap, v->s.resync_marker, |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
967 v->dquant, v->quantizer_mode, avctx->max_b_frames |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
968 ); |
3691
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
969 return 0; |
3359 | 970 } |
971 | |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
972 static int decode_sequence_header_adv(VC1Context *v, GetBitContext *gb) |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
973 { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
974 v->res_rtm_flag = 1; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
975 v->level = get_bits(gb, 3); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
976 if(v->level >= 5) |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
977 { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
978 av_log(v->s.avctx, AV_LOG_ERROR, "Reserved LEVEL %i\n",v->level); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
979 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
980 v->chromaformat = get_bits(gb, 2); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
981 if (v->chromaformat != 1) |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
982 { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
983 av_log(v->s.avctx, AV_LOG_ERROR, |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
984 "Only 4:2:0 chroma format supported\n"); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
985 return -1; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
986 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
987 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
988 // (fps-2)/4 (->30) |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
989 v->frmrtq_postproc = get_bits(gb, 3); //common |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
990 // (bitrate-32kbps)/64kbps |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
991 v->bitrtq_postproc = get_bits(gb, 5); //common |
5513 | 992 v->postprocflag = get_bits1(gb); //common |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
993 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
994 v->s.avctx->coded_width = (get_bits(gb, 12) + 1) << 1; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
995 v->s.avctx->coded_height = (get_bits(gb, 12) + 1) << 1; |
4474 | 996 v->s.avctx->width = v->s.avctx->coded_width; |
997 v->s.avctx->height = v->s.avctx->coded_height; | |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
998 v->broadcast = get_bits1(gb); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
999 v->interlace = get_bits1(gb); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1000 v->tfcntrflag = get_bits1(gb); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1001 v->finterpflag = get_bits1(gb); |
5519 | 1002 skip_bits1(gb); // reserved |
4402 | 1003 |
4680 | 1004 v->s.h_edge_pos = v->s.avctx->coded_width; |
1005 v->s.v_edge_pos = v->s.avctx->coded_height; | |
1006 | |
4402 | 1007 av_log(v->s.avctx, AV_LOG_DEBUG, |
1008 "Advanced Profile level %i:\nfrmrtq_postproc=%i, bitrtq_postproc=%i\n" | |
1009 "LoopFilter=%i, ChromaFormat=%i, Pulldown=%i, Interlace: %i\n" | |
1010 "TFCTRflag=%i, FINTERPflag=%i\n", | |
1011 v->level, v->frmrtq_postproc, v->bitrtq_postproc, | |
1012 v->s.loop_filter, v->chromaformat, v->broadcast, v->interlace, | |
1013 v->tfcntrflag, v->finterpflag | |
1014 ); | |
1015 | |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1016 v->psf = get_bits1(gb); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1017 if(v->psf) { //PsF, 6.1.13 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1018 av_log(v->s.avctx, AV_LOG_ERROR, "Progressive Segmented Frame mode: not supported (yet)\n"); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1019 return -1; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1020 } |
4486
1d2320afa864
B-frames could not be determined from broken_link/closed_entry, use fixed value
kostya
parents:
4485
diff
changeset
|
1021 v->s.max_b_frames = v->s.avctx->max_b_frames = 7; |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1022 if(get_bits1(gb)) { //Display Info - decoding is not affected by it |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1023 int w, h, ar = 0; |
4467 | 1024 av_log(v->s.avctx, AV_LOG_DEBUG, "Display extended info:\n"); |
8584
8a47574d9fbc
VC-1 display dimensions should affect coded dimensions only (I think)
kostya
parents:
8583
diff
changeset
|
1025 v->s.avctx->coded_width = w = get_bits(gb, 14) + 1; |
8a47574d9fbc
VC-1 display dimensions should affect coded dimensions only (I think)
kostya
parents:
8583
diff
changeset
|
1026 v->s.avctx->coded_height = h = get_bits(gb, 14) + 1; |
4467 | 1027 av_log(v->s.avctx, AV_LOG_DEBUG, "Display dimensions: %ix%i\n", w, h); |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1028 if(get_bits1(gb)) |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1029 ar = get_bits(gb, 4); |
4414 | 1030 if(ar && ar < 14){ |
4949 | 1031 v->s.avctx->sample_aspect_ratio = ff_vc1_pixel_aspect[ar]; |
4414 | 1032 }else if(ar == 15){ |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1033 w = get_bits(gb, 8); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1034 h = get_bits(gb, 8); |
4414 | 1035 v->s.avctx->sample_aspect_ratio = (AVRational){w, h}; |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1036 } |
8583 | 1037 av_log(v->s.avctx, AV_LOG_DEBUG, "Aspect: %i:%i\n", v->s.avctx->sample_aspect_ratio.num, v->s.avctx->sample_aspect_ratio.den); |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1038 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1039 if(get_bits1(gb)){ //framerate stuff |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1040 if(get_bits1(gb)) { |
4470 | 1041 v->s.avctx->time_base.num = 32; |
1042 v->s.avctx->time_base.den = get_bits(gb, 16) + 1; | |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1043 } else { |
4470 | 1044 int nr, dr; |
1045 nr = get_bits(gb, 8); | |
1046 dr = get_bits(gb, 4); | |
1047 if(nr && nr < 8 && dr && dr < 3){ | |
4949 | 1048 v->s.avctx->time_base.num = ff_vc1_fps_dr[dr - 1]; |
1049 v->s.avctx->time_base.den = ff_vc1_fps_nr[nr - 1] * 1000; | |
4470 | 1050 } |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1051 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1052 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1053 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1054 if(get_bits1(gb)){ |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1055 v->color_prim = get_bits(gb, 8); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1056 v->transfer_char = get_bits(gb, 8); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1057 v->matrix_coef = get_bits(gb, 8); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1058 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1059 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1060 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1061 v->hrd_param_flag = get_bits1(gb); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1062 if(v->hrd_param_flag) { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1063 int i; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1064 v->hrd_num_leaky_buckets = get_bits(gb, 5); |
5519 | 1065 skip_bits(gb, 4); //bitrate exponent |
1066 skip_bits(gb, 4); //buffer size exponent | |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1067 for(i = 0; i < v->hrd_num_leaky_buckets; i++) { |
5519 | 1068 skip_bits(gb, 16); //hrd_rate[n] |
1069 skip_bits(gb, 16); //hrd_buffer[n] | |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1070 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1071 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1072 return 0; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1073 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1074 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1075 static int decode_entry_point(AVCodecContext *avctx, GetBitContext *gb) |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1076 { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1077 VC1Context *v = avctx->priv_data; |
8692
48442253aac2
Record B-fraction index from frame header and two fields from entry point structure
kostya
parents:
8685
diff
changeset
|
1078 int i; |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1079 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1080 av_log(avctx, AV_LOG_DEBUG, "Entry point: %08X\n", show_bits_long(gb, 32)); |
8692
48442253aac2
Record B-fraction index from frame header and two fields from entry point structure
kostya
parents:
8685
diff
changeset
|
1081 v->broken_link = get_bits1(gb); |
48442253aac2
Record B-fraction index from frame header and two fields from entry point structure
kostya
parents:
8685
diff
changeset
|
1082 v->closed_entry = get_bits1(gb); |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1083 v->panscanflag = get_bits1(gb); |
8556 | 1084 v->refdist_flag = get_bits1(gb); |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1085 v->s.loop_filter = get_bits1(gb); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1086 v->fastuvmc = get_bits1(gb); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1087 v->extended_mv = get_bits1(gb); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1088 v->dquant = get_bits(gb, 2); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1089 v->vstransform = get_bits1(gb); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1090 v->overlap = get_bits1(gb); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1091 v->quantizer_mode = get_bits(gb, 2); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1092 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1093 if(v->hrd_param_flag){ |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1094 for(i = 0; i < v->hrd_num_leaky_buckets; i++) { |
5519 | 1095 skip_bits(gb, 8); //hrd_full[n] |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1096 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1097 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1098 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1099 if(get_bits1(gb)){ |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1100 avctx->coded_width = (get_bits(gb, 12)+1)<<1; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1101 avctx->coded_height = (get_bits(gb, 12)+1)<<1; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1102 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1103 if(v->extended_mv) |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1104 v->extended_dmv = get_bits1(gb); |
8560 | 1105 if((v->range_mapy_flag = get_bits1(gb))) { |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1106 av_log(avctx, AV_LOG_ERROR, "Luma scaling is not supported, expect wrong picture\n"); |
8560 | 1107 v->range_mapy = get_bits(gb, 3); |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1108 } |
8560 | 1109 if((v->range_mapuv_flag = get_bits1(gb))) { |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1110 av_log(avctx, AV_LOG_ERROR, "Chroma scaling is not supported, expect wrong picture\n"); |
8560 | 1111 v->range_mapuv = get_bits(gb, 3); |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1112 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1113 |
4402 | 1114 av_log(avctx, AV_LOG_DEBUG, "Entry point info:\n" |
1115 "BrokenLink=%i, ClosedEntry=%i, PanscanFlag=%i\n" | |
1116 "RefDist=%i, Postproc=%i, FastUVMC=%i, ExtMV=%i\n" | |
1117 "DQuant=%i, VSTransform=%i, Overlap=%i, Qmode=%i\n", | |
8692
48442253aac2
Record B-fraction index from frame header and two fields from entry point structure
kostya
parents:
8685
diff
changeset
|
1118 v->broken_link, v->closed_entry, v->panscanflag, v->refdist_flag, v->s.loop_filter, |
4402 | 1119 v->fastuvmc, v->extended_mv, v->dquant, v->vstransform, v->overlap, v->quantizer_mode); |
1120 | |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1121 return 0; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1122 } |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1123 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1124 static int vc1_parse_frame_header(VC1Context *v, GetBitContext* gb) |
3359 | 1125 { |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1126 int pqindex, lowquant, status; |
3359 | 1127 |
5513 | 1128 if(v->finterpflag) v->interpfrm = get_bits1(gb); |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1129 skip_bits(gb, 2); //framecnt unused |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1130 v->rangeredfrm = 0; |
5513 | 1131 if (v->rangered) v->rangeredfrm = get_bits1(gb); |
1132 v->s.pict_type = get_bits1(gb); | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1133 if (v->s.avctx->max_b_frames) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1134 if (!v->s.pict_type) { |
6481 | 1135 if (get_bits1(gb)) v->s.pict_type = FF_I_TYPE; |
1136 else v->s.pict_type = FF_B_TYPE; | |
1137 } else v->s.pict_type = FF_P_TYPE; | |
1138 } else v->s.pict_type = v->s.pict_type ? FF_P_TYPE : FF_I_TYPE; | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1139 |
3689 | 1140 v->bi_type = 0; |
6481 | 1141 if(v->s.pict_type == FF_B_TYPE) { |
8692
48442253aac2
Record B-fraction index from frame header and two fields from entry point structure
kostya
parents:
8685
diff
changeset
|
1142 v->bfraction_lut_index = get_vlc2(gb, ff_vc1_bfraction_vlc.table, VC1_BFRACTION_VLC_BITS, 1); |
48442253aac2
Record B-fraction index from frame header and two fields from entry point structure
kostya
parents:
8685
diff
changeset
|
1143 v->bfraction = ff_vc1_bfraction_lut[v->bfraction_lut_index]; |
3689 | 1144 if(v->bfraction == 0) { |
6481 | 1145 v->s.pict_type = FF_BI_TYPE; |
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1146 } |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1147 } |
6481 | 1148 if(v->s.pict_type == FF_I_TYPE || v->s.pict_type == FF_BI_TYPE) |
5519 | 1149 skip_bits(gb, 7); // skip buffer fullness |
3359 | 1150 |
3474 | 1151 /* calculate RND */ |
6481 | 1152 if(v->s.pict_type == FF_I_TYPE || v->s.pict_type == FF_BI_TYPE) |
3474 | 1153 v->rnd = 1; |
6481 | 1154 if(v->s.pict_type == FF_P_TYPE) |
3474 | 1155 v->rnd ^= 1; |
1156 | |
3359 | 1157 /* Quantizer stuff */ |
1158 pqindex = get_bits(gb, 5); | |
6150 | 1159 if(!pqindex) return -1; |
3359 | 1160 if (v->quantizer_mode == QUANT_FRAME_IMPLICIT) |
4949 | 1161 v->pq = ff_vc1_pquant_table[0][pqindex]; |
3359 | 1162 else |
4949 | 1163 v->pq = ff_vc1_pquant_table[1][pqindex]; |
3359 | 1164 |
3475 | 1165 v->pquantizer = 1; |
3359 | 1166 if (v->quantizer_mode == QUANT_FRAME_IMPLICIT) |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1167 v->pquantizer = pqindex < 9; |
3475 | 1168 if (v->quantizer_mode == QUANT_NON_UNIFORM) |
1169 v->pquantizer = 0; | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1170 v->pqindex = pqindex; |
5513 | 1171 if (pqindex < 9) v->halfpq = get_bits1(gb); |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1172 else v->halfpq = 0; |
3359 | 1173 if (v->quantizer_mode == QUANT_FRAME_EXPLICIT) |
5513 | 1174 v->pquantizer = get_bits1(gb); |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1175 v->dquantfrm = 0; |
5511 | 1176 if (v->extended_mv == 1) v->mvrange = get_unary(gb, 0, 3); |
3452
f024ca7c768b
MVRANGE may occur in all frames and RESPIC in all but B-frames
kostya
parents:
3451
diff
changeset
|
1177 v->k_x = v->mvrange + 9 + (v->mvrange >> 1); //k_x can be 9 10 12 13 |
f024ca7c768b
MVRANGE may occur in all frames and RESPIC in all but B-frames
kostya
parents:
3451
diff
changeset
|
1178 v->k_y = v->mvrange + 8; //k_y can be 8 9 10 11 |
f024ca7c768b
MVRANGE may occur in all frames and RESPIC in all but B-frames
kostya
parents:
3451
diff
changeset
|
1179 v->range_x = 1 << (v->k_x - 1); |
f024ca7c768b
MVRANGE may occur in all frames and RESPIC in all but B-frames
kostya
parents:
3451
diff
changeset
|
1180 v->range_y = 1 << (v->k_y - 1); |
8640
ad979489c6e7
Remove the block with always false condition from vc1_parse_frame_header()
kostya
parents:
8639
diff
changeset
|
1181 if (v->multires && v->s.pict_type != FF_B_TYPE) v->respic = get_bits(gb, 2); |
6481 | 1182 |
1183 if(v->res_x8 && (v->s.pict_type == FF_I_TYPE || v->s.pict_type == FF_BI_TYPE)){ | |
5887 | 1184 v->x8_type = get_bits1(gb); |
1185 }else v->x8_type = 0; | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1186 //av_log(v->s.avctx, AV_LOG_INFO, "%c Frame: QP=[%i]%i (+%i/2) %i\n", |
6481 | 1187 // (v->s.pict_type == FF_P_TYPE) ? 'P' : ((v->s.pict_type == FF_I_TYPE) ? 'I' : 'B'), pqindex, v->pq, v->halfpq, v->rangeredfrm); |
1188 | |
1189 if(v->s.pict_type == FF_I_TYPE || v->s.pict_type == FF_P_TYPE) v->use_ic = 0; | |
3744
805aee1f7cce
For B-frames if the second reference frame signals intensity compensation
kostya
parents:
3743
diff
changeset
|
1190 |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1191 switch(v->s.pict_type) { |
6481 | 1192 case FF_P_TYPE: |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1193 if (v->pq < 5) v->tt_index = 0; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1194 else if(v->pq < 13) v->tt_index = 1; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1195 else v->tt_index = 2; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1196 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1197 lowquant = (v->pq > 12) ? 0 : 1; |
5511 | 1198 v->mv_mode = ff_vc1_mv_pmode_table[lowquant][get_unary(gb, 1, 4)]; |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1199 if (v->mv_mode == MV_PMODE_INTENSITY_COMP) |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1200 { |
3406 | 1201 int scale, shift, i; |
5511 | 1202 v->mv_mode2 = ff_vc1_mv_pmode_table2[lowquant][get_unary(gb, 1, 3)]; |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1203 v->lumscale = get_bits(gb, 6); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1204 v->lumshift = get_bits(gb, 6); |
3744
805aee1f7cce
For B-frames if the second reference frame signals intensity compensation
kostya
parents:
3743
diff
changeset
|
1205 v->use_ic = 1; |
3406 | 1206 /* fill lookup tables for intensity compensation */ |
1207 if(!v->lumscale) { | |
1208 scale = -64; | |
1209 shift = (255 - v->lumshift * 2) << 6; | |
1210 if(v->lumshift > 31) | |
1211 shift += 128 << 6; | |
1212 } else { | |
1213 scale = v->lumscale + 32; | |
1214 if(v->lumshift > 31) | |
1215 shift = (v->lumshift - 64) << 6; | |
1216 else | |
1217 shift = v->lumshift << 6; | |
1218 } | |
1219 for(i = 0; i < 256; i++) { | |
4594 | 1220 v->luty[i] = av_clip_uint8((scale * i + shift + 32) >> 6); |
1221 v->lutuv[i] = av_clip_uint8((scale * (i - 128) + 128*64 + 32) >> 6); | |
3406 | 1222 } |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1223 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1224 if(v->mv_mode == MV_PMODE_1MV_HPEL || v->mv_mode == MV_PMODE_1MV_HPEL_BILIN) |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
1225 v->s.quarter_sample = 0; |
3401 | 1226 else if(v->mv_mode == MV_PMODE_INTENSITY_COMP) { |
1227 if(v->mv_mode2 == MV_PMODE_1MV_HPEL || v->mv_mode2 == MV_PMODE_1MV_HPEL_BILIN) | |
1228 v->s.quarter_sample = 0; | |
1229 else | |
1230 v->s.quarter_sample = 1; | |
1231 } else | |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
1232 v->s.quarter_sample = 1; |
3523
7407a264d243
Set MpegEncContext->mspel flag (here it indicates that bicubic MC will be use)
kostya
parents:
3522
diff
changeset
|
1233 v->s.mspel = !(v->mv_mode == MV_PMODE_1MV_HPEL_BILIN || (v->mv_mode == MV_PMODE_INTENSITY_COMP && v->mv_mode2 == MV_PMODE_1MV_HPEL_BILIN)); |
3359 | 1234 |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1235 if ((v->mv_mode == MV_PMODE_INTENSITY_COMP && |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1236 v->mv_mode2 == MV_PMODE_MIXED_MV) |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1237 || v->mv_mode == MV_PMODE_MIXED_MV) |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1238 { |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
1239 status = bitplane_decoding(v->mv_type_mb_plane, &v->mv_type_is_raw, v); |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1240 if (status < 0) return -1; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1241 av_log(v->s.avctx, AV_LOG_DEBUG, "MB MV Type plane encoding: " |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1242 "Imode: %i, Invert: %i\n", status>>1, status&1); |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
1243 } else { |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
1244 v->mv_type_is_raw = 0; |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
1245 memset(v->mv_type_mb_plane, 0, v->s.mb_stride * v->s.mb_height); |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1246 } |
3375
a1c2e1603be9
Use MpegEncContext->mbskip_table instead of custom bitplane.
kostya
parents:
3371
diff
changeset
|
1247 status = bitplane_decoding(v->s.mbskip_table, &v->skip_is_raw, v); |
3359 | 1248 if (status < 0) return -1; |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1249 av_log(v->s.avctx, AV_LOG_DEBUG, "MB Skip plane encoding: " |
3359 | 1250 "Imode: %i, Invert: %i\n", status>>1, status&1); |
1251 | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1252 /* Hopefully this is correct for P frames */ |
4949 | 1253 v->s.mv_table_index = get_bits(gb, 2); //but using ff_vc1_ tables |
1254 v->cbpcy_vlc = &ff_vc1_cbpcy_p_vlc[get_bits(gb, 2)]; | |
3359 | 1255 |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1256 if (v->dquant) |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1257 { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1258 av_log(v->s.avctx, AV_LOG_DEBUG, "VOP DQuant info\n"); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1259 vop_dquant_decoding(v); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1260 } |
3359 | 1261 |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1262 v->ttfrm = 0; //FIXME Is that so ? |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1263 if (v->vstransform) |
3359 | 1264 { |
5513 | 1265 v->ttmbf = get_bits1(gb); |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1266 if (v->ttmbf) |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1267 { |
4949 | 1268 v->ttfrm = ff_vc1_ttfrm_to_tt[get_bits(gb, 2)]; |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1269 } |
3506
e0996476198b
Set correctly quantizer and transform mode when parsing frame header.
kostya
parents:
3476
diff
changeset
|
1270 } else { |
e0996476198b
Set correctly quantizer and transform mode when parsing frame header.
kostya
parents:
3476
diff
changeset
|
1271 v->ttmbf = 1; |
e0996476198b
Set correctly quantizer and transform mode when parsing frame header.
kostya
parents:
3476
diff
changeset
|
1272 v->ttfrm = TT_8X8; |
3359 | 1273 } |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1274 break; |
6481 | 1275 case FF_B_TYPE: |
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1276 if (v->pq < 5) v->tt_index = 0; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1277 else if(v->pq < 13) v->tt_index = 1; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1278 else v->tt_index = 2; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1279 |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1280 lowquant = (v->pq > 12) ? 0 : 1; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1281 v->mv_mode = get_bits1(gb) ? MV_PMODE_1MV : MV_PMODE_1MV_HPEL_BILIN; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1282 v->s.quarter_sample = (v->mv_mode == MV_PMODE_1MV); |
3523
7407a264d243
Set MpegEncContext->mspel flag (here it indicates that bicubic MC will be use)
kostya
parents:
3522
diff
changeset
|
1283 v->s.mspel = v->s.quarter_sample; |
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1284 |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1285 status = bitplane_decoding(v->direct_mb_plane, &v->dmb_is_raw, v); |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1286 if (status < 0) return -1; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1287 av_log(v->s.avctx, AV_LOG_DEBUG, "MB Direct Type plane encoding: " |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1288 "Imode: %i, Invert: %i\n", status>>1, status&1); |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1289 status = bitplane_decoding(v->s.mbskip_table, &v->skip_is_raw, v); |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1290 if (status < 0) return -1; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1291 av_log(v->s.avctx, AV_LOG_DEBUG, "MB Skip plane encoding: " |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1292 "Imode: %i, Invert: %i\n", status>>1, status&1); |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1293 |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1294 v->s.mv_table_index = get_bits(gb, 2); |
4949 | 1295 v->cbpcy_vlc = &ff_vc1_cbpcy_p_vlc[get_bits(gb, 2)]; |
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1296 |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1297 if (v->dquant) |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1298 { |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1299 av_log(v->s.avctx, AV_LOG_DEBUG, "VOP DQuant info\n"); |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1300 vop_dquant_decoding(v); |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1301 } |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1302 |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1303 v->ttfrm = 0; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1304 if (v->vstransform) |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1305 { |
5513 | 1306 v->ttmbf = get_bits1(gb); |
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1307 if (v->ttmbf) |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1308 { |
4949 | 1309 v->ttfrm = ff_vc1_ttfrm_to_tt[get_bits(gb, 2)]; |
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1310 } |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1311 } else { |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1312 v->ttmbf = 1; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1313 v->ttfrm = TT_8X8; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1314 } |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1315 break; |
3359 | 1316 } |
1317 | |
5892 | 1318 if(!v->x8_type) |
3359 | 1319 { |
5892 | 1320 /* AC Syntax */ |
1321 v->c_ac_table_index = decode012(gb); | |
6481 | 1322 if (v->s.pict_type == FF_I_TYPE || v->s.pict_type == FF_BI_TYPE) |
5892 | 1323 { |
1324 v->y_ac_table_index = decode012(gb); | |
1325 } | |
1326 /* DC Syntax */ | |
1327 v->s.dc_table_index = get_bits1(gb); | |
3359 | 1328 } |
1329 | |
6481 | 1330 if(v->s.pict_type == FF_BI_TYPE) { |
1331 v->s.pict_type = FF_B_TYPE; | |
3689 | 1332 v->bi_type = 1; |
1333 } | |
3359 | 1334 return 0; |
1335 } | |
1336 | |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1337 static int vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb) |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1338 { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1339 int pqindex, lowquant; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1340 int status; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1341 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1342 v->p_frame_skipped = 0; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1343 |
4487
0a0a9f0c9c2d
Progressive frames disguised as interlaced are supported
kostya
parents:
4486
diff
changeset
|
1344 if(v->interlace){ |
4471 | 1345 v->fcm = decode012(gb); |
4487
0a0a9f0c9c2d
Progressive frames disguised as interlaced are supported
kostya
parents:
4486
diff
changeset
|
1346 if(v->fcm) return -1; // interlaced frames/fields are not implemented |
0a0a9f0c9c2d
Progressive frames disguised as interlaced are supported
kostya
parents:
4486
diff
changeset
|
1347 } |
5511 | 1348 switch(get_unary(gb, 0, 4)) { |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1349 case 0: |
6481 | 1350 v->s.pict_type = FF_P_TYPE; |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1351 break; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1352 case 1: |
6481 | 1353 v->s.pict_type = FF_B_TYPE; |
4238 | 1354 break; |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1355 case 2: |
6481 | 1356 v->s.pict_type = FF_I_TYPE; |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1357 break; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1358 case 3: |
6481 | 1359 v->s.pict_type = FF_BI_TYPE; |
3693 | 1360 break; |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1361 case 4: |
6481 | 1362 v->s.pict_type = FF_P_TYPE; // skipped pic |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1363 v->p_frame_skipped = 1; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1364 return 0; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1365 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1366 if(v->tfcntrflag) |
5519 | 1367 skip_bits(gb, 8); |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1368 if(v->broadcast) { |
4485 | 1369 if(!v->interlace || v->psf) { |
4471 | 1370 v->rptfrm = get_bits(gb, 2); |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1371 } else { |
4471 | 1372 v->tff = get_bits1(gb); |
1373 v->rptfrm = get_bits1(gb); | |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1374 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1375 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1376 if(v->panscanflag) { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1377 //... |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1378 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1379 v->rnd = get_bits1(gb); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1380 if(v->interlace) |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1381 v->uvsamp = get_bits1(gb); |
5513 | 1382 if(v->finterpflag) v->interpfrm = get_bits1(gb); |
6481 | 1383 if(v->s.pict_type == FF_B_TYPE) { |
8692
48442253aac2
Record B-fraction index from frame header and two fields from entry point structure
kostya
parents:
8685
diff
changeset
|
1384 v->bfraction_lut_index = get_vlc2(gb, ff_vc1_bfraction_vlc.table, VC1_BFRACTION_VLC_BITS, 1); |
48442253aac2
Record B-fraction index from frame header and two fields from entry point structure
kostya
parents:
8685
diff
changeset
|
1385 v->bfraction = ff_vc1_bfraction_lut[v->bfraction_lut_index]; |
4238 | 1386 if(v->bfraction == 0) { |
6481 | 1387 v->s.pict_type = FF_BI_TYPE; /* XXX: should not happen here */ |
4238 | 1388 } |
1389 } | |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1390 pqindex = get_bits(gb, 5); |
6150 | 1391 if(!pqindex) return -1; |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1392 v->pqindex = pqindex; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1393 if (v->quantizer_mode == QUANT_FRAME_IMPLICIT) |
4949 | 1394 v->pq = ff_vc1_pquant_table[0][pqindex]; |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1395 else |
4949 | 1396 v->pq = ff_vc1_pquant_table[1][pqindex]; |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1397 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1398 v->pquantizer = 1; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1399 if (v->quantizer_mode == QUANT_FRAME_IMPLICIT) |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1400 v->pquantizer = pqindex < 9; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1401 if (v->quantizer_mode == QUANT_NON_UNIFORM) |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1402 v->pquantizer = 0; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1403 v->pqindex = pqindex; |
5513 | 1404 if (pqindex < 9) v->halfpq = get_bits1(gb); |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1405 else v->halfpq = 0; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1406 if (v->quantizer_mode == QUANT_FRAME_EXPLICIT) |
5513 | 1407 v->pquantizer = get_bits1(gb); |
8152
cddc3677e7dc
421l: postproc flag may be present in any VC-1 AP frame type
kostya
parents:
7846
diff
changeset
|
1408 if(v->postprocflag) |
8639
29096719e684
VC-1 postproc field is 2 bits wide while decoder read only single bit.
kostya
parents:
8632
diff
changeset
|
1409 v->postproc = get_bits(gb, 2); |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1410 |
6481 | 1411 if(v->s.pict_type == FF_I_TYPE || v->s.pict_type == FF_P_TYPE) v->use_ic = 0; |
4518
e3c43b4aa9ac
Intensity compensation for B-frames in AP was missing
kostya
parents:
4487
diff
changeset
|
1412 |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1413 switch(v->s.pict_type) { |
6481 | 1414 case FF_I_TYPE: |
1415 case FF_BI_TYPE: | |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1416 status = bitplane_decoding(v->acpred_plane, &v->acpred_is_raw, v); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1417 if (status < 0) return -1; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1418 av_log(v->s.avctx, AV_LOG_DEBUG, "ACPRED plane encoding: " |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1419 "Imode: %i, Invert: %i\n", status>>1, status&1); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1420 v->condover = CONDOVER_NONE; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1421 if(v->overlap && v->pq <= 8) { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1422 v->condover = decode012(gb); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1423 if(v->condover == CONDOVER_SELECT) { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1424 status = bitplane_decoding(v->over_flags_plane, &v->overflg_is_raw, v); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1425 if (status < 0) return -1; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1426 av_log(v->s.avctx, AV_LOG_DEBUG, "CONDOVER plane encoding: " |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1427 "Imode: %i, Invert: %i\n", status>>1, status&1); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1428 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1429 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1430 break; |
6481 | 1431 case FF_P_TYPE: |
5511 | 1432 if (v->extended_mv) v->mvrange = get_unary(gb, 0, 3); |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1433 else v->mvrange = 0; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1434 v->k_x = v->mvrange + 9 + (v->mvrange >> 1); //k_x can be 9 10 12 13 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1435 v->k_y = v->mvrange + 8; //k_y can be 8 9 10 11 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1436 v->range_x = 1 << (v->k_x - 1); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1437 v->range_y = 1 << (v->k_y - 1); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1438 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1439 if (v->pq < 5) v->tt_index = 0; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1440 else if(v->pq < 13) v->tt_index = 1; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1441 else v->tt_index = 2; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1442 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1443 lowquant = (v->pq > 12) ? 0 : 1; |
5511 | 1444 v->mv_mode = ff_vc1_mv_pmode_table[lowquant][get_unary(gb, 1, 4)]; |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1445 if (v->mv_mode == MV_PMODE_INTENSITY_COMP) |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1446 { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1447 int scale, shift, i; |
5511 | 1448 v->mv_mode2 = ff_vc1_mv_pmode_table2[lowquant][get_unary(gb, 1, 3)]; |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1449 v->lumscale = get_bits(gb, 6); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1450 v->lumshift = get_bits(gb, 6); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1451 /* fill lookup tables for intensity compensation */ |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1452 if(!v->lumscale) { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1453 scale = -64; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1454 shift = (255 - v->lumshift * 2) << 6; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1455 if(v->lumshift > 31) |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1456 shift += 128 << 6; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1457 } else { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1458 scale = v->lumscale + 32; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1459 if(v->lumshift > 31) |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1460 shift = (v->lumshift - 64) << 6; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1461 else |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1462 shift = v->lumshift << 6; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1463 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1464 for(i = 0; i < 256; i++) { |
4594 | 1465 v->luty[i] = av_clip_uint8((scale * i + shift + 32) >> 6); |
1466 v->lutuv[i] = av_clip_uint8((scale * (i - 128) + 128*64 + 32) >> 6); | |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1467 } |
4518
e3c43b4aa9ac
Intensity compensation for B-frames in AP was missing
kostya
parents:
4487
diff
changeset
|
1468 v->use_ic = 1; |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1469 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1470 if(v->mv_mode == MV_PMODE_1MV_HPEL || v->mv_mode == MV_PMODE_1MV_HPEL_BILIN) |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1471 v->s.quarter_sample = 0; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1472 else if(v->mv_mode == MV_PMODE_INTENSITY_COMP) { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1473 if(v->mv_mode2 == MV_PMODE_1MV_HPEL || v->mv_mode2 == MV_PMODE_1MV_HPEL_BILIN) |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1474 v->s.quarter_sample = 0; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1475 else |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1476 v->s.quarter_sample = 1; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1477 } else |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1478 v->s.quarter_sample = 1; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1479 v->s.mspel = !(v->mv_mode == MV_PMODE_1MV_HPEL_BILIN || (v->mv_mode == MV_PMODE_INTENSITY_COMP && v->mv_mode2 == MV_PMODE_1MV_HPEL_BILIN)); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1480 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1481 if ((v->mv_mode == MV_PMODE_INTENSITY_COMP && |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1482 v->mv_mode2 == MV_PMODE_MIXED_MV) |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1483 || v->mv_mode == MV_PMODE_MIXED_MV) |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1484 { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1485 status = bitplane_decoding(v->mv_type_mb_plane, &v->mv_type_is_raw, v); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1486 if (status < 0) return -1; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1487 av_log(v->s.avctx, AV_LOG_DEBUG, "MB MV Type plane encoding: " |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1488 "Imode: %i, Invert: %i\n", status>>1, status&1); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1489 } else { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1490 v->mv_type_is_raw = 0; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1491 memset(v->mv_type_mb_plane, 0, v->s.mb_stride * v->s.mb_height); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1492 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1493 status = bitplane_decoding(v->s.mbskip_table, &v->skip_is_raw, v); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1494 if (status < 0) return -1; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1495 av_log(v->s.avctx, AV_LOG_DEBUG, "MB Skip plane encoding: " |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1496 "Imode: %i, Invert: %i\n", status>>1, status&1); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1497 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1498 /* Hopefully this is correct for P frames */ |
4949 | 1499 v->s.mv_table_index = get_bits(gb, 2); //but using ff_vc1_ tables |
1500 v->cbpcy_vlc = &ff_vc1_cbpcy_p_vlc[get_bits(gb, 2)]; | |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1501 if (v->dquant) |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1502 { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1503 av_log(v->s.avctx, AV_LOG_DEBUG, "VOP DQuant info\n"); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1504 vop_dquant_decoding(v); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1505 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1506 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1507 v->ttfrm = 0; //FIXME Is that so ? |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1508 if (v->vstransform) |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1509 { |
5513 | 1510 v->ttmbf = get_bits1(gb); |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1511 if (v->ttmbf) |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1512 { |
4949 | 1513 v->ttfrm = ff_vc1_ttfrm_to_tt[get_bits(gb, 2)]; |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1514 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1515 } else { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1516 v->ttmbf = 1; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1517 v->ttfrm = TT_8X8; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1518 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1519 break; |
6481 | 1520 case FF_B_TYPE: |
5511 | 1521 if (v->extended_mv) v->mvrange = get_unary(gb, 0, 3); |
4238 | 1522 else v->mvrange = 0; |
1523 v->k_x = v->mvrange + 9 + (v->mvrange >> 1); //k_x can be 9 10 12 13 | |
1524 v->k_y = v->mvrange + 8; //k_y can be 8 9 10 11 | |
1525 v->range_x = 1 << (v->k_x - 1); | |
1526 v->range_y = 1 << (v->k_y - 1); | |
1527 | |
1528 if (v->pq < 5) v->tt_index = 0; | |
1529 else if(v->pq < 13) v->tt_index = 1; | |
1530 else v->tt_index = 2; | |
1531 | |
1532 lowquant = (v->pq > 12) ? 0 : 1; | |
1533 v->mv_mode = get_bits1(gb) ? MV_PMODE_1MV : MV_PMODE_1MV_HPEL_BILIN; | |
1534 v->s.quarter_sample = (v->mv_mode == MV_PMODE_1MV); | |
1535 v->s.mspel = v->s.quarter_sample; | |
1536 | |
1537 status = bitplane_decoding(v->direct_mb_plane, &v->dmb_is_raw, v); | |
1538 if (status < 0) return -1; | |
1539 av_log(v->s.avctx, AV_LOG_DEBUG, "MB Direct Type plane encoding: " | |
1540 "Imode: %i, Invert: %i\n", status>>1, status&1); | |
1541 status = bitplane_decoding(v->s.mbskip_table, &v->skip_is_raw, v); | |
1542 if (status < 0) return -1; | |
1543 av_log(v->s.avctx, AV_LOG_DEBUG, "MB Skip plane encoding: " | |
1544 "Imode: %i, Invert: %i\n", status>>1, status&1); | |
1545 | |
1546 v->s.mv_table_index = get_bits(gb, 2); | |
4949 | 1547 v->cbpcy_vlc = &ff_vc1_cbpcy_p_vlc[get_bits(gb, 2)]; |
4238 | 1548 |
1549 if (v->dquant) | |
1550 { | |
1551 av_log(v->s.avctx, AV_LOG_DEBUG, "VOP DQuant info\n"); | |
1552 vop_dquant_decoding(v); | |
1553 } | |
1554 | |
1555 v->ttfrm = 0; | |
1556 if (v->vstransform) | |
1557 { | |
5513 | 1558 v->ttmbf = get_bits1(gb); |
4238 | 1559 if (v->ttmbf) |
1560 { | |
4949 | 1561 v->ttfrm = ff_vc1_ttfrm_to_tt[get_bits(gb, 2)]; |
4238 | 1562 } |
1563 } else { | |
1564 v->ttmbf = 1; | |
1565 v->ttfrm = TT_8X8; | |
1566 } | |
1567 break; | |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1568 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1569 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1570 /* AC Syntax */ |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1571 v->c_ac_table_index = decode012(gb); |
6481 | 1572 if (v->s.pict_type == FF_I_TYPE || v->s.pict_type == FF_BI_TYPE) |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1573 { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1574 v->y_ac_table_index = decode012(gb); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1575 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1576 /* DC Syntax */ |
5513 | 1577 v->s.dc_table_index = get_bits1(gb); |
6481 | 1578 if ((v->s.pict_type == FF_I_TYPE || v->s.pict_type == FF_BI_TYPE) && v->dquant) { |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1579 av_log(v->s.avctx, AV_LOG_DEBUG, "VOP DQuant info\n"); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1580 vop_dquant_decoding(v); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1581 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1582 |
3693 | 1583 v->bi_type = 0; |
6481 | 1584 if(v->s.pict_type == FF_BI_TYPE) { |
1585 v->s.pict_type = FF_B_TYPE; | |
3693 | 1586 v->bi_type = 1; |
1587 } | |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1588 return 0; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1589 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1590 |
3359 | 1591 /***********************************************************************/ |
1592 /** | |
8685 | 1593 * @defgroup vc1block VC-1 Block-level functions |
3359 | 1594 * @see 7.1.4, p91 and 8.1.1.7, p(1)04 |
1595 * @{ | |
1596 */ | |
1597 | |
1598 /** | |
1599 * @def GET_MQUANT | |
1600 * @brief Get macroblock-level quantizer scale | |
1601 */ | |
1602 #define GET_MQUANT() \ | |
1603 if (v->dquantfrm) \ | |
1604 { \ | |
3404 | 1605 int edges = 0; \ |
3359 | 1606 if (v->dqprofile == DQPROFILE_ALL_MBS) \ |
1607 { \ | |
1608 if (v->dqbilevel) \ | |
1609 { \ | |
5513 | 1610 mquant = (get_bits1(gb)) ? v->altpq : v->pq; \ |
3359 | 1611 } \ |
1612 else \ | |
1613 { \ | |
1614 mqdiff = get_bits(gb, 3); \ | |
1615 if (mqdiff != 7) mquant = v->pq + mqdiff; \ | |
1616 else mquant = get_bits(gb, 5); \ | |
1617 } \ | |
1618 } \ | |
3404 | 1619 if(v->dqprofile == DQPROFILE_SINGLE_EDGE) \ |
1620 edges = 1 << v->dqsbedge; \ | |
3396 | 1621 else if(v->dqprofile == DQPROFILE_DOUBLE_EDGES) \ |
3404 | 1622 edges = (3 << v->dqsbedge) % 15; \ |
3396 | 1623 else if(v->dqprofile == DQPROFILE_FOUR_EDGES) \ |
3404 | 1624 edges = 15; \ |
1625 if((edges&1) && !s->mb_x) \ | |
1626 mquant = v->altpq; \ | |
3451 | 1627 if((edges&2) && s->first_slice_line) \ |
3404 | 1628 mquant = v->altpq; \ |
1629 if((edges&4) && s->mb_x == (s->mb_width - 1)) \ | |
1630 mquant = v->altpq; \ | |
1631 if((edges&8) && s->mb_y == (s->mb_height - 1)) \ | |
1632 mquant = v->altpq; \ | |
3359 | 1633 } |
1634 | |
1635 /** | |
1636 * @def GET_MVDATA(_dmv_x, _dmv_y) | |
1637 * @brief Get MV differentials | |
1638 * @see MVDATA decoding from 8.3.5.2, p(1)20 | |
1639 * @param _dmv_x Horizontal differential for decoded MV | |
1640 * @param _dmv_y Vertical differential for decoded MV | |
1641 */ | |
1642 #define GET_MVDATA(_dmv_x, _dmv_y) \ | |
4949 | 1643 index = 1 + get_vlc2(gb, ff_vc1_mv_diff_vlc[s->mv_table_index].table,\ |
3359 | 1644 VC1_MV_DIFF_VLC_BITS, 2); \ |
1645 if (index > 36) \ | |
1646 { \ | |
1647 mb_has_coeffs = 1; \ | |
1648 index -= 37; \ | |
1649 } \ | |
1650 else mb_has_coeffs = 0; \ | |
1651 s->mb_intra = 0; \ | |
1652 if (!index) { _dmv_x = _dmv_y = 0; } \ | |
1653 else if (index == 35) \ | |
1654 { \ | |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
1655 _dmv_x = get_bits(gb, v->k_x - 1 + s->quarter_sample); \ |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
1656 _dmv_y = get_bits(gb, v->k_y - 1 + s->quarter_sample); \ |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1657 } \ |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1658 else if (index == 36) \ |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1659 { \ |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1660 _dmv_x = 0; \ |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1661 _dmv_y = 0; \ |
3359 | 1662 s->mb_intra = 1; \ |
1663 } \ | |
1664 else \ | |
1665 { \ | |
1666 index1 = index%6; \ | |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
1667 if (!s->quarter_sample && index1 == 5) val = 1; \ |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
1668 else val = 0; \ |
3366
c59aa4cdf042
This should make P-frames decoding work on x86 (by avoiding get_bits(0))
kostya
parents:
3364
diff
changeset
|
1669 if(size_table[index1] - val > 0) \ |
c59aa4cdf042
This should make P-frames decoding work on x86 (by avoiding get_bits(0))
kostya
parents:
3364
diff
changeset
|
1670 val = get_bits(gb, size_table[index1] - val); \ |
c59aa4cdf042
This should make P-frames decoding work on x86 (by avoiding get_bits(0))
kostya
parents:
3364
diff
changeset
|
1671 else val = 0; \ |
3359 | 1672 sign = 0 - (val&1); \ |
1673 _dmv_x = (sign ^ ((val>>1) + offset_table[index1])) - sign; \ | |
1674 \ | |
1675 index1 = index/6; \ | |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
1676 if (!s->quarter_sample && index1 == 5) val = 1; \ |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
1677 else val = 0; \ |
3366
c59aa4cdf042
This should make P-frames decoding work on x86 (by avoiding get_bits(0))
kostya
parents:
3364
diff
changeset
|
1678 if(size_table[index1] - val > 0) \ |
c59aa4cdf042
This should make P-frames decoding work on x86 (by avoiding get_bits(0))
kostya
parents:
3364
diff
changeset
|
1679 val = get_bits(gb, size_table[index1] - val); \ |
c59aa4cdf042
This should make P-frames decoding work on x86 (by avoiding get_bits(0))
kostya
parents:
3364
diff
changeset
|
1680 else val = 0; \ |
3359 | 1681 sign = 0 - (val&1); \ |
1682 _dmv_y = (sign ^ ((val>>1) + offset_table[index1])) - sign; \ | |
1683 } | |
1684 | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1685 /** Predict and set motion vector |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1686 */ |
3396 | 1687 static inline void vc1_pred_mv(MpegEncContext *s, int n, int dmv_x, int dmv_y, int mv1, int r_x, int r_y, uint8_t* is_intra) |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1688 { |
3396 | 1689 int xy, wrap, off = 0; |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1690 int16_t *A, *B, *C; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1691 int px, py; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1692 int sum; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1693 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1694 /* scale MV difference to be quad-pel */ |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
1695 dmv_x <<= 1 - s->quarter_sample; |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
1696 dmv_y <<= 1 - s->quarter_sample; |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1697 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1698 wrap = s->b8_stride; |
3396 | 1699 xy = s->block_index[n]; |
1700 | |
1701 if(s->mb_intra){ | |
1702 s->mv[0][n][0] = s->current_picture.motion_val[0][xy][0] = 0; | |
1703 s->mv[0][n][1] = s->current_picture.motion_val[0][xy][1] = 0; | |
4683 | 1704 s->current_picture.motion_val[1][xy][0] = 0; |
1705 s->current_picture.motion_val[1][xy][1] = 0; | |
3396 | 1706 if(mv1) { /* duplicate motion data for 1-MV block */ |
1707 s->current_picture.motion_val[0][xy + 1][0] = 0; | |
1708 s->current_picture.motion_val[0][xy + 1][1] = 0; | |
1709 s->current_picture.motion_val[0][xy + wrap][0] = 0; | |
1710 s->current_picture.motion_val[0][xy + wrap][1] = 0; | |
1711 s->current_picture.motion_val[0][xy + wrap + 1][0] = 0; | |
1712 s->current_picture.motion_val[0][xy + wrap + 1][1] = 0; | |
4683 | 1713 s->current_picture.motion_val[1][xy + 1][0] = 0; |
1714 s->current_picture.motion_val[1][xy + 1][1] = 0; | |
1715 s->current_picture.motion_val[1][xy + wrap][0] = 0; | |
1716 s->current_picture.motion_val[1][xy + wrap][1] = 0; | |
1717 s->current_picture.motion_val[1][xy + wrap + 1][0] = 0; | |
1718 s->current_picture.motion_val[1][xy + wrap + 1][1] = 0; | |
3396 | 1719 } |
1720 return; | |
1721 } | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1722 |
3396 | 1723 C = s->current_picture.motion_val[0][xy - 1]; |
1724 A = s->current_picture.motion_val[0][xy - wrap]; | |
1725 if(mv1) | |
1726 off = (s->mb_x == (s->mb_width - 1)) ? -1 : 2; | |
1727 else { | |
1728 //in 4-MV mode different blocks have different B predictor position | |
1729 switch(n){ | |
1730 case 0: | |
1731 off = (s->mb_x > 0) ? -1 : 1; | |
1732 break; | |
1733 case 1: | |
1734 off = (s->mb_x == (s->mb_width - 1)) ? -1 : 1; | |
1735 break; | |
1736 case 2: | |
1737 off = 1; | |
1738 break; | |
1739 case 3: | |
1740 off = -1; | |
1741 } | |
1742 } | |
1743 B = s->current_picture.motion_val[0][xy - wrap + off]; | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1744 |
3396 | 1745 if(!s->first_slice_line || (n==2 || n==3)) { // predictor A is not out of bounds |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1746 if(s->mb_width == 1) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1747 px = A[0]; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1748 py = A[1]; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1749 } else { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1750 px = mid_pred(A[0], B[0], C[0]); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1751 py = mid_pred(A[1], B[1], C[1]); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1752 } |
3396 | 1753 } else if(s->mb_x || (n==1 || n==3)) { // predictor C is not out of bounds |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1754 px = C[0]; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1755 py = C[1]; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1756 } else { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1757 px = py = 0; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1758 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1759 /* Pullback MV as specified in 8.3.5.3.4 */ |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1760 { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1761 int qx, qy, X, Y; |
3400
84de54d536bd
4-MV mode final fixes (now it works for non-exotic modes)
kostya
parents:
3399
diff
changeset
|
1762 qx = (s->mb_x << 6) + ((n==1 || n==3) ? 32 : 0); |
84de54d536bd
4-MV mode final fixes (now it works for non-exotic modes)
kostya
parents:
3399
diff
changeset
|
1763 qy = (s->mb_y << 6) + ((n==2 || n==3) ? 32 : 0); |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1764 X = (s->mb_width << 6) - 4; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1765 Y = (s->mb_height << 6) - 4; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1766 if(mv1) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1767 if(qx + px < -60) px = -60 - qx; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1768 if(qy + py < -60) py = -60 - qy; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1769 } else { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1770 if(qx + px < -28) px = -28 - qx; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1771 if(qy + py < -28) py = -28 - qy; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1772 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1773 if(qx + px > X) px = X - qx; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1774 if(qy + py > Y) py = Y - qy; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1775 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1776 /* Calculate hybrid prediction as specified in 8.3.5.3.5 */ |
3396 | 1777 if((!s->first_slice_line || (n==2 || n==3)) && (s->mb_x || (n==1 || n==3))) { |
1778 if(is_intra[xy - wrap]) | |
4001 | 1779 sum = FFABS(px) + FFABS(py); |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1780 else |
4001 | 1781 sum = FFABS(px - A[0]) + FFABS(py - A[1]); |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1782 if(sum > 32) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1783 if(get_bits1(&s->gb)) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1784 px = A[0]; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1785 py = A[1]; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1786 } else { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1787 px = C[0]; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1788 py = C[1]; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1789 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1790 } else { |
3396 | 1791 if(is_intra[xy - 1]) |
4001 | 1792 sum = FFABS(px) + FFABS(py); |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1793 else |
4001 | 1794 sum = FFABS(px - C[0]) + FFABS(py - C[1]); |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1795 if(sum > 32) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1796 if(get_bits1(&s->gb)) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1797 px = A[0]; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1798 py = A[1]; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1799 } else { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1800 px = C[0]; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1801 py = C[1]; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1802 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1803 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1804 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1805 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1806 /* store MV using signed modulus of MV range defined in 4.11 */ |
3396 | 1807 s->mv[0][n][0] = s->current_picture.motion_val[0][xy][0] = ((px + dmv_x + r_x) & ((r_x << 1) - 1)) - r_x; |
1808 s->mv[0][n][1] = s->current_picture.motion_val[0][xy][1] = ((py + dmv_y + r_y) & ((r_y << 1) - 1)) - r_y; | |
1809 if(mv1) { /* duplicate motion data for 1-MV block */ | |
1810 s->current_picture.motion_val[0][xy + 1][0] = s->current_picture.motion_val[0][xy][0]; | |
1811 s->current_picture.motion_val[0][xy + 1][1] = s->current_picture.motion_val[0][xy][1]; | |
1812 s->current_picture.motion_val[0][xy + wrap][0] = s->current_picture.motion_val[0][xy][0]; | |
1813 s->current_picture.motion_val[0][xy + wrap][1] = s->current_picture.motion_val[0][xy][1]; | |
1814 s->current_picture.motion_val[0][xy + wrap + 1][0] = s->current_picture.motion_val[0][xy][0]; | |
1815 s->current_picture.motion_val[0][xy + wrap + 1][1] = s->current_picture.motion_val[0][xy][1]; | |
1816 } | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1817 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1818 |
3553
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1819 /** Motion compensation for direct or interpolated blocks in B-frames |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1820 */ |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1821 static void vc1_interp_mc(VC1Context *v) |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1822 { |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1823 MpegEncContext *s = &v->s; |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1824 DSPContext *dsp = &v->s.dsp; |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1825 uint8_t *srcY, *srcU, *srcV; |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1826 int dxy, uvdxy, mx, my, uvmx, uvmy, src_x, src_y, uvsrc_x, uvsrc_y; |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1827 |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1828 if(!v->s.next_picture.data[0])return; |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1829 |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1830 mx = s->mv[1][0][0]; |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1831 my = s->mv[1][0][1]; |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1832 uvmx = (mx + ((mx & 3) == 3)) >> 1; |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1833 uvmy = (my + ((my & 3) == 3)) >> 1; |
4258
4d2f162506e3
10e6l FastUVMC was done right but in the wrong place
kostya
parents:
4247
diff
changeset
|
1834 if(v->fastuvmc) { |
4d2f162506e3
10e6l FastUVMC was done right but in the wrong place
kostya
parents:
4247
diff
changeset
|
1835 uvmx = uvmx + ((uvmx<0)?-(uvmx&1):(uvmx&1)); |
4d2f162506e3
10e6l FastUVMC was done right but in the wrong place
kostya
parents:
4247
diff
changeset
|
1836 uvmy = uvmy + ((uvmy<0)?-(uvmy&1):(uvmy&1)); |
4d2f162506e3
10e6l FastUVMC was done right but in the wrong place
kostya
parents:
4247
diff
changeset
|
1837 } |
3553
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1838 srcY = s->next_picture.data[0]; |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1839 srcU = s->next_picture.data[1]; |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1840 srcV = s->next_picture.data[2]; |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1841 |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1842 src_x = s->mb_x * 16 + (mx >> 2); |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1843 src_y = s->mb_y * 16 + (my >> 2); |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1844 uvsrc_x = s->mb_x * 8 + (uvmx >> 2); |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1845 uvsrc_y = s->mb_y * 8 + (uvmy >> 2); |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1846 |
4681 | 1847 if(v->profile != PROFILE_ADVANCED){ |
1848 src_x = av_clip( src_x, -16, s->mb_width * 16); | |
1849 src_y = av_clip( src_y, -16, s->mb_height * 16); | |
1850 uvsrc_x = av_clip(uvsrc_x, -8, s->mb_width * 8); | |
1851 uvsrc_y = av_clip(uvsrc_y, -8, s->mb_height * 8); | |
1852 }else{ | |
1853 src_x = av_clip( src_x, -17, s->avctx->coded_width); | |
1854 src_y = av_clip( src_y, -18, s->avctx->coded_height + 1); | |
1855 uvsrc_x = av_clip(uvsrc_x, -8, s->avctx->coded_width >> 1); | |
1856 uvsrc_y = av_clip(uvsrc_y, -8, s->avctx->coded_height >> 1); | |
1857 } | |
3553
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1858 |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1859 srcY += src_y * s->linesize + src_x; |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1860 srcU += uvsrc_y * s->uvlinesize + uvsrc_x; |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1861 srcV += uvsrc_y * s->uvlinesize + uvsrc_x; |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1862 |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1863 /* for grayscale we should not try to read from unknown area */ |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1864 if(s->flags & CODEC_FLAG_GRAY) { |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1865 srcU = s->edge_emu_buffer + 18 * s->linesize; |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1866 srcV = s->edge_emu_buffer + 18 * s->linesize; |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1867 } |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1868 |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1869 if(v->rangeredfrm |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1870 || (unsigned)src_x > s->h_edge_pos - (mx&3) - 16 |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1871 || (unsigned)src_y > s->v_edge_pos - (my&3) - 16){ |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1872 uint8_t *uvbuf= s->edge_emu_buffer + 19 * s->linesize; |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1873 |
3708 | 1874 srcY -= s->mspel * (1 + s->linesize); |
1875 ff_emulated_edge_mc(s->edge_emu_buffer, srcY, s->linesize, 17+s->mspel*2, 17+s->mspel*2, | |
3553
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1876 src_x - s->mspel, src_y - s->mspel, s->h_edge_pos, s->v_edge_pos); |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1877 srcY = s->edge_emu_buffer; |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1878 ff_emulated_edge_mc(uvbuf , srcU, s->uvlinesize, 8+1, 8+1, |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1879 uvsrc_x, uvsrc_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1); |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1880 ff_emulated_edge_mc(uvbuf + 16, srcV, s->uvlinesize, 8+1, 8+1, |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1881 uvsrc_x, uvsrc_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1); |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1882 srcU = uvbuf; |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1883 srcV = uvbuf + 16; |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1884 /* if we deal with range reduction we need to scale source blocks */ |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1885 if(v->rangeredfrm) { |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1886 int i, j; |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1887 uint8_t *src, *src2; |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1888 |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1889 src = srcY; |
3708 | 1890 for(j = 0; j < 17 + s->mspel*2; j++) { |
1891 for(i = 0; i < 17 + s->mspel*2; i++) src[i] = ((src[i] - 128) >> 1) + 128; | |
3553
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1892 src += s->linesize; |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1893 } |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1894 src = srcU; src2 = srcV; |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1895 for(j = 0; j < 9; j++) { |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1896 for(i = 0; i < 9; i++) { |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1897 src[i] = ((src[i] - 128) >> 1) + 128; |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1898 src2[i] = ((src2[i] - 128) >> 1) + 128; |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1899 } |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1900 src += s->uvlinesize; |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1901 src2 += s->uvlinesize; |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1902 } |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1903 } |
3708 | 1904 srcY += s->mspel * (1 + s->linesize); |
3553
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1905 } |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1906 |
9437 | 1907 if(s->mspel) { |
1908 dxy = ((my & 3) << 2) | (mx & 3); | |
1909 dsp->avg_vc1_mspel_pixels_tab[dxy](s->dest[0] , srcY , s->linesize, v->rnd); | |
1910 dsp->avg_vc1_mspel_pixels_tab[dxy](s->dest[0] + 8, srcY + 8, s->linesize, v->rnd); | |
1911 srcY += s->linesize * 8; | |
1912 dsp->avg_vc1_mspel_pixels_tab[dxy](s->dest[0] + 8 * s->linesize , srcY , s->linesize, v->rnd); | |
1913 dsp->avg_vc1_mspel_pixels_tab[dxy](s->dest[0] + 8 * s->linesize + 8, srcY + 8, s->linesize, v->rnd); | |
1914 } else { // hpel mc | |
1915 dxy = (my & 2) | ((mx & 2) >> 1); | |
1916 | |
1917 if(!v->rnd) | |
1918 dsp->avg_pixels_tab[0][dxy](s->dest[0], srcY, s->linesize, 16); | |
1919 else | |
1920 dsp->avg_no_rnd_pixels_tab[0][dxy](s->dest[0], srcY, s->linesize, 16); | |
1921 } | |
3553
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1922 |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1923 if(s->flags & CODEC_FLAG_GRAY) return; |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1924 /* Chroma MC always uses qpel blilinear */ |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1925 uvdxy = ((uvmy & 3) << 2) | (uvmx & 3); |
3709 | 1926 uvmx = (uvmx&3)<<1; |
1927 uvmy = (uvmy&3)<<1; | |
1928 dsp->avg_h264_chroma_pixels_tab[0](s->dest[1], srcU, s->uvlinesize, 8, uvmx, uvmy); | |
1929 dsp->avg_h264_chroma_pixels_tab[0](s->dest[2], srcV, s->uvlinesize, 8, uvmx, uvmy); | |
3553
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1930 } |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1931 |
4283
d6f83e2f8804
rename always_inline to av_always_inline and move to common.h
mru
parents:
4258
diff
changeset
|
1932 static av_always_inline int scale_mv(int value, int bfrac, int inv, int qs) |
3689 | 1933 { |
1934 int n = bfrac; | |
1935 | |
1936 #if B_FRACTION_DEN==256 | |
1937 if(inv) | |
1938 n -= 256; | |
1939 if(!qs) | |
1940 return 2 * ((value * n + 255) >> 9); | |
1941 return (value * n + 128) >> 8; | |
1942 #else | |
1943 if(inv) | |
1944 n -= B_FRACTION_DEN; | |
1945 if(!qs) | |
1946 return 2 * ((value * n + B_FRACTION_DEN - 1) / (2 * B_FRACTION_DEN)); | |
1947 return (value * n + B_FRACTION_DEN/2) / B_FRACTION_DEN; | |
1948 #endif | |
1949 } | |
1950 | |
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1951 /** Reconstruct motion vector for B-frame and do motion compensation |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1952 */ |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1953 static inline void vc1_b_mc(VC1Context *v, int dmv_x[2], int dmv_y[2], int direct, int mode) |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1954 { |
3744
805aee1f7cce
For B-frames if the second reference frame signals intensity compensation
kostya
parents:
3743
diff
changeset
|
1955 if(v->use_ic) { |
805aee1f7cce
For B-frames if the second reference frame signals intensity compensation
kostya
parents:
3743
diff
changeset
|
1956 v->mv_mode2 = v->mv_mode; |
805aee1f7cce
For B-frames if the second reference frame signals intensity compensation
kostya
parents:
3743
diff
changeset
|
1957 v->mv_mode = MV_PMODE_INTENSITY_COMP; |
805aee1f7cce
For B-frames if the second reference frame signals intensity compensation
kostya
parents:
3743
diff
changeset
|
1958 } |
3689 | 1959 if(direct) { |
1960 vc1_mc_1mv(v, 0); | |
1961 vc1_interp_mc(v); | |
3744
805aee1f7cce
For B-frames if the second reference frame signals intensity compensation
kostya
parents:
3743
diff
changeset
|
1962 if(v->use_ic) v->mv_mode = v->mv_mode2; |
3689 | 1963 return; |
1964 } | |
1965 if(mode == BMV_TYPE_INTERPOLATED) { | |
1966 vc1_mc_1mv(v, 0); | |
1967 vc1_interp_mc(v); | |
3744
805aee1f7cce
For B-frames if the second reference frame signals intensity compensation
kostya
parents:
3743
diff
changeset
|
1968 if(v->use_ic) v->mv_mode = v->mv_mode2; |
3689 | 1969 return; |
1970 } | |
1971 | |
3744
805aee1f7cce
For B-frames if the second reference frame signals intensity compensation
kostya
parents:
3743
diff
changeset
|
1972 if(v->use_ic && (mode == BMV_TYPE_BACKWARD)) v->mv_mode = v->mv_mode2; |
3711
4a5536551692
Swap back and forward motion vectors to achieve correct picture
kostya
parents:
3710
diff
changeset
|
1973 vc1_mc_1mv(v, (mode == BMV_TYPE_BACKWARD)); |
3744
805aee1f7cce
For B-frames if the second reference frame signals intensity compensation
kostya
parents:
3743
diff
changeset
|
1974 if(v->use_ic) v->mv_mode = v->mv_mode2; |
3689 | 1975 } |
1976 | |
1977 static inline void vc1_pred_b_mv(VC1Context *v, int dmv_x[2], int dmv_y[2], int direct, int mvtype) | |
1978 { | |
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1979 MpegEncContext *s = &v->s; |
3689 | 1980 int xy, wrap, off = 0; |
1981 int16_t *A, *B, *C; | |
1982 int px, py; | |
1983 int sum; | |
1984 int r_x, r_y; | |
1985 const uint8_t *is_intra = v->mb_type[0]; | |
1986 | |
1987 r_x = v->range_x; | |
1988 r_y = v->range_y; | |
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1989 /* scale MV difference to be quad-pel */ |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1990 dmv_x[0] <<= 1 - s->quarter_sample; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1991 dmv_y[0] <<= 1 - s->quarter_sample; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1992 dmv_x[1] <<= 1 - s->quarter_sample; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1993 dmv_y[1] <<= 1 - s->quarter_sample; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1994 |
3689 | 1995 wrap = s->b8_stride; |
1996 xy = s->block_index[0]; | |
1997 | |
1998 if(s->mb_intra) { | |
1999 s->current_picture.motion_val[0][xy][0] = | |
2000 s->current_picture.motion_val[0][xy][1] = | |
2001 s->current_picture.motion_val[1][xy][0] = | |
2002 s->current_picture.motion_val[1][xy][1] = 0; | |
2003 return; | |
2004 } | |
3743
fc613a610303
Reorder MV order in B-frames so no swapping in vc1_b_mc() is needed
kostya
parents:
3711
diff
changeset
|
2005 s->mv[0][0][0] = scale_mv(s->next_picture.motion_val[1][xy][0], v->bfraction, 0, s->quarter_sample); |
fc613a610303
Reorder MV order in B-frames so no swapping in vc1_b_mc() is needed
kostya
parents:
3711
diff
changeset
|
2006 s->mv[0][0][1] = scale_mv(s->next_picture.motion_val[1][xy][1], v->bfraction, 0, s->quarter_sample); |
fc613a610303
Reorder MV order in B-frames so no swapping in vc1_b_mc() is needed
kostya
parents:
3711
diff
changeset
|
2007 s->mv[1][0][0] = scale_mv(s->next_picture.motion_val[1][xy][0], v->bfraction, 1, s->quarter_sample); |
fc613a610303
Reorder MV order in B-frames so no swapping in vc1_b_mc() is needed
kostya
parents:
3711
diff
changeset
|
2008 s->mv[1][0][1] = scale_mv(s->next_picture.motion_val[1][xy][1], v->bfraction, 1, s->quarter_sample); |
4859
bc40c297ea15
Pullback should be performed on scaled motion vectors in B-frames
kostya
parents:
4834
diff
changeset
|
2009 |
bc40c297ea15
Pullback should be performed on scaled motion vectors in B-frames
kostya
parents:
4834
diff
changeset
|
2010 /* Pullback predicted motion vectors as specified in 8.4.5.4 */ |
bc40c297ea15
Pullback should be performed on scaled motion vectors in B-frames
kostya
parents:
4834
diff
changeset
|
2011 s->mv[0][0][0] = av_clip(s->mv[0][0][0], -60 - (s->mb_x << 6), (s->mb_width << 6) - 4 - (s->mb_x << 6)); |
bc40c297ea15
Pullback should be performed on scaled motion vectors in B-frames
kostya
parents:
4834
diff
changeset
|
2012 s->mv[0][0][1] = av_clip(s->mv[0][0][1], -60 - (s->mb_y << 6), (s->mb_height << 6) - 4 - (s->mb_y << 6)); |
bc40c297ea15
Pullback should be performed on scaled motion vectors in B-frames
kostya
parents:
4834
diff
changeset
|
2013 s->mv[1][0][0] = av_clip(s->mv[1][0][0], -60 - (s->mb_x << 6), (s->mb_width << 6) - 4 - (s->mb_x << 6)); |
bc40c297ea15
Pullback should be performed on scaled motion vectors in B-frames
kostya
parents:
4834
diff
changeset
|
2014 s->mv[1][0][1] = av_clip(s->mv[1][0][1], -60 - (s->mb_y << 6), (s->mb_height << 6) - 4 - (s->mb_y << 6)); |
3553
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2015 if(direct) { |
3689 | 2016 s->current_picture.motion_val[0][xy][0] = s->mv[0][0][0]; |
2017 s->current_picture.motion_val[0][xy][1] = s->mv[0][0][1]; | |
2018 s->current_picture.motion_val[1][xy][0] = s->mv[1][0][0]; | |
2019 s->current_picture.motion_val[1][xy][1] = s->mv[1][0][1]; | |
3553
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2020 return; |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2021 } |
3689 | 2022 |
3743
fc613a610303
Reorder MV order in B-frames so no swapping in vc1_b_mc() is needed
kostya
parents:
3711
diff
changeset
|
2023 if((mvtype == BMV_TYPE_FORWARD) || (mvtype == BMV_TYPE_INTERPOLATED)) { |
3689 | 2024 C = s->current_picture.motion_val[0][xy - 2]; |
2025 A = s->current_picture.motion_val[0][xy - wrap*2]; | |
2026 off = (s->mb_x == (s->mb_width - 1)) ? -2 : 2; | |
2027 B = s->current_picture.motion_val[0][xy - wrap*2 + off]; | |
2028 | |
4834
300b60dee58c
Set C predictor to zero if unavailable (should fix B-frame border artifacts)
kostya
parents:
4784
diff
changeset
|
2029 if(!s->mb_x) C[0] = C[1] = 0; |
3689 | 2030 if(!s->first_slice_line) { // predictor A is not out of bounds |
2031 if(s->mb_width == 1) { | |
2032 px = A[0]; | |
2033 py = A[1]; | |
2034 } else { | |
2035 px = mid_pred(A[0], B[0], C[0]); | |
2036 py = mid_pred(A[1], B[1], C[1]); | |
2037 } | |
2038 } else if(s->mb_x) { // predictor C is not out of bounds | |
2039 px = C[0]; | |
2040 py = C[1]; | |
2041 } else { | |
2042 px = py = 0; | |
2043 } | |
2044 /* Pullback MV as specified in 8.3.5.3.4 */ | |
2045 { | |
2046 int qx, qy, X, Y; | |
2047 if(v->profile < PROFILE_ADVANCED) { | |
2048 qx = (s->mb_x << 5); | |
2049 qy = (s->mb_y << 5); | |
2050 X = (s->mb_width << 5) - 4; | |
2051 Y = (s->mb_height << 5) - 4; | |
2052 if(qx + px < -28) px = -28 - qx; | |
2053 if(qy + py < -28) py = -28 - qy; | |
2054 if(qx + px > X) px = X - qx; | |
2055 if(qy + py > Y) py = Y - qy; | |
2056 } else { | |
2057 qx = (s->mb_x << 6); | |
2058 qy = (s->mb_y << 6); | |
2059 X = (s->mb_width << 6) - 4; | |
2060 Y = (s->mb_height << 6) - 4; | |
2061 if(qx + px < -60) px = -60 - qx; | |
2062 if(qy + py < -60) py = -60 - qy; | |
2063 if(qx + px > X) px = X - qx; | |
2064 if(qy + py > Y) py = Y - qy; | |
2065 } | |
2066 } | |
2067 /* Calculate hybrid prediction as specified in 8.3.5.3.5 */ | |
2068 if(0 && !s->first_slice_line && s->mb_x) { | |
2069 if(is_intra[xy - wrap]) | |
4001 | 2070 sum = FFABS(px) + FFABS(py); |
3689 | 2071 else |
4001 | 2072 sum = FFABS(px - A[0]) + FFABS(py - A[1]); |
3689 | 2073 if(sum > 32) { |
2074 if(get_bits1(&s->gb)) { | |
2075 px = A[0]; | |
2076 py = A[1]; | |
2077 } else { | |
2078 px = C[0]; | |
2079 py = C[1]; | |
2080 } | |
2081 } else { | |
2082 if(is_intra[xy - 2]) | |
4001 | 2083 sum = FFABS(px) + FFABS(py); |
3689 | 2084 else |
4001 | 2085 sum = FFABS(px - C[0]) + FFABS(py - C[1]); |
3689 | 2086 if(sum > 32) { |
2087 if(get_bits1(&s->gb)) { | |
2088 px = A[0]; | |
2089 py = A[1]; | |
2090 } else { | |
2091 px = C[0]; | |
2092 py = C[1]; | |
2093 } | |
2094 } | |
2095 } | |
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
2096 } |
3689 | 2097 /* store MV using signed modulus of MV range defined in 4.11 */ |
2098 s->mv[0][0][0] = ((px + dmv_x[0] + r_x) & ((r_x << 1) - 1)) - r_x; | |
2099 s->mv[0][0][1] = ((py + dmv_y[0] + r_y) & ((r_y << 1) - 1)) - r_y; | |
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
2100 } |
3743
fc613a610303
Reorder MV order in B-frames so no swapping in vc1_b_mc() is needed
kostya
parents:
3711
diff
changeset
|
2101 if((mvtype == BMV_TYPE_BACKWARD) || (mvtype == BMV_TYPE_INTERPOLATED)) { |
3689 | 2102 C = s->current_picture.motion_val[1][xy - 2]; |
2103 A = s->current_picture.motion_val[1][xy - wrap*2]; | |
2104 off = (s->mb_x == (s->mb_width - 1)) ? -2 : 2; | |
2105 B = s->current_picture.motion_val[1][xy - wrap*2 + off]; | |
2106 | |
4834
300b60dee58c
Set C predictor to zero if unavailable (should fix B-frame border artifacts)
kostya
parents:
4784
diff
changeset
|
2107 if(!s->mb_x) C[0] = C[1] = 0; |
3689 | 2108 if(!s->first_slice_line) { // predictor A is not out of bounds |
2109 if(s->mb_width == 1) { | |
2110 px = A[0]; | |
2111 py = A[1]; | |
2112 } else { | |
2113 px = mid_pred(A[0], B[0], C[0]); | |
2114 py = mid_pred(A[1], B[1], C[1]); | |
2115 } | |
2116 } else if(s->mb_x) { // predictor C is not out of bounds | |
2117 px = C[0]; | |
2118 py = C[1]; | |
2119 } else { | |
2120 px = py = 0; | |
2121 } | |
2122 /* Pullback MV as specified in 8.3.5.3.4 */ | |
2123 { | |
2124 int qx, qy, X, Y; | |
2125 if(v->profile < PROFILE_ADVANCED) { | |
2126 qx = (s->mb_x << 5); | |
2127 qy = (s->mb_y << 5); | |
2128 X = (s->mb_width << 5) - 4; | |
2129 Y = (s->mb_height << 5) - 4; | |
2130 if(qx + px < -28) px = -28 - qx; | |
2131 if(qy + py < -28) py = -28 - qy; | |
2132 if(qx + px > X) px = X - qx; | |
2133 if(qy + py > Y) py = Y - qy; | |
2134 } else { | |
2135 qx = (s->mb_x << 6); | |
2136 qy = (s->mb_y << 6); | |
2137 X = (s->mb_width << 6) - 4; | |
2138 Y = (s->mb_height << 6) - 4; | |
2139 if(qx + px < -60) px = -60 - qx; | |
2140 if(qy + py < -60) py = -60 - qy; | |
2141 if(qx + px > X) px = X - qx; | |
2142 if(qy + py > Y) py = Y - qy; | |
2143 } | |
2144 } | |
2145 /* Calculate hybrid prediction as specified in 8.3.5.3.5 */ | |
2146 if(0 && !s->first_slice_line && s->mb_x) { | |
2147 if(is_intra[xy - wrap]) | |
4001 | 2148 sum = FFABS(px) + FFABS(py); |
3689 | 2149 else |
4001 | 2150 sum = FFABS(px - A[0]) + FFABS(py - A[1]); |
3689 | 2151 if(sum > 32) { |
2152 if(get_bits1(&s->gb)) { | |
2153 px = A[0]; | |
2154 py = A[1]; | |
2155 } else { | |
2156 px = C[0]; | |
2157 py = C[1]; | |
2158 } | |
2159 } else { | |
2160 if(is_intra[xy - 2]) | |
4001 | 2161 sum = FFABS(px) + FFABS(py); |
3689 | 2162 else |
4001 | 2163 sum = FFABS(px - C[0]) + FFABS(py - C[1]); |
3689 | 2164 if(sum > 32) { |
2165 if(get_bits1(&s->gb)) { | |
2166 px = A[0]; | |
2167 py = A[1]; | |
2168 } else { | |
2169 px = C[0]; | |
2170 py = C[1]; | |
2171 } | |
2172 } | |
2173 } | |
2174 } | |
2175 /* store MV using signed modulus of MV range defined in 4.11 */ | |
2176 | |
2177 s->mv[1][0][0] = ((px + dmv_x[1] + r_x) & ((r_x << 1) - 1)) - r_x; | |
2178 s->mv[1][0][1] = ((py + dmv_y[1] + r_y) & ((r_y << 1) - 1)) - r_y; | |
2179 } | |
2180 s->current_picture.motion_val[0][xy][0] = s->mv[0][0][0]; | |
2181 s->current_picture.motion_val[0][xy][1] = s->mv[0][0][1]; | |
2182 s->current_picture.motion_val[1][xy][0] = s->mv[1][0][0]; | |
2183 s->current_picture.motion_val[1][xy][1] = s->mv[1][0][1]; | |
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
2184 } |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
2185 |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2186 /** Get predicted DC value for I-frames only |
3359 | 2187 * prediction dir: left=0, top=1 |
2188 * @param s MpegEncContext | |
8685 | 2189 * @param overlap flag indicating that overlap filtering is used |
2190 * @param pq integer part of picture quantizer | |
3359 | 2191 * @param[in] n block index in the current MB |
2192 * @param dc_val_ptr Pointer to DC predictor | |
2193 * @param dir_ptr Prediction direction for use in AC prediction | |
2194 */ | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2195 static inline int vc1_i_pred_dc(MpegEncContext *s, int overlap, int pq, int n, |
3781 | 2196 int16_t **dc_val_ptr, int *dir_ptr) |
3359 | 2197 { |
2198 int a, b, c, wrap, pred, scale; | |
3781 | 2199 int16_t *dc_val; |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2200 static const uint16_t dcpred[32] = { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2201 -1, 1024, 512, 341, 256, 205, 171, 146, 128, |
3359 | 2202 114, 102, 93, 85, 79, 73, 68, 64, |
2203 60, 57, 54, 51, 49, 47, 45, 43, | |
2204 41, 39, 38, 37, 35, 34, 33 | |
2205 }; | |
2206 | |
2207 /* find prediction - wmv3_dc_scale always used here in fact */ | |
2208 if (n < 4) scale = s->y_dc_scale; | |
2209 else scale = s->c_dc_scale; | |
2210 | |
2211 wrap = s->block_wrap[n]; | |
2212 dc_val= s->dc_val[0] + s->block_index[n]; | |
2213 | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2214 /* B A |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2215 * C X |
3359 | 2216 */ |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2217 c = dc_val[ - 1]; |
3359 | 2218 b = dc_val[ - 1 - wrap]; |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2219 a = dc_val[ - wrap]; |
3359 | 2220 |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2221 if (pq < 9 || !overlap) |
3359 | 2222 { |
2223 /* Set outer values */ | |
3449
ec6096b1ab04
Use s->first_slice_line in checks instead of s->mb_y
kostya
parents:
3430
diff
changeset
|
2224 if (s->first_slice_line && (n!=2 && n!=3)) b=a=dcpred[scale]; |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2225 if (s->mb_x == 0 && (n!=1 && n!=3)) b=c=dcpred[scale]; |
3359 | 2226 } |
2227 else | |
2228 { | |
2229 /* Set outer values */ | |
3449
ec6096b1ab04
Use s->first_slice_line in checks instead of s->mb_y
kostya
parents:
3430
diff
changeset
|
2230 if (s->first_slice_line && (n!=2 && n!=3)) b=a=0; |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2231 if (s->mb_x == 0 && (n!=1 && n!=3)) b=c=0; |
3359 | 2232 } |
2233 | |
2234 if (abs(a - b) <= abs(b - c)) { | |
2235 pred = c; | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2236 *dir_ptr = 1;//left |
3359 | 2237 } else { |
2238 pred = a; | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2239 *dir_ptr = 0;//top |
3359 | 2240 } |
2241 | |
2242 /* update predictor */ | |
2243 *dc_val_ptr = &dc_val[0]; | |
2244 return pred; | |
2245 } | |
2246 | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2247 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2248 /** Get predicted DC value |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2249 * prediction dir: left=0, top=1 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2250 * @param s MpegEncContext |
8685 | 2251 * @param overlap flag indicating that overlap filtering is used |
2252 * @param pq integer part of picture quantizer | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2253 * @param[in] n block index in the current MB |
8685 | 2254 * @param a_avail flag indicating top block availability |
2255 * @param c_avail flag indicating left block availability | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2256 * @param dc_val_ptr Pointer to DC predictor |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2257 * @param dir_ptr Prediction direction for use in AC prediction |
3359 | 2258 */ |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2259 static inline int vc1_pred_dc(MpegEncContext *s, int overlap, int pq, int n, |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2260 int a_avail, int c_avail, |
3781 | 2261 int16_t **dc_val_ptr, int *dir_ptr) |
3359 | 2262 { |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2263 int a, b, c, wrap, pred, scale; |
3781 | 2264 int16_t *dc_val; |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2265 int mb_pos = s->mb_x + s->mb_y * s->mb_stride; |
3429 | 2266 int q1, q2 = 0; |
3359 | 2267 |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2268 /* find prediction - wmv3_dc_scale always used here in fact */ |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2269 if (n < 4) scale = s->y_dc_scale; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2270 else scale = s->c_dc_scale; |
3359 | 2271 |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2272 wrap = s->block_wrap[n]; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2273 dc_val= s->dc_val[0] + s->block_index[n]; |
3359 | 2274 |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2275 /* B A |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2276 * C X |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2277 */ |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2278 c = dc_val[ - 1]; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2279 b = dc_val[ - 1 - wrap]; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2280 a = dc_val[ - wrap]; |
3508
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2281 /* scale predictors if needed */ |
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2282 q1 = s->current_picture.qscale_table[mb_pos]; |
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2283 if(c_avail && (n!= 1 && n!=3)) { |
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2284 q2 = s->current_picture.qscale_table[mb_pos - 1]; |
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2285 if(q2 && q2 != q1) |
4949 | 2286 c = (c * s->y_dc_scale_table[q2] * ff_vc1_dqscale[s->y_dc_scale_table[q1] - 1] + 0x20000) >> 18; |
3508
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2287 } |
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2288 if(a_avail && (n!= 2 && n!=3)) { |
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2289 q2 = s->current_picture.qscale_table[mb_pos - s->mb_stride]; |
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2290 if(q2 && q2 != q1) |
4949 | 2291 a = (a * s->y_dc_scale_table[q2] * ff_vc1_dqscale[s->y_dc_scale_table[q1] - 1] + 0x20000) >> 18; |
3508
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2292 } |
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2293 if(a_avail && c_avail && (n!=3)) { |
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2294 int off = mb_pos; |
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2295 if(n != 1) off--; |
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2296 if(n != 2) off -= s->mb_stride; |
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2297 q2 = s->current_picture.qscale_table[off]; |
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2298 if(q2 && q2 != q1) |
4949 | 2299 b = (b * s->y_dc_scale_table[q2] * ff_vc1_dqscale[s->y_dc_scale_table[q1] - 1] + 0x20000) >> 18; |
3508
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2300 } |
3359 | 2301 |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2302 if(a_avail && c_avail) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2303 if(abs(a - b) <= abs(b - c)) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2304 pred = c; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2305 *dir_ptr = 1;//left |
3359 | 2306 } else { |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2307 pred = a; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2308 *dir_ptr = 0;//top |
3359 | 2309 } |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2310 } else if(a_avail) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2311 pred = a; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2312 *dir_ptr = 0;//top |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2313 } else if(c_avail) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2314 pred = c; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2315 *dir_ptr = 1;//left |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2316 } else { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2317 pred = 0; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2318 *dir_ptr = 1;//left |
3359 | 2319 } |
2320 | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2321 /* update predictor */ |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2322 *dc_val_ptr = &dc_val[0]; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2323 return pred; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2324 } |
3359 | 2325 |
8685 | 2326 /** @} */ // Block group |
3359 | 2327 |
2328 /** | |
8685 | 2329 * @defgroup vc1_std_mb VC1 Macroblock-level functions in Simple/Main Profiles |
3359 | 2330 * @see 7.1.4, p91 and 8.1.1.7, p(1)04 |
2331 * @{ | |
2332 */ | |
2333 | |
2334 static inline int vc1_coded_block_pred(MpegEncContext * s, int n, uint8_t **coded_block_ptr) | |
2335 { | |
2336 int xy, wrap, pred, a, b, c; | |
2337 | |
2338 xy = s->block_index[n]; | |
2339 wrap = s->b8_stride; | |
2340 | |
2341 /* B C | |
2342 * A X | |
2343 */ | |
2344 a = s->coded_block[xy - 1 ]; | |
2345 b = s->coded_block[xy - 1 - wrap]; | |
2346 c = s->coded_block[xy - wrap]; | |
2347 | |
2348 if (b == c) { | |
2349 pred = a; | |
2350 } else { | |
2351 pred = c; | |
2352 } | |
2353 | |
2354 /* store value */ | |
2355 *coded_block_ptr = &s->coded_block[xy]; | |
2356 | |
2357 return pred; | |
2358 } | |
2359 | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2360 /** |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2361 * Decode one AC coefficient |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2362 * @param v The VC1 context |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2363 * @param last Last coefficient |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2364 * @param skip How much zero coefficients to skip |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2365 * @param value Decoded AC coefficient value |
8685 | 2366 * @param codingset set of VLC to decode data |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2367 * @see 8.1.3.4 |
3359 | 2368 */ |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2369 static void vc1_decode_ac_coeff(VC1Context *v, int *last, int *skip, int *value, int codingset) |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2370 { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2371 GetBitContext *gb = &v->s.gb; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2372 int index, escape, run = 0, level = 0, lst = 0; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2373 |
4949 | 2374 index = get_vlc2(gb, ff_vc1_ac_coeff_table[codingset].table, AC_VLC_BITS, 3); |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2375 if (index != vc1_ac_sizes[codingset] - 1) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2376 run = vc1_index_decode_table[codingset][index][0]; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2377 level = vc1_index_decode_table[codingset][index][1]; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2378 lst = index >= vc1_last_decode_table[codingset]; |
5513 | 2379 if(get_bits1(gb)) |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2380 level = -level; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2381 } else { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2382 escape = decode210(gb); |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
2383 if (escape != 2) { |
4949 | 2384 index = get_vlc2(gb, ff_vc1_ac_coeff_table[codingset].table, AC_VLC_BITS, 3); |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2385 run = vc1_index_decode_table[codingset][index][0]; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2386 level = vc1_index_decode_table[codingset][index][1]; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2387 lst = index >= vc1_last_decode_table[codingset]; |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
2388 if(escape == 0) { |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
2389 if(lst) |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
2390 level += vc1_last_delta_level_table[codingset][run]; |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
2391 else |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
2392 level += vc1_delta_level_table[codingset][run]; |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
2393 } else { |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
2394 if(lst) |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
2395 run += vc1_last_delta_run_table[codingset][level] + 1; |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
2396 else |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
2397 run += vc1_delta_run_table[codingset][level] + 1; |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
2398 } |
5513 | 2399 if(get_bits1(gb)) |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2400 level = -level; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2401 } else { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2402 int sign; |
5513 | 2403 lst = get_bits1(gb); |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2404 if(v->s.esc3_level_length == 0) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2405 if(v->pq < 8 || v->dquantfrm) { // table 59 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2406 v->s.esc3_level_length = get_bits(gb, 3); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2407 if(!v->s.esc3_level_length) |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2408 v->s.esc3_level_length = get_bits(gb, 2) + 8; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2409 } else { //table 60 |
5511 | 2410 v->s.esc3_level_length = get_unary(gb, 1, 6) + 2; |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2411 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2412 v->s.esc3_run_length = 3 + get_bits(gb, 2); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2413 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2414 run = get_bits(gb, v->s.esc3_run_length); |
5513 | 2415 sign = get_bits1(gb); |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2416 level = get_bits(gb, v->s.esc3_level_length); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2417 if(sign) |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2418 level = -level; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2419 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2420 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2421 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2422 *last = lst; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2423 *skip = run; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2424 *value = level; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2425 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2426 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2427 /** Decode intra block in intra frames - should be faster than decode_intra_block |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2428 * @param v VC1Context |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2429 * @param block block to decode |
8685 | 2430 * @param[in] n subblock index |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2431 * @param coded are AC coeffs present or not |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2432 * @param codingset set of VLC to decode data |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2433 */ |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2434 static int vc1_decode_i_block(VC1Context *v, DCTELEM block[64], int n, int coded, int codingset) |
3359 | 2435 { |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2436 GetBitContext *gb = &v->s.gb; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2437 MpegEncContext *s = &v->s; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2438 int dc_pred_dir = 0; /* Direction of the DC prediction used */ |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2439 int run_diff, i; |
3781 | 2440 int16_t *dc_val; |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2441 int16_t *ac_val, *ac_val2; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2442 int dcdiff; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2443 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2444 /* Get DC differential */ |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2445 if (n < 4) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2446 dcdiff = get_vlc2(&s->gb, ff_msmp4_dc_luma_vlc[s->dc_table_index].table, DC_VLC_BITS, 3); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2447 } else { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2448 dcdiff = get_vlc2(&s->gb, ff_msmp4_dc_chroma_vlc[s->dc_table_index].table, DC_VLC_BITS, 3); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2449 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2450 if (dcdiff < 0){ |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2451 av_log(s->avctx, AV_LOG_ERROR, "Illegal DC VLC\n"); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2452 return -1; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2453 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2454 if (dcdiff) |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2455 { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2456 if (dcdiff == 119 /* ESC index value */) |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2457 { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2458 /* TODO: Optimize */ |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2459 if (v->pq == 1) dcdiff = get_bits(gb, 10); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2460 else if (v->pq == 2) dcdiff = get_bits(gb, 9); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2461 else dcdiff = get_bits(gb, 8); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2462 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2463 else |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2464 { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2465 if (v->pq == 1) |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2466 dcdiff = (dcdiff<<2) + get_bits(gb, 2) - 3; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2467 else if (v->pq == 2) |
5513 | 2468 dcdiff = (dcdiff<<1) + get_bits1(gb) - 1; |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2469 } |
5513 | 2470 if (get_bits1(gb)) |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2471 dcdiff = -dcdiff; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2472 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2473 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2474 /* Prediction */ |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2475 dcdiff += vc1_i_pred_dc(&v->s, v->overlap, v->pq, n, &dc_val, &dc_pred_dir); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2476 *dc_val = dcdiff; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2477 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2478 /* Store the quantized DC coeff, used for prediction */ |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2479 if (n < 4) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2480 block[0] = dcdiff * s->y_dc_scale; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2481 } else { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2482 block[0] = dcdiff * s->c_dc_scale; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2483 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2484 /* Skip ? */ |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2485 run_diff = 0; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2486 i = 0; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2487 if (!coded) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2488 goto not_coded; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2489 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2490 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2491 //AC Decoding |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2492 i = 1; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2493 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2494 { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2495 int last = 0, skip, value; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2496 const int8_t *zz_table; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2497 int scale; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2498 int k; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2499 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2500 scale = v->pq * 2 + v->halfpq; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2501 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2502 if(v->s.ac_pred) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2503 if(!dc_pred_dir) |
7136 | 2504 zz_table = wmv1_scantable[2]; |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2505 else |
7136 | 2506 zz_table = wmv1_scantable[3]; |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2507 } else |
7136 | 2508 zz_table = wmv1_scantable[1]; |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2509 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2510 ac_val = s->ac_val[0][0] + s->block_index[n] * 16; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2511 ac_val2 = ac_val; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2512 if(dc_pred_dir) //left |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2513 ac_val -= 16; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2514 else //top |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2515 ac_val -= 16 * s->block_wrap[n]; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2516 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2517 while (!last) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2518 vc1_decode_ac_coeff(v, &last, &skip, &value, codingset); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2519 i += skip; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2520 if(i > 63) |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2521 break; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2522 block[zz_table[i++]] = value; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2523 } |
3359 | 2524 |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2525 /* apply AC prediction if needed */ |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2526 if(s->ac_pred) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2527 if(dc_pred_dir) { //left |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2528 for(k = 1; k < 8; k++) |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2529 block[k << 3] += ac_val[k]; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2530 } else { //top |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2531 for(k = 1; k < 8; k++) |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2532 block[k] += ac_val[k + 8]; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2533 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2534 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2535 /* save AC coeffs for further prediction */ |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2536 for(k = 1; k < 8; k++) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2537 ac_val2[k] = block[k << 3]; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2538 ac_val2[k + 8] = block[k]; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2539 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2540 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2541 /* scale AC coeffs */ |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2542 for(k = 1; k < 64; k++) |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2543 if(block[k]) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2544 block[k] *= scale; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2545 if(!v->pquantizer) |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2546 block[k] += (block[k] < 0) ? -v->pq : v->pq; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2547 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2548 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2549 if(s->ac_pred) i = 63; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2550 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2551 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2552 not_coded: |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2553 if(!coded) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2554 int k, scale; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2555 ac_val = s->ac_val[0][0] + s->block_index[n] * 16; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2556 ac_val2 = ac_val; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2557 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2558 scale = v->pq * 2 + v->halfpq; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2559 memset(ac_val2, 0, 16 * 2); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2560 if(dc_pred_dir) {//left |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2561 ac_val -= 16; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2562 if(s->ac_pred) |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2563 memcpy(ac_val2, ac_val, 8 * 2); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2564 } else {//top |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2565 ac_val -= 16 * s->block_wrap[n]; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2566 if(s->ac_pred) |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2567 memcpy(ac_val2 + 8, ac_val + 8, 8 * 2); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2568 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2569 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2570 /* apply AC prediction if needed */ |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2571 if(s->ac_pred) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2572 if(dc_pred_dir) { //left |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2573 for(k = 1; k < 8; k++) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2574 block[k << 3] = ac_val[k] * scale; |
3509 | 2575 if(!v->pquantizer && block[k << 3]) |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2576 block[k << 3] += (block[k << 3] < 0) ? -v->pq : v->pq; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2577 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2578 } else { //top |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2579 for(k = 1; k < 8; k++) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2580 block[k] = ac_val[k + 8] * scale; |
3509 | 2581 if(!v->pquantizer && block[k]) |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2582 block[k] += (block[k] < 0) ? -v->pq : v->pq; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2583 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2584 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2585 i = 63; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2586 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2587 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2588 s->block_last_index[n] = i; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2589 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2590 return 0; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2591 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2592 |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2593 /** Decode intra block in intra frames - should be faster than decode_intra_block |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2594 * @param v VC1Context |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2595 * @param block block to decode |
8685 | 2596 * @param[in] n subblock number |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2597 * @param coded are AC coeffs present or not |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2598 * @param codingset set of VLC to decode data |
8685 | 2599 * @param mquant quantizer value for this macroblock |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2600 */ |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2601 static int vc1_decode_i_block_adv(VC1Context *v, DCTELEM block[64], int n, int coded, int codingset, int mquant) |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2602 { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2603 GetBitContext *gb = &v->s.gb; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2604 MpegEncContext *s = &v->s; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2605 int dc_pred_dir = 0; /* Direction of the DC prediction used */ |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2606 int run_diff, i; |
3781 | 2607 int16_t *dc_val; |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2608 int16_t *ac_val, *ac_val2; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2609 int dcdiff; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2610 int a_avail = v->a_avail, c_avail = v->c_avail; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2611 int use_pred = s->ac_pred; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2612 int scale; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2613 int q1, q2 = 0; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2614 int mb_pos = s->mb_x + s->mb_y * s->mb_stride; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2615 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2616 /* Get DC differential */ |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2617 if (n < 4) { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2618 dcdiff = get_vlc2(&s->gb, ff_msmp4_dc_luma_vlc[s->dc_table_index].table, DC_VLC_BITS, 3); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2619 } else { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2620 dcdiff = get_vlc2(&s->gb, ff_msmp4_dc_chroma_vlc[s->dc_table_index].table, DC_VLC_BITS, 3); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2621 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2622 if (dcdiff < 0){ |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2623 av_log(s->avctx, AV_LOG_ERROR, "Illegal DC VLC\n"); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2624 return -1; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2625 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2626 if (dcdiff) |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2627 { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2628 if (dcdiff == 119 /* ESC index value */) |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2629 { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2630 /* TODO: Optimize */ |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2631 if (mquant == 1) dcdiff = get_bits(gb, 10); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2632 else if (mquant == 2) dcdiff = get_bits(gb, 9); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2633 else dcdiff = get_bits(gb, 8); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2634 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2635 else |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2636 { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2637 if (mquant == 1) |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2638 dcdiff = (dcdiff<<2) + get_bits(gb, 2) - 3; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2639 else if (mquant == 2) |
5513 | 2640 dcdiff = (dcdiff<<1) + get_bits1(gb) - 1; |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2641 } |
5513 | 2642 if (get_bits1(gb)) |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2643 dcdiff = -dcdiff; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2644 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2645 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2646 /* Prediction */ |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2647 dcdiff += vc1_pred_dc(&v->s, v->overlap, mquant, n, v->a_avail, v->c_avail, &dc_val, &dc_pred_dir); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2648 *dc_val = dcdiff; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2649 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2650 /* Store the quantized DC coeff, used for prediction */ |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2651 if (n < 4) { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2652 block[0] = dcdiff * s->y_dc_scale; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2653 } else { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2654 block[0] = dcdiff * s->c_dc_scale; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2655 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2656 /* Skip ? */ |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2657 run_diff = 0; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2658 i = 0; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2659 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2660 //AC Decoding |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2661 i = 1; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2662 |
5194 | 2663 /* check if AC is needed at all */ |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2664 if(!a_avail && !c_avail) use_pred = 0; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2665 ac_val = s->ac_val[0][0] + s->block_index[n] * 16; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2666 ac_val2 = ac_val; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2667 |
5683
dbc41b5a10e7
HALFPQ should be used only for when PQUANT is selected
kostya
parents:
5682
diff
changeset
|
2668 scale = mquant * 2 + ((mquant == v->pq) ? v->halfpq : 0); |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2669 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2670 if(dc_pred_dir) //left |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2671 ac_val -= 16; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2672 else //top |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2673 ac_val -= 16 * s->block_wrap[n]; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2674 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2675 q1 = s->current_picture.qscale_table[mb_pos]; |
4456 | 2676 if(dc_pred_dir && c_avail && mb_pos) q2 = s->current_picture.qscale_table[mb_pos - 1]; |
2677 if(!dc_pred_dir && a_avail && mb_pos >= s->mb_stride) q2 = s->current_picture.qscale_table[mb_pos - s->mb_stride]; | |
4724
ea97803884e1
1000l to myself - get correct quantization for blocks 1 and 2
kostya
parents:
4683
diff
changeset
|
2678 if(dc_pred_dir && n==1) q2 = q1; |
ea97803884e1
1000l to myself - get correct quantization for blocks 1 and 2
kostya
parents:
4683
diff
changeset
|
2679 if(!dc_pred_dir && n==2) q2 = q1; |
ea97803884e1
1000l to myself - get correct quantization for blocks 1 and 2
kostya
parents:
4683
diff
changeset
|
2680 if(n==3) q2 = q1; |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2681 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2682 if(coded) { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2683 int last = 0, skip, value; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2684 const int8_t *zz_table; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2685 int k; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2686 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2687 if(v->s.ac_pred) { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2688 if(!dc_pred_dir) |
7136 | 2689 zz_table = wmv1_scantable[2]; |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2690 else |
7136 | 2691 zz_table = wmv1_scantable[3]; |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2692 } else |
7136 | 2693 zz_table = wmv1_scantable[1]; |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2694 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2695 while (!last) { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2696 vc1_decode_ac_coeff(v, &last, &skip, &value, codingset); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2697 i += skip; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2698 if(i > 63) |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2699 break; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2700 block[zz_table[i++]] = value; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2701 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2702 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2703 /* apply AC prediction if needed */ |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2704 if(use_pred) { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2705 /* scale predictors if needed*/ |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2706 if(q2 && q1!=q2) { |
4236 | 2707 q1 = q1 * 2 + ((q1 == v->pq) ? v->halfpq : 0) - 1; |
2708 q2 = q2 * 2 + ((q2 == v->pq) ? v->halfpq : 0) - 1; | |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2709 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2710 if(dc_pred_dir) { //left |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2711 for(k = 1; k < 8; k++) |
4949 | 2712 block[k << 3] += (ac_val[k] * q2 * ff_vc1_dqscale[q1 - 1] + 0x20000) >> 18; |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2713 } else { //top |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2714 for(k = 1; k < 8; k++) |
4949 | 2715 block[k] += (ac_val[k + 8] * q2 * ff_vc1_dqscale[q1 - 1] + 0x20000) >> 18; |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2716 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2717 } else { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2718 if(dc_pred_dir) { //left |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2719 for(k = 1; k < 8; k++) |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2720 block[k << 3] += ac_val[k]; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2721 } else { //top |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2722 for(k = 1; k < 8; k++) |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2723 block[k] += ac_val[k + 8]; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2724 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2725 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2726 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2727 /* save AC coeffs for further prediction */ |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2728 for(k = 1; k < 8; k++) { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2729 ac_val2[k] = block[k << 3]; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2730 ac_val2[k + 8] = block[k]; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2731 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2732 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2733 /* scale AC coeffs */ |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2734 for(k = 1; k < 64; k++) |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2735 if(block[k]) { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2736 block[k] *= scale; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2737 if(!v->pquantizer) |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2738 block[k] += (block[k] < 0) ? -mquant : mquant; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2739 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2740 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2741 if(use_pred) i = 63; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2742 } else { // no AC coeffs |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2743 int k; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2744 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2745 memset(ac_val2, 0, 16 * 2); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2746 if(dc_pred_dir) {//left |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2747 if(use_pred) { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2748 memcpy(ac_val2, ac_val, 8 * 2); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2749 if(q2 && q1!=q2) { |
4236 | 2750 q1 = q1 * 2 + ((q1 == v->pq) ? v->halfpq : 0) - 1; |
2751 q2 = q2 * 2 + ((q2 == v->pq) ? v->halfpq : 0) - 1; | |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2752 for(k = 1; k < 8; k++) |
4949 | 2753 ac_val2[k] = (ac_val2[k] * q2 * ff_vc1_dqscale[q1 - 1] + 0x20000) >> 18; |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2754 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2755 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2756 } else {//top |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2757 if(use_pred) { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2758 memcpy(ac_val2 + 8, ac_val + 8, 8 * 2); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2759 if(q2 && q1!=q2) { |
4236 | 2760 q1 = q1 * 2 + ((q1 == v->pq) ? v->halfpq : 0) - 1; |
2761 q2 = q2 * 2 + ((q2 == v->pq) ? v->halfpq : 0) - 1; | |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2762 for(k = 1; k < 8; k++) |
4949 | 2763 ac_val2[k + 8] = (ac_val2[k + 8] * q2 * ff_vc1_dqscale[q1 - 1] + 0x20000) >> 18; |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2764 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2765 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2766 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2767 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2768 /* apply AC prediction if needed */ |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2769 if(use_pred) { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2770 if(dc_pred_dir) { //left |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2771 for(k = 1; k < 8; k++) { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2772 block[k << 3] = ac_val2[k] * scale; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2773 if(!v->pquantizer && block[k << 3]) |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2774 block[k << 3] += (block[k << 3] < 0) ? -mquant : mquant; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2775 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2776 } else { //top |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2777 for(k = 1; k < 8; k++) { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2778 block[k] = ac_val2[k + 8] * scale; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2779 if(!v->pquantizer && block[k]) |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2780 block[k] += (block[k] < 0) ? -mquant : mquant; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2781 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2782 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2783 i = 63; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2784 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2785 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2786 s->block_last_index[n] = i; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2787 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2788 return 0; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2789 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2790 |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2791 /** Decode intra block in inter frames - more generic version than vc1_decode_i_block |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2792 * @param v VC1Context |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2793 * @param block block to decode |
8685 | 2794 * @param[in] n subblock index |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2795 * @param coded are AC coeffs present or not |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2796 * @param mquant block quantizer |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2797 * @param codingset set of VLC to decode data |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2798 */ |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2799 static int vc1_decode_intra_block(VC1Context *v, DCTELEM block[64], int n, int coded, int mquant, int codingset) |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2800 { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2801 GetBitContext *gb = &v->s.gb; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2802 MpegEncContext *s = &v->s; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2803 int dc_pred_dir = 0; /* Direction of the DC prediction used */ |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2804 int run_diff, i; |
3781 | 2805 int16_t *dc_val; |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2806 int16_t *ac_val, *ac_val2; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2807 int dcdiff; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2808 int mb_pos = s->mb_x + s->mb_y * s->mb_stride; |
3364
59c10b66fbbc
Added loop filtering as ersatz for overlap filter (improves picture quality for coarse quantization).
kostya
parents:
3363
diff
changeset
|
2809 int a_avail = v->a_avail, c_avail = v->c_avail; |
3399
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
2810 int use_pred = s->ac_pred; |
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
2811 int scale; |
3429 | 2812 int q1, q2 = 0; |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2813 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2814 /* XXX: Guard against dumb values of mquant */ |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2815 mquant = (mquant < 1) ? 0 : ( (mquant>31) ? 31 : mquant ); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2816 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2817 /* Set DC scale - y and c use the same */ |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2818 s->y_dc_scale = s->y_dc_scale_table[mquant]; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2819 s->c_dc_scale = s->c_dc_scale_table[mquant]; |
3359 | 2820 |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2821 /* Get DC differential */ |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2822 if (n < 4) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2823 dcdiff = get_vlc2(&s->gb, ff_msmp4_dc_luma_vlc[s->dc_table_index].table, DC_VLC_BITS, 3); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2824 } else { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2825 dcdiff = get_vlc2(&s->gb, ff_msmp4_dc_chroma_vlc[s->dc_table_index].table, DC_VLC_BITS, 3); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2826 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2827 if (dcdiff < 0){ |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2828 av_log(s->avctx, AV_LOG_ERROR, "Illegal DC VLC\n"); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2829 return -1; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2830 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2831 if (dcdiff) |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2832 { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2833 if (dcdiff == 119 /* ESC index value */) |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2834 { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2835 /* TODO: Optimize */ |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2836 if (mquant == 1) dcdiff = get_bits(gb, 10); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2837 else if (mquant == 2) dcdiff = get_bits(gb, 9); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2838 else dcdiff = get_bits(gb, 8); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2839 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2840 else |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2841 { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2842 if (mquant == 1) |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2843 dcdiff = (dcdiff<<2) + get_bits(gb, 2) - 3; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2844 else if (mquant == 2) |
5513 | 2845 dcdiff = (dcdiff<<1) + get_bits1(gb) - 1; |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2846 } |
5513 | 2847 if (get_bits1(gb)) |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2848 dcdiff = -dcdiff; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2849 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2850 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2851 /* Prediction */ |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2852 dcdiff += vc1_pred_dc(&v->s, v->overlap, mquant, n, a_avail, c_avail, &dc_val, &dc_pred_dir); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2853 *dc_val = dcdiff; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2854 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2855 /* Store the quantized DC coeff, used for prediction */ |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2856 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2857 if (n < 4) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2858 block[0] = dcdiff * s->y_dc_scale; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2859 } else { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2860 block[0] = dcdiff * s->c_dc_scale; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2861 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2862 /* Skip ? */ |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2863 run_diff = 0; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2864 i = 0; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2865 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2866 //AC Decoding |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2867 i = 1; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2868 |
3399
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
2869 /* check if AC is needed at all and adjust direction if needed */ |
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
2870 if(!a_avail) dc_pred_dir = 1; |
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
2871 if(!c_avail) dc_pred_dir = 0; |
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
2872 if(!a_avail && !c_avail) use_pred = 0; |
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
2873 ac_val = s->ac_val[0][0] + s->block_index[n] * 16; |
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
2874 ac_val2 = ac_val; |
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
2875 |
3475 | 2876 scale = mquant * 2 + v->halfpq; |
3399
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
2877 |
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
2878 if(dc_pred_dir) //left |
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
2879 ac_val -= 16; |
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
2880 else //top |
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
2881 ac_val -= 16 * s->block_wrap[n]; |
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
2882 |
3429 | 2883 q1 = s->current_picture.qscale_table[mb_pos]; |
4303
7e907f7d6a21
Check mb_pos is big enough before trying to access data left or above.
reimar
parents:
4283
diff
changeset
|
2884 if(dc_pred_dir && c_avail && mb_pos) q2 = s->current_picture.qscale_table[mb_pos - 1]; |
7e907f7d6a21
Check mb_pos is big enough before trying to access data left or above.
reimar
parents:
4283
diff
changeset
|
2885 if(!dc_pred_dir && a_avail && mb_pos >= s->mb_stride) q2 = s->current_picture.qscale_table[mb_pos - s->mb_stride]; |
4724
ea97803884e1
1000l to myself - get correct quantization for blocks 1 and 2
kostya
parents:
4683
diff
changeset
|
2886 if(dc_pred_dir && n==1) q2 = q1; |
ea97803884e1
1000l to myself - get correct quantization for blocks 1 and 2
kostya
parents:
4683
diff
changeset
|
2887 if(!dc_pred_dir && n==2) q2 = q1; |
ea97803884e1
1000l to myself - get correct quantization for blocks 1 and 2
kostya
parents:
4683
diff
changeset
|
2888 if(n==3) q2 = q1; |
3429 | 2889 |
3399
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
2890 if(coded) { |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2891 int last = 0, skip, value; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2892 const int8_t *zz_table; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2893 int k; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2894 |
7136 | 2895 zz_table = wmv1_scantable[0]; |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2896 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2897 while (!last) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2898 vc1_decode_ac_coeff(v, &last, &skip, &value, codingset); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2899 i += skip; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2900 if(i > 63) |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2901 break; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2902 block[zz_table[i++]] = value; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2903 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2904 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2905 /* apply AC prediction if needed */ |
3378
d7dda9fd99c8
Adjust AC prediction if (some) predictors are not available.
kostya
parents:
3377
diff
changeset
|
2906 if(use_pred) { |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2907 /* scale predictors if needed*/ |
3429 | 2908 if(q2 && q1!=q2) { |
4236 | 2909 q1 = q1 * 2 + ((q1 == v->pq) ? v->halfpq : 0) - 1; |
2910 q2 = q2 * 2 + ((q2 == v->pq) ? v->halfpq : 0) - 1; | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2911 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2912 if(dc_pred_dir) { //left |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2913 for(k = 1; k < 8; k++) |
4949 | 2914 block[k << 3] += (ac_val[k] * q2 * ff_vc1_dqscale[q1 - 1] + 0x20000) >> 18; |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2915 } else { //top |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2916 for(k = 1; k < 8; k++) |
4949 | 2917 block[k] += (ac_val[k + 8] * q2 * ff_vc1_dqscale[q1 - 1] + 0x20000) >> 18; |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2918 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2919 } else { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2920 if(dc_pred_dir) { //left |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2921 for(k = 1; k < 8; k++) |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2922 block[k << 3] += ac_val[k]; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2923 } else { //top |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2924 for(k = 1; k < 8; k++) |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2925 block[k] += ac_val[k + 8]; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2926 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2927 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2928 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2929 /* save AC coeffs for further prediction */ |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2930 for(k = 1; k < 8; k++) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2931 ac_val2[k] = block[k << 3]; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2932 ac_val2[k + 8] = block[k]; |
3359 | 2933 } |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2934 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2935 /* scale AC coeffs */ |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2936 for(k = 1; k < 64; k++) |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2937 if(block[k]) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2938 block[k] *= scale; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2939 if(!v->pquantizer) |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2940 block[k] += (block[k] < 0) ? -mquant : mquant; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2941 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2942 |
3378
d7dda9fd99c8
Adjust AC prediction if (some) predictors are not available.
kostya
parents:
3377
diff
changeset
|
2943 if(use_pred) i = 63; |
3399
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
2944 } else { // no AC coeffs |
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
2945 int k; |
3378
d7dda9fd99c8
Adjust AC prediction if (some) predictors are not available.
kostya
parents:
3377
diff
changeset
|
2946 |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2947 memset(ac_val2, 0, 16 * 2); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2948 if(dc_pred_dir) {//left |
3396 | 2949 if(use_pred) { |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2950 memcpy(ac_val2, ac_val, 8 * 2); |
3429 | 2951 if(q2 && q1!=q2) { |
4236 | 2952 q1 = q1 * 2 + ((q1 == v->pq) ? v->halfpq : 0) - 1; |
2953 q2 = q2 * 2 + ((q2 == v->pq) ? v->halfpq : 0) - 1; | |
3396 | 2954 for(k = 1; k < 8; k++) |
4949 | 2955 ac_val2[k] = (ac_val2[k] * q2 * ff_vc1_dqscale[q1 - 1] + 0x20000) >> 18; |
3396 | 2956 } |
2957 } | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2958 } else {//top |
3396 | 2959 if(use_pred) { |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2960 memcpy(ac_val2 + 8, ac_val + 8, 8 * 2); |
3429 | 2961 if(q2 && q1!=q2) { |
4236 | 2962 q1 = q1 * 2 + ((q1 == v->pq) ? v->halfpq : 0) - 1; |
2963 q2 = q2 * 2 + ((q2 == v->pq) ? v->halfpq : 0) - 1; | |
3396 | 2964 for(k = 1; k < 8; k++) |
4949 | 2965 ac_val2[k + 8] = (ac_val2[k + 8] * q2 * ff_vc1_dqscale[q1 - 1] + 0x20000) >> 18; |
3396 | 2966 } |
2967 } | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2968 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2969 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2970 /* apply AC prediction if needed */ |
3378
d7dda9fd99c8
Adjust AC prediction if (some) predictors are not available.
kostya
parents:
3377
diff
changeset
|
2971 if(use_pred) { |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2972 if(dc_pred_dir) { //left |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2973 for(k = 1; k < 8; k++) { |
3396 | 2974 block[k << 3] = ac_val2[k] * scale; |
3509 | 2975 if(!v->pquantizer && block[k << 3]) |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2976 block[k << 3] += (block[k << 3] < 0) ? -mquant : mquant; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2977 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2978 } else { //top |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2979 for(k = 1; k < 8; k++) { |
3396 | 2980 block[k] = ac_val2[k + 8] * scale; |
3509 | 2981 if(!v->pquantizer && block[k]) |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2982 block[k] += (block[k] < 0) ? -mquant : mquant; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2983 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2984 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2985 i = 63; |
3359 | 2986 } |
2987 } | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2988 s->block_last_index[n] = i; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2989 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2990 return 0; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2991 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2992 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2993 /** Decode P block |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2994 */ |
5997
90de28dfd8d6
Switch VC-1 decoder to output decoded residual immediately.
kostya
parents:
5964
diff
changeset
|
2995 static int vc1_decode_p_block(VC1Context *v, DCTELEM block[64], int n, int mquant, int ttmb, int first_block, |
7355 | 2996 uint8_t *dst, int linesize, int skip_block, int apply_filter, int cbp_top, int cbp_left) |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2997 { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2998 MpegEncContext *s = &v->s; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2999 GetBitContext *gb = &s->gb; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3000 int i, j; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3001 int subblkpat = 0; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3002 int scale, off, idx, last, skip, value; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3003 int ttblk = ttmb & 7; |
7355 | 3004 int pat = 0; |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3005 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3006 if(ttmb == -1) { |
4949 | 3007 ttblk = ff_vc1_ttblk_to_tt[v->tt_index][get_vlc2(gb, ff_vc1_ttblk_vlc[v->tt_index].table, VC1_TTBLK_VLC_BITS, 1)]; |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3008 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3009 if(ttblk == TT_4X4) { |
4949 | 3010 subblkpat = ~(get_vlc2(gb, ff_vc1_subblkpat_vlc[v->tt_index].table, VC1_SUBBLKPAT_VLC_BITS, 1) + 1); |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3011 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3012 if((ttblk != TT_8X8 && ttblk != TT_4X4) && (v->ttmbf || (ttmb != -1 && (ttmb & 8) && !first_block))) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3013 subblkpat = decode012(gb); |
3364
59c10b66fbbc
Added loop filtering as ersatz for overlap filter (improves picture quality for coarse quantization).
kostya
parents:
3363
diff
changeset
|
3014 if(subblkpat) subblkpat ^= 3; //swap decoded pattern bits |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3015 if(ttblk == TT_8X4_TOP || ttblk == TT_8X4_BOTTOM) ttblk = TT_8X4; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3016 if(ttblk == TT_4X8_RIGHT || ttblk == TT_4X8_LEFT) ttblk = TT_4X8; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3017 } |
4948 | 3018 scale = 2 * mquant + ((v->pq == mquant) ? v->halfpq : 0); |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3019 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3020 // convert transforms like 8X4_TOP to generic TT and SUBBLKPAT |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3021 if(ttblk == TT_8X4_TOP || ttblk == TT_8X4_BOTTOM) { |
3377
dc4813852345
0xFFFF l of cola. Now P-frames are decoded almost without distortions.
kostya
parents:
3376
diff
changeset
|
3022 subblkpat = 2 - (ttblk == TT_8X4_TOP); |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3023 ttblk = TT_8X4; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3024 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3025 if(ttblk == TT_4X8_RIGHT || ttblk == TT_4X8_LEFT) { |
3377
dc4813852345
0xFFFF l of cola. Now P-frames are decoded almost without distortions.
kostya
parents:
3376
diff
changeset
|
3026 subblkpat = 2 - (ttblk == TT_4X8_LEFT); |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3027 ttblk = TT_4X8; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3028 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3029 switch(ttblk) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3030 case TT_8X8: |
7355 | 3031 pat = 0xF; |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3032 i = 0; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3033 last = 0; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3034 while (!last) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3035 vc1_decode_ac_coeff(v, &last, &skip, &value, v->codingset2); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3036 i += skip; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3037 if(i > 63) |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3038 break; |
7136 | 3039 idx = wmv1_scantable[0][i++]; |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3040 block[idx] = value * scale; |
3475 | 3041 if(!v->pquantizer) |
3042 block[idx] += (block[idx] < 0) ? -mquant : mquant; | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3043 } |
5997
90de28dfd8d6
Switch VC-1 decoder to output decoded residual immediately.
kostya
parents:
5964
diff
changeset
|
3044 if(!skip_block){ |
90de28dfd8d6
Switch VC-1 decoder to output decoded residual immediately.
kostya
parents:
5964
diff
changeset
|
3045 s->dsp.vc1_inv_trans_8x8(block); |
90de28dfd8d6
Switch VC-1 decoder to output decoded residual immediately.
kostya
parents:
5964
diff
changeset
|
3046 s->dsp.add_pixels_clamped(block, dst, linesize); |
7355 | 3047 if(apply_filter && cbp_top & 0xC) |
3048 vc1_loop_filter(dst, 1, linesize, 8, mquant); | |
3049 if(apply_filter && cbp_left & 0xA) | |
3050 vc1_loop_filter(dst, linesize, 1, 8, mquant); | |
5997
90de28dfd8d6
Switch VC-1 decoder to output decoded residual immediately.
kostya
parents:
5964
diff
changeset
|
3051 } |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3052 break; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3053 case TT_4X4: |
7355 | 3054 pat = ~subblkpat & 0xF; |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3055 for(j = 0; j < 4; j++) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3056 last = subblkpat & (1 << (3 - j)); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3057 i = 0; |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3058 off = (j & 1) * 4 + (j & 2) * 16; |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3059 while (!last) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3060 vc1_decode_ac_coeff(v, &last, &skip, &value, v->codingset2); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3061 i += skip; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3062 if(i > 15) |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3063 break; |
4949 | 3064 idx = ff_vc1_simple_progressive_4x4_zz[i++]; |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3065 block[idx + off] = value * scale; |
3475 | 3066 if(!v->pquantizer) |
3067 block[idx + off] += (block[idx + off] < 0) ? -mquant : mquant; | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3068 } |
7355 | 3069 if(!(subblkpat & (1 << (3 - j))) && !skip_block){ |
5997
90de28dfd8d6
Switch VC-1 decoder to output decoded residual immediately.
kostya
parents:
5964
diff
changeset
|
3070 s->dsp.vc1_inv_trans_4x4(dst + (j&1)*4 + (j&2)*2*linesize, linesize, block + off); |
7355 | 3071 if(apply_filter && (j&2 ? pat & (1<<(j-2)) : (cbp_top & (1 << (j + 2))))) |
3072 vc1_loop_filter(dst + (j&1)*4 + (j&2)*2*linesize, 1, linesize, 4, mquant); | |
3073 if(apply_filter && (j&1 ? pat & (1<<(j-1)) : (cbp_left & (1 << (j + 1))))) | |
3074 vc1_loop_filter(dst + (j&1)*4 + (j&2)*2*linesize, linesize, 1, 4, mquant); | |
3075 } | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3076 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3077 break; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3078 case TT_8X4: |
7355 | 3079 pat = ~((subblkpat & 2)*6 + (subblkpat & 1)*3) & 0xF; |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3080 for(j = 0; j < 2; j++) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3081 last = subblkpat & (1 << (1 - j)); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3082 i = 0; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3083 off = j * 32; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3084 while (!last) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3085 vc1_decode_ac_coeff(v, &last, &skip, &value, v->codingset2); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3086 i += skip; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3087 if(i > 31) |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3088 break; |
6145
ddf5d7fae101
Select scan tables for 8x4 and 4x8 blocks only once.
kostya
parents:
6099
diff
changeset
|
3089 idx = v->zz_8x4[i++]+off; |
ddf5d7fae101
Select scan tables for 8x4 and 4x8 blocks only once.
kostya
parents:
6099
diff
changeset
|
3090 block[idx] = value * scale; |
3475 | 3091 if(!v->pquantizer) |
6145
ddf5d7fae101
Select scan tables for 8x4 and 4x8 blocks only once.
kostya
parents:
6099
diff
changeset
|
3092 block[idx] += (block[idx] < 0) ? -mquant : mquant; |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3093 } |
7355 | 3094 if(!(subblkpat & (1 << (1 - j))) && !skip_block){ |
5997
90de28dfd8d6
Switch VC-1 decoder to output decoded residual immediately.
kostya
parents:
5964
diff
changeset
|
3095 s->dsp.vc1_inv_trans_8x4(dst + j*4*linesize, linesize, block + off); |
7355 | 3096 if(apply_filter && j ? pat & 0x3 : (cbp_top & 0xC)) |
3097 vc1_loop_filter(dst + j*4*linesize, 1, linesize, 8, mquant); | |
3098 if(apply_filter && cbp_left & (2 << j)) | |
3099 vc1_loop_filter(dst + j*4*linesize, linesize, 1, 4, mquant); | |
3100 } | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3101 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3102 break; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3103 case TT_4X8: |
7355 | 3104 pat = ~(subblkpat*5) & 0xF; |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3105 for(j = 0; j < 2; j++) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3106 last = subblkpat & (1 << (1 - j)); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3107 i = 0; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3108 off = j * 4; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3109 while (!last) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3110 vc1_decode_ac_coeff(v, &last, &skip, &value, v->codingset2); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3111 i += skip; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3112 if(i > 31) |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3113 break; |
6145
ddf5d7fae101
Select scan tables for 8x4 and 4x8 blocks only once.
kostya
parents:
6099
diff
changeset
|
3114 idx = v->zz_4x8[i++]+off; |
ddf5d7fae101
Select scan tables for 8x4 and 4x8 blocks only once.
kostya
parents:
6099
diff
changeset
|
3115 block[idx] = value * scale; |
3475 | 3116 if(!v->pquantizer) |
6145
ddf5d7fae101
Select scan tables for 8x4 and 4x8 blocks only once.
kostya
parents:
6099
diff
changeset
|
3117 block[idx] += (block[idx] < 0) ? -mquant : mquant; |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3118 } |
7355 | 3119 if(!(subblkpat & (1 << (1 - j))) && !skip_block){ |
5997
90de28dfd8d6
Switch VC-1 decoder to output decoded residual immediately.
kostya
parents:
5964
diff
changeset
|
3120 s->dsp.vc1_inv_trans_4x8(dst + j*4, linesize, block + off); |
7355 | 3121 if(apply_filter && cbp_top & (2 << j)) |
3122 vc1_loop_filter(dst + j*4, 1, linesize, 4, mquant); | |
3123 if(apply_filter && j ? pat & 0x5 : (cbp_left & 0xA)) | |
3124 vc1_loop_filter(dst + j*4, linesize, 1, 8, mquant); | |
3125 } | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3126 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3127 break; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3128 } |
7355 | 3129 return pat; |
3359 | 3130 } |
3131 | |
8685 | 3132 /** @} */ // Macroblock group |
3133 | |
8645 | 3134 static const int size_table [6] = { 0, 2, 3, 4, 5, 8 }; |
3135 static const int offset_table[6] = { 0, 1, 3, 7, 15, 31 }; | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3136 |
3359 | 3137 /** Decode one P-frame MB (in Simple/Main profile) |
3138 */ | |
3476
33a177588139
Don't pass block[6][64] parameter to decode_p_mb as we always use s->block
kostya
parents:
3475
diff
changeset
|
3139 static int vc1_decode_p_mb(VC1Context *v) |
3359 | 3140 { |
3141 MpegEncContext *s = &v->s; | |
3142 GetBitContext *gb = &s->gb; | |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3143 int i, j; |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3144 int mb_pos = s->mb_x + s->mb_y * s->mb_stride; |
3359 | 3145 int cbp; /* cbp decoding stuff */ |
3146 int mqdiff, mquant; /* MB quantization */ | |
3405
58c4fd135462
Correctly choose global transform mode, MV mode and fix bitplane decoding
kostya
parents:
3404
diff
changeset
|
3147 int ttmb = v->ttfrm; /* MB Transform type */ |
3359 | 3148 |
3149 int mb_has_coeffs = 1; /* last_flag */ | |
3150 int dmv_x, dmv_y; /* Differential MV components */ | |
6903 | 3151 int index, index1; /* LUT indexes */ |
3359 | 3152 int val, sign; /* temp values */ |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3153 int first_block = 1; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3154 int dst_idx, off; |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3155 int skipped, fourmv; |
7355 | 3156 int block_cbp = 0, pat; |
7846 | 3157 int apply_loop_filter; |
3359 | 3158 |
3159 mquant = v->pq; /* Loosy initialization */ | |
3160 | |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3161 if (v->mv_type_is_raw) |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3162 fourmv = get_bits1(gb); |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3163 else |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3164 fourmv = v->mv_type_mb_plane[mb_pos]; |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3165 if (v->skip_is_raw) |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3166 skipped = get_bits1(gb); |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3167 else |
3375
a1c2e1603be9
Use MpegEncContext->mbskip_table instead of custom bitplane.
kostya
parents:
3371
diff
changeset
|
3168 skipped = v->s.mbskip_table[mb_pos]; |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3169 |
3396 | 3170 s->dsp.clear_blocks(s->block[0]); |
3171 | |
7846 | 3172 apply_loop_filter = s->loop_filter && !(s->avctx->skip_loop_filter >= AVDISCARD_NONKEY); |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3173 if (!fourmv) /* 1MV mode */ |
3359 | 3174 { |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3175 if (!skipped) |
3359 | 3176 { |
3177 GET_MVDATA(dmv_x, dmv_y); | |
3178 | |
3689 | 3179 if (s->mb_intra) { |
3180 s->current_picture.motion_val[1][s->block_index[0]][0] = 0; | |
3181 s->current_picture.motion_val[1][s->block_index[0]][1] = 0; | |
3182 } | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3183 s->current_picture.mb_type[mb_pos] = s->mb_intra ? MB_TYPE_INTRA : MB_TYPE_16x16; |
3396 | 3184 vc1_pred_mv(s, 0, dmv_x, dmv_y, 1, v->range_x, v->range_y, v->mb_type[0]); |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3185 |
3359 | 3186 /* FIXME Set DC val for inter block ? */ |
3187 if (s->mb_intra && !mb_has_coeffs) | |
3188 { | |
3189 GET_MQUANT(); | |
5513 | 3190 s->ac_pred = get_bits1(gb); |
3359 | 3191 cbp = 0; |
3192 } | |
3193 else if (mb_has_coeffs) | |
3194 { | |
5513 | 3195 if (s->mb_intra) s->ac_pred = get_bits1(gb); |
3359 | 3196 cbp = get_vlc2(&v->s.gb, v->cbpcy_vlc->table, VC1_CBPCY_P_VLC_BITS, 2); |
3197 GET_MQUANT(); | |
3198 } | |
3199 else | |
3200 { | |
3201 mquant = v->pq; | |
3202 cbp = 0; | |
3203 } | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3204 s->current_picture.qscale_table[mb_pos] = mquant; |
3359 | 3205 |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3206 if (!v->ttmbf && !s->mb_intra && mb_has_coeffs) |
4949 | 3207 ttmb = get_vlc2(gb, ff_vc1_ttmb_vlc[v->tt_index].table, |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3208 VC1_TTMB_VLC_BITS, 2); |
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3209 if(!s->mb_intra) vc1_mc_1mv(v, 0); |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3210 dst_idx = 0; |
3359 | 3211 for (i=0; i<6; i++) |
3212 { | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3213 s->dc_val[0][s->block_index[i]] = 0; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3214 dst_idx += i >> 2; |
3359 | 3215 val = ((cbp >> (5 - i)) & 1); |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3216 off = (i & 4) ? 0 : ((i & 1) * 8 + (i & 2) * 4 * s->linesize); |
3396 | 3217 v->mb_type[0][s->block_index[i]] = s->mb_intra; |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3218 if(s->mb_intra) { |
3364
59c10b66fbbc
Added loop filtering as ersatz for overlap filter (improves picture quality for coarse quantization).
kostya
parents:
3363
diff
changeset
|
3219 /* check if prediction blocks A and C are available */ |
59c10b66fbbc
Added loop filtering as ersatz for overlap filter (improves picture quality for coarse quantization).
kostya
parents:
3363
diff
changeset
|
3220 v->a_avail = v->c_avail = 0; |
3449
ec6096b1ab04
Use s->first_slice_line in checks instead of s->mb_y
kostya
parents:
3430
diff
changeset
|
3221 if(i == 2 || i == 3 || !s->first_slice_line) |
3396 | 3222 v->a_avail = v->mb_type[0][s->block_index[i] - s->block_wrap[i]]; |
3223 if(i == 1 || i == 3 || s->mb_x) | |
3224 v->c_avail = v->mb_type[0][s->block_index[i] - 1]; | |
3364
59c10b66fbbc
Added loop filtering as ersatz for overlap filter (improves picture quality for coarse quantization).
kostya
parents:
3363
diff
changeset
|
3225 |
3476
33a177588139
Don't pass block[6][64] parameter to decode_p_mb as we always use s->block
kostya
parents:
3475
diff
changeset
|
3226 vc1_decode_intra_block(v, s->block[i], i, val, mquant, (i&4)?v->codingset2:v->codingset); |
3521 | 3227 if((i>3) && (s->flags & CODEC_FLAG_GRAY)) continue; |
3527 | 3228 s->dsp.vc1_inv_trans_8x8(s->block[i]); |
3522 | 3229 if(v->rangeredfrm) for(j = 0; j < 64; j++) s->block[i][j] <<= 1; |
5921 | 3230 s->dsp.put_signed_pixels_clamped(s->block[i], s->dest[dst_idx] + off, s->linesize >> ((i & 4) >> 2)); |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3231 if(v->pq >= 9 && v->overlap) { |
4209 | 3232 if(v->c_avail) |
4239 | 3233 s->dsp.vc1_h_overlap(s->dest[dst_idx] + off, s->linesize >> ((i & 4) >> 2)); |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3234 if(v->a_avail) |
4239 | 3235 s->dsp.vc1_v_overlap(s->dest[dst_idx] + off, s->linesize >> ((i & 4) >> 2)); |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3236 } |
7846 | 3237 if(apply_loop_filter && s->mb_x && s->mb_x != (s->mb_width - 1) && s->mb_y && s->mb_y != (s->mb_height - 1)){ |
7355 | 3238 int left_cbp, top_cbp; |
3239 if(i & 4){ | |
3240 left_cbp = v->cbp[s->mb_x - 1] >> (i * 4); | |
3241 top_cbp = v->cbp[s->mb_x - s->mb_stride] >> (i * 4); | |
3242 }else{ | |
8582 | 3243 left_cbp = (i & 1) ? (cbp >> ((i-1)*4)) : (v->cbp[s->mb_x - 1] >> ((i+1)*4)); |
3244 top_cbp = (i & 2) ? (cbp >> ((i-2)*4)) : (v->cbp[s->mb_x - s->mb_stride] >> ((i+2)*4)); | |
7355 | 3245 } |
3246 if(left_cbp & 0xC) | |
3247 vc1_loop_filter(s->dest[dst_idx] + off, 1, i & 4 ? s->uvlinesize : s->linesize, 8, mquant); | |
3248 if(top_cbp & 0xA) | |
3249 vc1_loop_filter(s->dest[dst_idx] + off, i & 4 ? s->uvlinesize : s->linesize, 1, 8, mquant); | |
3250 } | |
3251 block_cbp |= 0xF << (i << 2); | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3252 } else if(val) { |
7355 | 3253 int left_cbp = 0, top_cbp = 0, filter = 0; |
7846 | 3254 if(apply_loop_filter && s->mb_x && s->mb_x != (s->mb_width - 1) && s->mb_y && s->mb_y != (s->mb_height - 1)){ |
7355 | 3255 filter = 1; |
3256 if(i & 4){ | |
3257 left_cbp = v->cbp[s->mb_x - 1] >> (i * 4); | |
3258 top_cbp = v->cbp[s->mb_x - s->mb_stride] >> (i * 4); | |
3259 }else{ | |
8582 | 3260 left_cbp = (i & 1) ? (cbp >> ((i-1)*4)) : (v->cbp[s->mb_x - 1] >> ((i+1)*4)); |
3261 top_cbp = (i & 2) ? (cbp >> ((i-2)*4)) : (v->cbp[s->mb_x - s->mb_stride] >> ((i+2)*4)); | |
7355 | 3262 } |
8582 | 3263 if(left_cbp & 0xC) |
3264 vc1_loop_filter(s->dest[dst_idx] + off, 1, i & 4 ? s->uvlinesize : s->linesize, 8, mquant); | |
3265 if(top_cbp & 0xA) | |
3266 vc1_loop_filter(s->dest[dst_idx] + off, i & 4 ? s->uvlinesize : s->linesize, 1, 8, mquant); | |
7355 | 3267 } |
3268 pat = vc1_decode_p_block(v, s->block[i], i, mquant, ttmb, first_block, s->dest[dst_idx] + off, (i&4)?s->uvlinesize:s->linesize, (i&4) && (s->flags & CODEC_FLAG_GRAY), filter, left_cbp, top_cbp); | |
3269 block_cbp |= pat << (i << 2); | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3270 if(!v->ttmbf && ttmb < 8) ttmb = -1; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3271 first_block = 0; |
3359 | 3272 } |
3273 } | |
3274 } | |
3275 else //Skipped | |
3276 { | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3277 s->mb_intra = 0; |
3507
44e0a262d500
Set DC = 0 for skipped MB as it interferes DC prediction
kostya
parents:
3506
diff
changeset
|
3278 for(i = 0; i < 6; i++) { |
44e0a262d500
Set DC = 0 for skipped MB as it interferes DC prediction
kostya
parents:
3506
diff
changeset
|
3279 v->mb_type[0][s->block_index[i]] = 0; |
44e0a262d500
Set DC = 0 for skipped MB as it interferes DC prediction
kostya
parents:
3506
diff
changeset
|
3280 s->dc_val[0][s->block_index[i]] = 0; |
44e0a262d500
Set DC = 0 for skipped MB as it interferes DC prediction
kostya
parents:
3506
diff
changeset
|
3281 } |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3282 s->current_picture.mb_type[mb_pos] = MB_TYPE_SKIP; |
3396 | 3283 s->current_picture.qscale_table[mb_pos] = 0; |
3284 vc1_pred_mv(s, 0, 0, 0, 1, v->range_x, v->range_y, v->mb_type[0]); | |
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3285 vc1_mc_1mv(v, 0); |
3359 | 3286 return 0; |
3287 } | |
3288 } //1MV mode | |
3289 else //4MV mode | |
3396 | 3290 { |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3291 if (!skipped /* unskipped MB */) |
3359 | 3292 { |
3396 | 3293 int intra_count = 0, coded_inter = 0; |
3294 int is_intra[6], is_coded[6]; | |
3359 | 3295 /* Get CBPCY */ |
3296 cbp = get_vlc2(&v->s.gb, v->cbpcy_vlc->table, VC1_CBPCY_P_VLC_BITS, 2); | |
3396 | 3297 for (i=0; i<6; i++) |
3359 | 3298 { |
3299 val = ((cbp >> (5 - i)) & 1); | |
3396 | 3300 s->dc_val[0][s->block_index[i]] = 0; |
3301 s->mb_intra = 0; | |
3302 if(i < 4) { | |
3303 dmv_x = dmv_y = 0; | |
3304 s->mb_intra = 0; | |
3305 mb_has_coeffs = 0; | |
3306 if(val) { | |
3307 GET_MVDATA(dmv_x, dmv_y); | |
3308 } | |
3309 vc1_pred_mv(s, i, dmv_x, dmv_y, 0, v->range_x, v->range_y, v->mb_type[0]); | |
3310 if(!s->mb_intra) vc1_mc_4mv_luma(v, i); | |
3311 intra_count += s->mb_intra; | |
3312 is_intra[i] = s->mb_intra; | |
3313 is_coded[i] = mb_has_coeffs; | |
3314 } | |
3315 if(i&4){ | |
3316 is_intra[i] = (intra_count >= 3); | |
3317 is_coded[i] = val; | |
3359 | 3318 } |
3396 | 3319 if(i == 4) vc1_mc_4mv_chroma(v); |
3320 v->mb_type[0][s->block_index[i]] = is_intra[i]; | |
3321 if(!coded_inter) coded_inter = !is_intra[i] & is_coded[i]; | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3322 } |
3453 | 3323 // if there are no coded blocks then don't do anything more |
3514 | 3324 if(!intra_count && !coded_inter) return 0; |
3396 | 3325 dst_idx = 0; |
3326 GET_MQUANT(); | |
3327 s->current_picture.qscale_table[mb_pos] = mquant; | |
3328 /* test if block is intra and has pred */ | |
3329 { | |
3330 int intrapred = 0; | |
3331 for(i=0; i<6; i++) | |
3332 if(is_intra[i]) { | |
3449
ec6096b1ab04
Use s->first_slice_line in checks instead of s->mb_y
kostya
parents:
3430
diff
changeset
|
3333 if(((!s->first_slice_line || (i==2 || i==3)) && v->mb_type[0][s->block_index[i] - s->block_wrap[i]]) |
ec6096b1ab04
Use s->first_slice_line in checks instead of s->mb_y
kostya
parents:
3430
diff
changeset
|
3334 || ((s->mb_x || (i==1 || i==3)) && v->mb_type[0][s->block_index[i] - 1])) { |
3396 | 3335 intrapred = 1; |
3336 break; | |
3337 } | |
3338 } | |
5513 | 3339 if(intrapred)s->ac_pred = get_bits1(gb); |
3396 | 3340 else s->ac_pred = 0; |
3341 } | |
3342 if (!v->ttmbf && coded_inter) | |
4949 | 3343 ttmb = get_vlc2(gb, ff_vc1_ttmb_vlc[v->tt_index].table, VC1_TTMB_VLC_BITS, 2); |
3396 | 3344 for (i=0; i<6; i++) |
3345 { | |
3346 dst_idx += i >> 2; | |
3347 off = (i & 4) ? 0 : ((i & 1) * 8 + (i & 2) * 4 * s->linesize); | |
3348 s->mb_intra = is_intra[i]; | |
3349 if (is_intra[i]) { | |
3350 /* check if prediction blocks A and C are available */ | |
3351 v->a_avail = v->c_avail = 0; | |
3449
ec6096b1ab04
Use s->first_slice_line in checks instead of s->mb_y
kostya
parents:
3430
diff
changeset
|
3352 if(i == 2 || i == 3 || !s->first_slice_line) |
3396 | 3353 v->a_avail = v->mb_type[0][s->block_index[i] - s->block_wrap[i]]; |
3354 if(i == 1 || i == 3 || s->mb_x) | |
3355 v->c_avail = v->mb_type[0][s->block_index[i] - 1]; | |
3359 | 3356 |
3396 | 3357 vc1_decode_intra_block(v, s->block[i], i, is_coded[i], mquant, (i&4)?v->codingset2:v->codingset); |
3521 | 3358 if((i>3) && (s->flags & CODEC_FLAG_GRAY)) continue; |
3527 | 3359 s->dsp.vc1_inv_trans_8x8(s->block[i]); |
3522 | 3360 if(v->rangeredfrm) for(j = 0; j < 64; j++) s->block[i][j] <<= 1; |
5921 | 3361 s->dsp.put_signed_pixels_clamped(s->block[i], s->dest[dst_idx] + off, (i&4)?s->uvlinesize:s->linesize); |
3396 | 3362 if(v->pq >= 9 && v->overlap) { |
4209 | 3363 if(v->c_avail) |
4239 | 3364 s->dsp.vc1_h_overlap(s->dest[dst_idx] + off, s->linesize >> ((i & 4) >> 2)); |
3396 | 3365 if(v->a_avail) |
4239 | 3366 s->dsp.vc1_v_overlap(s->dest[dst_idx] + off, s->linesize >> ((i & 4) >> 2)); |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3367 } |
7355 | 3368 if(v->s.loop_filter && s->mb_x && s->mb_x != (s->mb_width - 1) && s->mb_y && s->mb_y != (s->mb_height - 1)){ |
3369 int left_cbp, top_cbp; | |
3370 if(i & 4){ | |
3371 left_cbp = v->cbp[s->mb_x - 1] >> (i * 4); | |
3372 top_cbp = v->cbp[s->mb_x - s->mb_stride] >> (i * 4); | |
3373 }else{ | |
8582 | 3374 left_cbp = (i & 1) ? (cbp >> ((i-1)*4)) : (v->cbp[s->mb_x - 1] >> ((i+1)*4)); |
3375 top_cbp = (i & 2) ? (cbp >> ((i-2)*4)) : (v->cbp[s->mb_x - s->mb_stride] >> ((i+2)*4)); | |
7355 | 3376 } |
3377 if(left_cbp & 0xC) | |
3378 vc1_loop_filter(s->dest[dst_idx] + off, 1, i & 4 ? s->uvlinesize : s->linesize, 8, mquant); | |
3379 if(top_cbp & 0xA) | |
3380 vc1_loop_filter(s->dest[dst_idx] + off, i & 4 ? s->uvlinesize : s->linesize, 1, 8, mquant); | |
3381 } | |
3382 block_cbp |= 0xF << (i << 2); | |
3396 | 3383 } else if(is_coded[i]) { |
7355 | 3384 int left_cbp = 0, top_cbp = 0, filter = 0; |
3385 if(v->s.loop_filter && s->mb_x && s->mb_x != (s->mb_width - 1) && s->mb_y && s->mb_y != (s->mb_height - 1)){ | |
3386 filter = 1; | |
3387 if(i & 4){ | |
3388 left_cbp = v->cbp[s->mb_x - 1] >> (i * 4); | |
3389 top_cbp = v->cbp[s->mb_x - s->mb_stride] >> (i * 4); | |
3390 }else{ | |
8582 | 3391 left_cbp = (i & 1) ? (cbp >> ((i-1)*4)) : (v->cbp[s->mb_x - 1] >> ((i+1)*4)); |
3392 top_cbp = (i & 2) ? (cbp >> ((i-2)*4)) : (v->cbp[s->mb_x - s->mb_stride] >> ((i+2)*4)); | |
7355 | 3393 } |
8582 | 3394 if(left_cbp & 0xC) |
3395 vc1_loop_filter(s->dest[dst_idx] + off, 1, i & 4 ? s->uvlinesize : s->linesize, 8, mquant); | |
3396 if(top_cbp & 0xA) | |
3397 vc1_loop_filter(s->dest[dst_idx] + off, i & 4 ? s->uvlinesize : s->linesize, 1, 8, mquant); | |
7355 | 3398 } |
3399 pat = vc1_decode_p_block(v, s->block[i], i, mquant, ttmb, first_block, s->dest[dst_idx] + off, (i&4)?s->uvlinesize:s->linesize, (i&4) && (s->flags & CODEC_FLAG_GRAY), filter, left_cbp, top_cbp); | |
3400 block_cbp |= pat << (i << 2); | |
3396 | 3401 if(!v->ttmbf && ttmb < 8) ttmb = -1; |
3402 first_block = 0; | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3403 } |
3359 | 3404 } |
7355 | 3405 return 0; |
3359 | 3406 } |
3407 else //Skipped MB | |
3408 { | |
3400
84de54d536bd
4-MV mode final fixes (now it works for non-exotic modes)
kostya
parents:
3399
diff
changeset
|
3409 s->mb_intra = 0; |
3514 | 3410 s->current_picture.qscale_table[mb_pos] = 0; |
3507
44e0a262d500
Set DC = 0 for skipped MB as it interferes DC prediction
kostya
parents:
3506
diff
changeset
|
3411 for (i=0; i<6; i++) { |
44e0a262d500
Set DC = 0 for skipped MB as it interferes DC prediction
kostya
parents:
3506
diff
changeset
|
3412 v->mb_type[0][s->block_index[i]] = 0; |
44e0a262d500
Set DC = 0 for skipped MB as it interferes DC prediction
kostya
parents:
3506
diff
changeset
|
3413 s->dc_val[0][s->block_index[i]] = 0; |
44e0a262d500
Set DC = 0 for skipped MB as it interferes DC prediction
kostya
parents:
3506
diff
changeset
|
3414 } |
3359 | 3415 for (i=0; i<4; i++) |
3416 { | |
3396 | 3417 vc1_pred_mv(s, i, 0, 0, 0, v->range_x, v->range_y, v->mb_type[0]); |
3418 vc1_mc_4mv_luma(v, i); | |
3359 | 3419 } |
3396 | 3420 vc1_mc_4mv_chroma(v); |
3421 s->current_picture.qscale_table[mb_pos] = 0; | |
3359 | 3422 return 0; |
3423 } | |
3424 } | |
7355 | 3425 v->cbp[s->mb_x] = block_cbp; |
3359 | 3426 |
3427 /* Should never happen */ | |
3428 return -1; | |
3429 } | |
3430 | |
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3431 /** Decode one B-frame MB (in Main profile) |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3432 */ |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3433 static void vc1_decode_b_mb(VC1Context *v) |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3434 { |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3435 MpegEncContext *s = &v->s; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3436 GetBitContext *gb = &s->gb; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3437 int i, j; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3438 int mb_pos = s->mb_x + s->mb_y * s->mb_stride; |
3553
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
3439 int cbp = 0; /* cbp decoding stuff */ |
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3440 int mqdiff, mquant; /* MB quantization */ |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3441 int ttmb = v->ttfrm; /* MB Transform type */ |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3442 int mb_has_coeffs = 0; /* last_flag */ |
6903 | 3443 int index, index1; /* LUT indexes */ |
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3444 int val, sign; /* temp values */ |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3445 int first_block = 1; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3446 int dst_idx, off; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3447 int skipped, direct; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3448 int dmv_x[2], dmv_y[2]; |
3690
35aae593db08
[Cosmetics] Remove some done TODOs/FIXMEs from comments
kostya
parents:
3689
diff
changeset
|
3449 int bmvtype = BMV_TYPE_BACKWARD; |
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3450 |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3451 mquant = v->pq; /* Loosy initialization */ |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3452 s->mb_intra = 0; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3453 |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3454 if (v->dmb_is_raw) |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3455 direct = get_bits1(gb); |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3456 else |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3457 direct = v->direct_mb_plane[mb_pos]; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3458 if (v->skip_is_raw) |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3459 skipped = get_bits1(gb); |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3460 else |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3461 skipped = v->s.mbskip_table[mb_pos]; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3462 |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3463 s->dsp.clear_blocks(s->block[0]); |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3464 dmv_x[0] = dmv_x[1] = dmv_y[0] = dmv_y[1] = 0; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3465 for(i = 0; i < 6; i++) { |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3466 v->mb_type[0][s->block_index[i]] = 0; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3467 s->dc_val[0][s->block_index[i]] = 0; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3468 } |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3469 s->current_picture.qscale_table[mb_pos] = 0; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3470 |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3471 if (!direct) { |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3472 if (!skipped) { |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3473 GET_MVDATA(dmv_x[0], dmv_y[0]); |
3553
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
3474 dmv_x[1] = dmv_x[0]; |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
3475 dmv_y[1] = dmv_y[0]; |
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3476 } |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3477 if(skipped || !s->mb_intra) { |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3478 bmvtype = decode012(gb); |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3479 switch(bmvtype) { |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3480 case 0: |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3481 bmvtype = (v->bfraction >= (B_FRACTION_DEN/2)) ? BMV_TYPE_BACKWARD : BMV_TYPE_FORWARD; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3482 break; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3483 case 1: |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3484 bmvtype = (v->bfraction >= (B_FRACTION_DEN/2)) ? BMV_TYPE_FORWARD : BMV_TYPE_BACKWARD; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3485 break; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3486 case 2: |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3487 bmvtype = BMV_TYPE_INTERPOLATED; |
3743
fc613a610303
Reorder MV order in B-frames so no swapping in vc1_b_mc() is needed
kostya
parents:
3711
diff
changeset
|
3488 dmv_x[0] = dmv_y[0] = 0; |
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3489 } |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3490 } |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3491 } |
3689 | 3492 for(i = 0; i < 6; i++) |
3493 v->mb_type[0][s->block_index[i]] = s->mb_intra; | |
3494 | |
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3495 if (skipped) { |
3689 | 3496 if(direct) bmvtype = BMV_TYPE_INTERPOLATED; |
3497 vc1_pred_b_mv(v, dmv_x, dmv_y, direct, bmvtype); | |
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3498 vc1_b_mc(v, dmv_x, dmv_y, direct, bmvtype); |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3499 return; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3500 } |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3501 if (direct) { |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3502 cbp = get_vlc2(&v->s.gb, v->cbpcy_vlc->table, VC1_CBPCY_P_VLC_BITS, 2); |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3503 GET_MQUANT(); |
3553
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
3504 s->mb_intra = 0; |
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
3505 mb_has_coeffs = 0; |
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3506 s->current_picture.qscale_table[mb_pos] = mquant; |
3553
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
3507 if(!v->ttmbf) |
4949 | 3508 ttmb = get_vlc2(gb, ff_vc1_ttmb_vlc[v->tt_index].table, VC1_TTMB_VLC_BITS, 2); |
3689 | 3509 dmv_x[0] = dmv_y[0] = dmv_x[1] = dmv_y[1] = 0; |
3510 vc1_pred_b_mv(v, dmv_x, dmv_y, direct, bmvtype); | |
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3511 vc1_b_mc(v, dmv_x, dmv_y, direct, bmvtype); |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3512 } else { |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3513 if(!mb_has_coeffs && !s->mb_intra) { |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3514 /* no coded blocks - effectively skipped */ |
3689 | 3515 vc1_pred_b_mv(v, dmv_x, dmv_y, direct, bmvtype); |
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3516 vc1_b_mc(v, dmv_x, dmv_y, direct, bmvtype); |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3517 return; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3518 } |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3519 if(s->mb_intra && !mb_has_coeffs) { |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3520 GET_MQUANT(); |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3521 s->current_picture.qscale_table[mb_pos] = mquant; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3522 s->ac_pred = get_bits1(gb); |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3523 cbp = 0; |
3689 | 3524 vc1_pred_b_mv(v, dmv_x, dmv_y, direct, bmvtype); |
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3525 } else { |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3526 if(bmvtype == BMV_TYPE_INTERPOLATED) { |
3743
fc613a610303
Reorder MV order in B-frames so no swapping in vc1_b_mc() is needed
kostya
parents:
3711
diff
changeset
|
3527 GET_MVDATA(dmv_x[0], dmv_y[0]); |
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3528 if(!mb_has_coeffs) { |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3529 /* interpolated skipped block */ |
3689 | 3530 vc1_pred_b_mv(v, dmv_x, dmv_y, direct, bmvtype); |
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3531 vc1_b_mc(v, dmv_x, dmv_y, direct, bmvtype); |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3532 return; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3533 } |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3534 } |
3689 | 3535 vc1_pred_b_mv(v, dmv_x, dmv_y, direct, bmvtype); |
3536 if(!s->mb_intra) { | |
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3537 vc1_b_mc(v, dmv_x, dmv_y, direct, bmvtype); |
3689 | 3538 } |
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3539 if(s->mb_intra) |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3540 s->ac_pred = get_bits1(gb); |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3541 cbp = get_vlc2(&v->s.gb, v->cbpcy_vlc->table, VC1_CBPCY_P_VLC_BITS, 2); |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3542 GET_MQUANT(); |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3543 s->current_picture.qscale_table[mb_pos] = mquant; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3544 if(!v->ttmbf && !s->mb_intra && mb_has_coeffs) |
4949 | 3545 ttmb = get_vlc2(gb, ff_vc1_ttmb_vlc[v->tt_index].table, VC1_TTMB_VLC_BITS, 2); |
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3546 } |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3547 } |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3548 dst_idx = 0; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3549 for (i=0; i<6; i++) |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3550 { |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3551 s->dc_val[0][s->block_index[i]] = 0; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3552 dst_idx += i >> 2; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3553 val = ((cbp >> (5 - i)) & 1); |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3554 off = (i & 4) ? 0 : ((i & 1) * 8 + (i & 2) * 4 * s->linesize); |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3555 v->mb_type[0][s->block_index[i]] = s->mb_intra; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3556 if(s->mb_intra) { |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3557 /* check if prediction blocks A and C are available */ |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3558 v->a_avail = v->c_avail = 0; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3559 if(i == 2 || i == 3 || !s->first_slice_line) |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3560 v->a_avail = v->mb_type[0][s->block_index[i] - s->block_wrap[i]]; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3561 if(i == 1 || i == 3 || s->mb_x) |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3562 v->c_avail = v->mb_type[0][s->block_index[i] - 1]; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3563 |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3564 vc1_decode_intra_block(v, s->block[i], i, val, mquant, (i&4)?v->codingset2:v->codingset); |
3521 | 3565 if((i>3) && (s->flags & CODEC_FLAG_GRAY)) continue; |
3527 | 3566 s->dsp.vc1_inv_trans_8x8(s->block[i]); |
3522 | 3567 if(v->rangeredfrm) for(j = 0; j < 64; j++) s->block[i][j] <<= 1; |
5921 | 3568 s->dsp.put_signed_pixels_clamped(s->block[i], s->dest[dst_idx] + off, s->linesize >> ((i & 4) >> 2)); |
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3569 } else if(val) { |
7355 | 3570 vc1_decode_p_block(v, s->block[i], i, mquant, ttmb, first_block, s->dest[dst_idx] + off, (i&4)?s->uvlinesize:s->linesize, (i&4) && (s->flags & CODEC_FLAG_GRAY), 0, 0, 0); |
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3571 if(!v->ttmbf && ttmb < 8) ttmb = -1; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3572 first_block = 0; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3573 } |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3574 } |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3575 } |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3576 |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3577 /** Decode blocks of I-frame |
3359 | 3578 */ |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3579 static void vc1_decode_i_blocks(VC1Context *v) |
3359 | 3580 { |
3450 | 3581 int k, j; |
3359 | 3582 MpegEncContext *s = &v->s; |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3583 int cbp, val; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3584 uint8_t *coded_val; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3585 int mb_pos; |
3359 | 3586 |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3587 /* select codingmode used for VLC tables selection */ |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3588 switch(v->y_ac_table_index){ |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3589 case 0: |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3590 v->codingset = (v->pqindex <= 8) ? CS_HIGH_RATE_INTRA : CS_LOW_MOT_INTRA; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3591 break; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3592 case 1: |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3593 v->codingset = CS_HIGH_MOT_INTRA; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3594 break; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3595 case 2: |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3596 v->codingset = CS_MID_RATE_INTRA; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3597 break; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3598 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3599 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3600 switch(v->c_ac_table_index){ |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3601 case 0: |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3602 v->codingset2 = (v->pqindex <= 8) ? CS_HIGH_RATE_INTER : CS_LOW_MOT_INTER; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3603 break; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3604 case 1: |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3605 v->codingset2 = CS_HIGH_MOT_INTER; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3606 break; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3607 case 2: |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3608 v->codingset2 = CS_MID_RATE_INTER; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3609 break; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3610 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3611 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3612 /* Set DC scale - y and c use the same */ |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3613 s->y_dc_scale = s->y_dc_scale_table[v->pq]; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3614 s->c_dc_scale = s->c_dc_scale_table[v->pq]; |
3359 | 3615 |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3616 //do frame decode |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3617 s->mb_x = s->mb_y = 0; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3618 s->mb_intra = 1; |
3449
ec6096b1ab04
Use s->first_slice_line in checks instead of s->mb_y
kostya
parents:
3430
diff
changeset
|
3619 s->first_slice_line = 1; |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3620 for(s->mb_y = 0; s->mb_y < s->mb_height; s->mb_y++) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3621 for(s->mb_x = 0; s->mb_x < s->mb_width; s->mb_x++) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3622 ff_init_block_index(s); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3623 ff_update_block_index(s); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3624 s->dsp.clear_blocks(s->block[0]); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3625 mb_pos = s->mb_x + s->mb_y * s->mb_width; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3626 s->current_picture.mb_type[mb_pos] = MB_TYPE_INTRA; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3627 s->current_picture.qscale_table[mb_pos] = v->pq; |
3710
08280665be40
Set motion vectors used in B-frames to zero by default
kostya
parents:
3709
diff
changeset
|
3628 s->current_picture.motion_val[1][s->block_index[0]][0] = 0; |
08280665be40
Set motion vectors used in B-frames to zero by default
kostya
parents:
3709
diff
changeset
|
3629 s->current_picture.motion_val[1][s->block_index[0]][1] = 0; |
3359 | 3630 |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3631 // do actual MB decoding and displaying |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3632 cbp = get_vlc2(&v->s.gb, ff_msmp4_mb_i_vlc.table, MB_INTRA_VLC_BITS, 2); |
5513 | 3633 v->s.ac_pred = get_bits1(&v->s.gb); |
3359 | 3634 |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3635 for(k = 0; k < 6; k++) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3636 val = ((cbp >> (5 - k)) & 1); |
3364
59c10b66fbbc
Added loop filtering as ersatz for overlap filter (improves picture quality for coarse quantization).
kostya
parents:
3363
diff
changeset
|
3637 |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3638 if (k < 4) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3639 int pred = vc1_coded_block_pred(&v->s, k, &coded_val); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3640 val = val ^ pred; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3641 *coded_val = val; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3642 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3643 cbp |= val << (5 - k); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3644 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3645 vc1_decode_i_block(v, s->block[k], k, val, (k<4)? v->codingset : v->codingset2); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3646 |
3527 | 3647 s->dsp.vc1_inv_trans_8x8(s->block[k]); |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3648 if(v->pq >= 9 && v->overlap) { |
3450 | 3649 for(j = 0; j < 64; j++) s->block[k][j] += 128; |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3650 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3651 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3652 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3653 vc1_put_block(v, s->block); |
3690
35aae593db08
[Cosmetics] Remove some done TODOs/FIXMEs from comments
kostya
parents:
3689
diff
changeset
|
3654 if(v->pq >= 9 && v->overlap) { |
4209 | 3655 if(s->mb_x) { |
4239 | 3656 s->dsp.vc1_h_overlap(s->dest[0], s->linesize); |
3657 s->dsp.vc1_h_overlap(s->dest[0] + 8 * s->linesize, s->linesize); | |
4209 | 3658 if(!(s->flags & CODEC_FLAG_GRAY)) { |
4239 | 3659 s->dsp.vc1_h_overlap(s->dest[1], s->uvlinesize); |
3660 s->dsp.vc1_h_overlap(s->dest[2], s->uvlinesize); | |
4209 | 3661 } |
3662 } | |
4239 | 3663 s->dsp.vc1_h_overlap(s->dest[0] + 8, s->linesize); |
3664 s->dsp.vc1_h_overlap(s->dest[0] + 8 * s->linesize + 8, s->linesize); | |
3450 | 3665 if(!s->first_slice_line) { |
4239 | 3666 s->dsp.vc1_v_overlap(s->dest[0], s->linesize); |
3667 s->dsp.vc1_v_overlap(s->dest[0] + 8, s->linesize); | |
3521 | 3668 if(!(s->flags & CODEC_FLAG_GRAY)) { |
4239 | 3669 s->dsp.vc1_v_overlap(s->dest[1], s->uvlinesize); |
3670 s->dsp.vc1_v_overlap(s->dest[2], s->uvlinesize); | |
3521 | 3671 } |
3364
59c10b66fbbc
Added loop filtering as ersatz for overlap filter (improves picture quality for coarse quantization).
kostya
parents:
3363
diff
changeset
|
3672 } |
4239 | 3673 s->dsp.vc1_v_overlap(s->dest[0] + 8 * s->linesize, s->linesize); |
3674 s->dsp.vc1_v_overlap(s->dest[0] + 8 * s->linesize + 8, s->linesize); | |
3364
59c10b66fbbc
Added loop filtering as ersatz for overlap filter (improves picture quality for coarse quantization).
kostya
parents:
3363
diff
changeset
|
3675 } |
7355 | 3676 if(v->s.loop_filter) vc1_loop_filter_iblk(s, s->current_picture.qscale_table[mb_pos]); |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3677 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3678 if(get_bits_count(&s->gb) > v->bits) { |
5684 | 3679 ff_er_add_slice(s, 0, 0, s->mb_x, s->mb_y, (AC_END|DC_END|MV_END)); |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3680 av_log(s->avctx, AV_LOG_ERROR, "Bits overconsumption: %i > %i\n", get_bits_count(&s->gb), v->bits); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3681 return; |
3359 | 3682 } |
3683 } | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3684 ff_draw_horiz_band(s, s->mb_y * 16, 16); |
3449
ec6096b1ab04
Use s->first_slice_line in checks instead of s->mb_y
kostya
parents:
3430
diff
changeset
|
3685 s->first_slice_line = 0; |
3359 | 3686 } |
5684 | 3687 ff_er_add_slice(s, 0, 0, s->mb_width - 1, s->mb_height - 1, (AC_END|DC_END|MV_END)); |
3359 | 3688 } |
3689 | |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3690 /** Decode blocks of I-frame for advanced profile |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3691 */ |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3692 static void vc1_decode_i_blocks_adv(VC1Context *v) |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3693 { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3694 int k, j; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3695 MpegEncContext *s = &v->s; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3696 int cbp, val; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3697 uint8_t *coded_val; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3698 int mb_pos; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3699 int mquant = v->pq; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3700 int mqdiff; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3701 int overlap; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3702 GetBitContext *gb = &s->gb; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3703 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3704 /* select codingmode used for VLC tables selection */ |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3705 switch(v->y_ac_table_index){ |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3706 case 0: |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3707 v->codingset = (v->pqindex <= 8) ? CS_HIGH_RATE_INTRA : CS_LOW_MOT_INTRA; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3708 break; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3709 case 1: |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3710 v->codingset = CS_HIGH_MOT_INTRA; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3711 break; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3712 case 2: |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3713 v->codingset = CS_MID_RATE_INTRA; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3714 break; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3715 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3716 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3717 switch(v->c_ac_table_index){ |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3718 case 0: |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3719 v->codingset2 = (v->pqindex <= 8) ? CS_HIGH_RATE_INTER : CS_LOW_MOT_INTER; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3720 break; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3721 case 1: |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3722 v->codingset2 = CS_HIGH_MOT_INTER; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3723 break; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3724 case 2: |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3725 v->codingset2 = CS_MID_RATE_INTER; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3726 break; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3727 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3728 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3729 //do frame decode |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3730 s->mb_x = s->mb_y = 0; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3731 s->mb_intra = 1; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3732 s->first_slice_line = 1; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3733 for(s->mb_y = 0; s->mb_y < s->mb_height; s->mb_y++) { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3734 for(s->mb_x = 0; s->mb_x < s->mb_width; s->mb_x++) { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3735 ff_init_block_index(s); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3736 ff_update_block_index(s); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3737 s->dsp.clear_blocks(s->block[0]); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3738 mb_pos = s->mb_x + s->mb_y * s->mb_stride; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3739 s->current_picture.mb_type[mb_pos] = MB_TYPE_INTRA; |
3710
08280665be40
Set motion vectors used in B-frames to zero by default
kostya
parents:
3709
diff
changeset
|
3740 s->current_picture.motion_val[1][s->block_index[0]][0] = 0; |
08280665be40
Set motion vectors used in B-frames to zero by default
kostya
parents:
3709
diff
changeset
|
3741 s->current_picture.motion_val[1][s->block_index[0]][1] = 0; |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3742 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3743 // do actual MB decoding and displaying |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3744 cbp = get_vlc2(&v->s.gb, ff_msmp4_mb_i_vlc.table, MB_INTRA_VLC_BITS, 2); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3745 if(v->acpred_is_raw) |
5513 | 3746 v->s.ac_pred = get_bits1(&v->s.gb); |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3747 else |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3748 v->s.ac_pred = v->acpred_plane[mb_pos]; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3749 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3750 if(v->condover == CONDOVER_SELECT) { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3751 if(v->overflg_is_raw) |
5513 | 3752 overlap = get_bits1(&v->s.gb); |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3753 else |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3754 overlap = v->over_flags_plane[mb_pos]; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3755 } else |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3756 overlap = (v->condover == CONDOVER_ALL); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3757 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3758 GET_MQUANT(); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3759 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3760 s->current_picture.qscale_table[mb_pos] = mquant; |
4237
327e9d4572cb
100l: Initialize dc_scale with current quantizer for adv I frames
kostya
parents:
4236
diff
changeset
|
3761 /* Set DC scale - y and c use the same */ |
327e9d4572cb
100l: Initialize dc_scale with current quantizer for adv I frames
kostya
parents:
4236
diff
changeset
|
3762 s->y_dc_scale = s->y_dc_scale_table[mquant]; |
327e9d4572cb
100l: Initialize dc_scale with current quantizer for adv I frames
kostya
parents:
4236
diff
changeset
|
3763 s->c_dc_scale = s->c_dc_scale_table[mquant]; |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3764 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3765 for(k = 0; k < 6; k++) { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3766 val = ((cbp >> (5 - k)) & 1); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3767 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3768 if (k < 4) { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3769 int pred = vc1_coded_block_pred(&v->s, k, &coded_val); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3770 val = val ^ pred; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3771 *coded_val = val; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3772 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3773 cbp |= val << (5 - k); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3774 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3775 v->a_avail = !s->first_slice_line || (k==2 || k==3); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3776 v->c_avail = !!s->mb_x || (k==1 || k==3); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3777 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3778 vc1_decode_i_block_adv(v, s->block[k], k, val, (k<4)? v->codingset : v->codingset2, mquant); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3779 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3780 s->dsp.vc1_inv_trans_8x8(s->block[k]); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3781 for(j = 0; j < 64; j++) s->block[k][j] += 128; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3782 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3783 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3784 vc1_put_block(v, s->block); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3785 if(overlap) { |
4209 | 3786 if(s->mb_x) { |
4239 | 3787 s->dsp.vc1_h_overlap(s->dest[0], s->linesize); |
3788 s->dsp.vc1_h_overlap(s->dest[0] + 8 * s->linesize, s->linesize); | |
4209 | 3789 if(!(s->flags & CODEC_FLAG_GRAY)) { |
4239 | 3790 s->dsp.vc1_h_overlap(s->dest[1], s->uvlinesize); |
3791 s->dsp.vc1_h_overlap(s->dest[2], s->uvlinesize); | |
4209 | 3792 } |
3793 } | |
4239 | 3794 s->dsp.vc1_h_overlap(s->dest[0] + 8, s->linesize); |
3795 s->dsp.vc1_h_overlap(s->dest[0] + 8 * s->linesize + 8, s->linesize); | |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3796 if(!s->first_slice_line) { |
4239 | 3797 s->dsp.vc1_v_overlap(s->dest[0], s->linesize); |
3798 s->dsp.vc1_v_overlap(s->dest[0] + 8, s->linesize); | |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3799 if(!(s->flags & CODEC_FLAG_GRAY)) { |
4239 | 3800 s->dsp.vc1_v_overlap(s->dest[1], s->uvlinesize); |
3801 s->dsp.vc1_v_overlap(s->dest[2], s->uvlinesize); | |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3802 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3803 } |
4239 | 3804 s->dsp.vc1_v_overlap(s->dest[0] + 8 * s->linesize, s->linesize); |
3805 s->dsp.vc1_v_overlap(s->dest[0] + 8 * s->linesize + 8, s->linesize); | |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3806 } |
7355 | 3807 if(v->s.loop_filter) vc1_loop_filter_iblk(s, s->current_picture.qscale_table[mb_pos]); |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3808 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3809 if(get_bits_count(&s->gb) > v->bits) { |
5684 | 3810 ff_er_add_slice(s, 0, 0, s->mb_x, s->mb_y, (AC_END|DC_END|MV_END)); |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3811 av_log(s->avctx, AV_LOG_ERROR, "Bits overconsumption: %i > %i\n", get_bits_count(&s->gb), v->bits); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3812 return; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3813 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3814 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3815 ff_draw_horiz_band(s, s->mb_y * 16, 16); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3816 s->first_slice_line = 0; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3817 } |
5684 | 3818 ff_er_add_slice(s, 0, 0, s->mb_width - 1, s->mb_height - 1, (AC_END|DC_END|MV_END)); |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3819 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3820 |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3821 static void vc1_decode_p_blocks(VC1Context *v) |
3359 | 3822 { |
3823 MpegEncContext *s = &v->s; | |
3824 | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3825 /* select codingmode used for VLC tables selection */ |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3826 switch(v->c_ac_table_index){ |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3827 case 0: |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3828 v->codingset = (v->pqindex <= 8) ? CS_HIGH_RATE_INTRA : CS_LOW_MOT_INTRA; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3829 break; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3830 case 1: |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3831 v->codingset = CS_HIGH_MOT_INTRA; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3832 break; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3833 case 2: |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3834 v->codingset = CS_MID_RATE_INTRA; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3835 break; |
3359 | 3836 } |
3837 | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3838 switch(v->c_ac_table_index){ |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3839 case 0: |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3840 v->codingset2 = (v->pqindex <= 8) ? CS_HIGH_RATE_INTER : CS_LOW_MOT_INTER; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3841 break; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3842 case 1: |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3843 v->codingset2 = CS_HIGH_MOT_INTER; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3844 break; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3845 case 2: |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3846 v->codingset2 = CS_MID_RATE_INTER; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3847 break; |
3359 | 3848 } |
3849 | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3850 s->first_slice_line = 1; |
7355 | 3851 memset(v->cbp_base, 0, sizeof(v->cbp_base[0])*2*s->mb_stride); |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3852 for(s->mb_y = 0; s->mb_y < s->mb_height; s->mb_y++) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3853 for(s->mb_x = 0; s->mb_x < s->mb_width; s->mb_x++) { |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3854 ff_init_block_index(s); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3855 ff_update_block_index(s); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3856 s->dsp.clear_blocks(s->block[0]); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3857 |
3476
33a177588139
Don't pass block[6][64] parameter to decode_p_mb as we always use s->block
kostya
parents:
3475
diff
changeset
|
3858 vc1_decode_p_mb(v); |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3859 if(get_bits_count(&s->gb) > v->bits || get_bits_count(&s->gb) < 0) { |
5684 | 3860 ff_er_add_slice(s, 0, 0, s->mb_x, s->mb_y, (AC_END|DC_END|MV_END)); |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3861 av_log(s->avctx, AV_LOG_ERROR, "Bits overconsumption: %i > %i at %ix%i\n", get_bits_count(&s->gb), v->bits,s->mb_x,s->mb_y); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3862 return; |
3359 | 3863 } |
3864 } | |
7355 | 3865 memmove(v->cbp_base, v->cbp, sizeof(v->cbp_base[0])*s->mb_stride); |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3866 ff_draw_horiz_band(s, s->mb_y * 16, 16); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3867 s->first_slice_line = 0; |
3359 | 3868 } |
5684 | 3869 ff_er_add_slice(s, 0, 0, s->mb_width - 1, s->mb_height - 1, (AC_END|DC_END|MV_END)); |
3359 | 3870 } |
3871 | |
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3872 static void vc1_decode_b_blocks(VC1Context *v) |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3873 { |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3874 MpegEncContext *s = &v->s; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3875 |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3876 /* select codingmode used for VLC tables selection */ |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3877 switch(v->c_ac_table_index){ |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3878 case 0: |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3879 v->codingset = (v->pqindex <= 8) ? CS_HIGH_RATE_INTRA : CS_LOW_MOT_INTRA; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3880 break; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3881 case 1: |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3882 v->codingset = CS_HIGH_MOT_INTRA; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3883 break; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3884 case 2: |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3885 v->codingset = CS_MID_RATE_INTRA; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3886 break; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3887 } |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3888 |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3889 switch(v->c_ac_table_index){ |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3890 case 0: |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3891 v->codingset2 = (v->pqindex <= 8) ? CS_HIGH_RATE_INTER : CS_LOW_MOT_INTER; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3892 break; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3893 case 1: |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3894 v->codingset2 = CS_HIGH_MOT_INTER; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3895 break; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3896 case 2: |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3897 v->codingset2 = CS_MID_RATE_INTER; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3898 break; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3899 } |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3900 |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3901 s->first_slice_line = 1; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3902 for(s->mb_y = 0; s->mb_y < s->mb_height; s->mb_y++) { |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3903 for(s->mb_x = 0; s->mb_x < s->mb_width; s->mb_x++) { |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3904 ff_init_block_index(s); |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3905 ff_update_block_index(s); |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3906 s->dsp.clear_blocks(s->block[0]); |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3907 |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3908 vc1_decode_b_mb(v); |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3909 if(get_bits_count(&s->gb) > v->bits || get_bits_count(&s->gb) < 0) { |
5684 | 3910 ff_er_add_slice(s, 0, 0, s->mb_x, s->mb_y, (AC_END|DC_END|MV_END)); |
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3911 av_log(s->avctx, AV_LOG_ERROR, "Bits overconsumption: %i > %i at %ix%i\n", get_bits_count(&s->gb), v->bits,s->mb_x,s->mb_y); |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3912 return; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3913 } |
7355 | 3914 if(v->s.loop_filter) vc1_loop_filter_iblk(s, s->current_picture.qscale_table[s->mb_x + s->mb_y *s->mb_stride]); |
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3915 } |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3916 ff_draw_horiz_band(s, s->mb_y * 16, 16); |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3917 s->first_slice_line = 0; |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3918 } |
5684 | 3919 ff_er_add_slice(s, 0, 0, s->mb_width - 1, s->mb_height - 1, (AC_END|DC_END|MV_END)); |
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3920 } |
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3921 |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3922 static void vc1_decode_skip_blocks(VC1Context *v) |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3923 { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3924 MpegEncContext *s = &v->s; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3925 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3926 ff_er_add_slice(s, 0, 0, s->mb_width - 1, s->mb_height - 1, (AC_END|DC_END|MV_END)); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3927 s->first_slice_line = 1; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3928 for(s->mb_y = 0; s->mb_y < s->mb_height; s->mb_y++) { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3929 s->mb_x = 0; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3930 ff_init_block_index(s); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3931 ff_update_block_index(s); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3932 memcpy(s->dest[0], s->last_picture.data[0] + s->mb_y * 16 * s->linesize, s->linesize * 16); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3933 memcpy(s->dest[1], s->last_picture.data[1] + s->mb_y * 8 * s->uvlinesize, s->uvlinesize * 8); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3934 memcpy(s->dest[2], s->last_picture.data[2] + s->mb_y * 8 * s->uvlinesize, s->uvlinesize * 8); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3935 ff_draw_horiz_band(s, s->mb_y * 16, 16); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3936 s->first_slice_line = 0; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3937 } |
6481 | 3938 s->pict_type = FF_P_TYPE; |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3939 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3940 |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3941 static void vc1_decode_blocks(VC1Context *v) |
3359 | 3942 { |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3943 |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3944 v->s.esc3_level_length = 0; |
5887 | 3945 if(v->x8_type){ |
3946 ff_intrax8_decode_picture(&v->x8, 2*v->pq+v->halfpq, v->pq*(!v->pquantizer) ); | |
5894 | 3947 }else{ |
3359 | 3948 |
5893 | 3949 switch(v->s.pict_type) { |
6481 | 3950 case FF_I_TYPE: |
4433 | 3951 if(v->profile == PROFILE_ADVANCED) |
3952 vc1_decode_i_blocks_adv(v); | |
3953 else | |
3954 vc1_decode_i_blocks(v); | |
5893 | 3955 break; |
6481 | 3956 case FF_P_TYPE: |
5893 | 3957 if(v->p_frame_skipped) |
3958 vc1_decode_skip_blocks(v); | |
3959 else | |
3960 vc1_decode_p_blocks(v); | |
3961 break; | |
6481 | 3962 case FF_B_TYPE: |
5893 | 3963 if(v->bi_type){ |
3964 if(v->profile == PROFILE_ADVANCED) | |
3965 vc1_decode_i_blocks_adv(v); | |
3966 else | |
3967 vc1_decode_i_blocks(v); | |
3968 }else | |
3969 vc1_decode_b_blocks(v); | |
3970 break; | |
3971 } | |
5894 | 3972 } |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3973 } |
3359 | 3974 |
4462 | 3975 /** Find VC-1 marker in buffer |
3976 * @return position where next marker starts or end of buffer if no marker found | |
3977 */ | |
6304 | 3978 static av_always_inline const uint8_t* find_next_marker(const uint8_t *src, const uint8_t *end) |
4462 | 3979 { |
3980 uint32_t mrk = 0xFFFFFFFF; | |
3981 | |
3982 if(end-src < 4) return end; | |
3983 while(src < end){ | |
3984 mrk = (mrk << 8) | *src++; | |
3985 if(IS_MARKER(mrk)) | |
3986 return src-4; | |
3987 } | |
3988 return end; | |
3989 } | |
3990 | |
6304 | 3991 static av_always_inline int vc1_unescape_buffer(const uint8_t *src, int size, uint8_t *dst) |
4462 | 3992 { |
3993 int dsize = 0, i; | |
3994 | |
3995 if(size < 4){ | |
3996 for(dsize = 0; dsize < size; dsize++) *dst++ = *src++; | |
3997 return size; | |
3998 } | |
3999 for(i = 0; i < size; i++, src++) { | |
4000 if(src[0] == 3 && i >= 2 && !src[-1] && !src[-2] && i < size-1 && src[1] < 4) { | |
4001 dst[dsize++] = src[1]; | |
4002 src++; | |
4003 i++; | |
4004 } else | |
4005 dst[dsize++] = *src; | |
4006 } | |
4007 return dsize; | |
4008 } | |
3359 | 4009 |
4010 /** Initialize a VC1/WMV3 decoder | |
4011 * @todo TODO: Handle VC-1 IDUs (Transport level?) | |
4012 * @todo TODO: Decypher remaining bits in extra_data | |
4013 */ | |
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6481
diff
changeset
|
4014 static av_cold int vc1_decode_init(AVCodecContext *avctx) |
3359 | 4015 { |
4016 VC1Context *v = avctx->priv_data; | |
4017 MpegEncContext *s = &v->s; | |
4018 GetBitContext gb; | |
4019 | |
4020 if (!avctx->extradata_size || !avctx->extradata) return -1; | |
3521 | 4021 if (!(avctx->flags & CODEC_FLAG_GRAY)) |
9224
aed92dbae82e
Add support for HW accelerated VC-1 decoding through the new
gb
parents:
9047
diff
changeset
|
4022 avctx->pix_fmt = avctx->get_format(avctx, avctx->codec->pix_fmts); |
3521 | 4023 else |
4024 avctx->pix_fmt = PIX_FMT_GRAY8; | |
9224
aed92dbae82e
Add support for HW accelerated VC-1 decoding through the new
gb
parents:
9047
diff
changeset
|
4025 avctx->hwaccel = ff_find_hwaccel(avctx->codec->id, avctx->pix_fmt); |
3359 | 4026 v->s.avctx = avctx; |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
4027 avctx->flags |= CODEC_FLAG_EMU_EDGE; |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
4028 v->s.flags |= CODEC_FLAG_EMU_EDGE; |
3359 | 4029 |
5887 | 4030 if(avctx->idct_algo==FF_IDCT_AUTO){ |
4031 avctx->idct_algo=FF_IDCT_WMV2; | |
4032 } | |
4033 | |
3359 | 4034 if(ff_h263_decode_init(avctx) < 0) |
4035 return -1; | |
4036 if (vc1_init_common(v) < 0) return -1; | |
4037 | |
4038 avctx->coded_width = avctx->width; | |
4039 avctx->coded_height = avctx->height; | |
4040 if (avctx->codec_id == CODEC_ID_WMV3) | |
4041 { | |
4042 int count = 0; | |
4043 | |
4044 // looks like WMV3 has a sequence header stored in the extradata | |
4045 // advanced sequence header may be before the first frame | |
4046 // the last byte of the extradata is a version number, 1 for the | |
4047 // samples we can decode | |
4048 | |
4049 init_get_bits(&gb, avctx->extradata, avctx->extradata_size*8); | |
4050 | |
4051 if (decode_sequence_header(avctx, &gb) < 0) | |
4052 return -1; | |
4053 | |
4054 count = avctx->extradata_size*8 - get_bits_count(&gb); | |
4055 if (count>0) | |
4056 { | |
4057 av_log(avctx, AV_LOG_INFO, "Extra data: %i bits left, value: %X\n", | |
4058 count, get_bits(&gb, count)); | |
4059 } | |
4060 else if (count < 0) | |
4061 { | |
4062 av_log(avctx, AV_LOG_INFO, "Read %i bits in overflow\n", -count); | |
4063 } | |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4064 } else { // VC1/WVC1 |
6304 | 4065 const uint8_t *start = avctx->extradata; |
4066 uint8_t *end = avctx->extradata + avctx->extradata_size; | |
4067 const uint8_t *next; | |
4068 int size, buf2_size; | |
4462 | 4069 uint8_t *buf2 = NULL; |
6350 | 4070 int seq_initialized = 0, ep_initialized = 0; |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4071 |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4072 if(avctx->extradata_size < 16) { |
4462 | 4073 av_log(avctx, AV_LOG_ERROR, "Extradata size too small: %i\n", avctx->extradata_size); |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4074 return -1; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4075 } |
4462 | 4076 |
4077 buf2 = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); | |
4078 if(start[0]) start++; // in WVC1 extradata first byte is its size | |
4079 next = start; | |
4080 for(; next < end; start = next){ | |
4081 next = find_next_marker(start + 4, end); | |
4082 size = next - start - 4; | |
4083 if(size <= 0) continue; | |
4084 buf2_size = vc1_unescape_buffer(start + 4, size, buf2); | |
4085 init_get_bits(&gb, buf2, buf2_size * 8); | |
4086 switch(AV_RB32(start)){ | |
4087 case VC1_CODE_SEQHDR: | |
4088 if(decode_sequence_header(avctx, &gb) < 0){ | |
4089 av_free(buf2); | |
4090 return -1; | |
4091 } | |
6350 | 4092 seq_initialized = 1; |
4462 | 4093 break; |
4094 case VC1_CODE_ENTRYPOINT: | |
4095 if(decode_entry_point(avctx, &gb) < 0){ | |
4096 av_free(buf2); | |
4097 return -1; | |
4098 } | |
6350 | 4099 ep_initialized = 1; |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4100 break; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4101 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4102 } |
4462 | 4103 av_free(buf2); |
6350 | 4104 if(!seq_initialized || !ep_initialized){ |
4462 | 4105 av_log(avctx, AV_LOG_ERROR, "Incomplete extradata\n"); |
4106 return -1; | |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4107 } |
3359 | 4108 } |
4109 avctx->has_b_frames= !!(avctx->max_b_frames); | |
3707
e7f4366d9731
2989l: Set avctx->has_b_frames value in header and don't change it
kostya
parents:
3698
diff
changeset
|
4110 s->low_delay = !avctx->has_b_frames; |
3359 | 4111 |
4112 s->mb_width = (avctx->coded_width+15)>>4; | |
4113 s->mb_height = (avctx->coded_height+15)>>4; | |
4114 | |
4115 /* Allocate mb bitplanes */ | |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
4116 v->mv_type_mb_plane = av_malloc(s->mb_stride * s->mb_height); |
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
4117 v->direct_mb_plane = av_malloc(s->mb_stride * s->mb_height); |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4118 v->acpred_plane = av_malloc(s->mb_stride * s->mb_height); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4119 v->over_flags_plane = av_malloc(s->mb_stride * s->mb_height); |
3359 | 4120 |
7355 | 4121 v->cbp_base = av_malloc(sizeof(v->cbp_base[0]) * 2 * s->mb_stride); |
4122 v->cbp = v->cbp_base + s->mb_stride; | |
4123 | |
3396 | 4124 /* allocate block type info in that way so it could be used with s->block_index[] */ |
4125 v->mb_type_base = av_malloc(s->b8_stride * (s->mb_height * 2 + 1) + s->mb_stride * (s->mb_height + 1) * 2); | |
4126 v->mb_type[0] = v->mb_type_base + s->b8_stride + 1; | |
4127 v->mb_type[1] = v->mb_type_base + s->b8_stride * (s->mb_height * 2 + 1) + s->mb_stride + 1; | |
4128 v->mb_type[2] = v->mb_type[1] + s->mb_stride * (s->mb_height + 1); | |
4129 | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4130 /* Init coded blocks info */ |
3359 | 4131 if (v->profile == PROFILE_ADVANCED) |
4132 { | |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
4133 // if (alloc_bitplane(&v->over_flags_plane, s->mb_width, s->mb_height) < 0) |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
4134 // return -1; |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
4135 // if (alloc_bitplane(&v->ac_pred_plane, s->mb_width, s->mb_height) < 0) |
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
4136 // return -1; |
3359 | 4137 } |
4138 | |
5887 | 4139 ff_intrax8_common_init(&v->x8,s); |
3359 | 4140 return 0; |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4141 } |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4142 |
3359 | 4143 |
4144 /** Decode a VC1/WMV3 frame | |
4145 * @todo TODO: Handle VC-1 IDUs (Transport level?) | |
4146 */ | |
4147 static int vc1_decode_frame(AVCodecContext *avctx, | |
4148 void *data, int *data_size, | |
9355
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9327
diff
changeset
|
4149 AVPacket *avpkt) |
3359 | 4150 { |
9355
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9327
diff
changeset
|
4151 const uint8_t *buf = avpkt->data; |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9327
diff
changeset
|
4152 int buf_size = avpkt->size; |
3359 | 4153 VC1Context *v = avctx->priv_data; |
4154 MpegEncContext *s = &v->s; | |
4155 AVFrame *pict = data; | |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4156 uint8_t *buf2 = NULL; |
9025 | 4157 const uint8_t *buf_start = buf; |
3359 | 4158 |
4159 /* no supplementary picture */ | |
4160 if (buf_size == 0) { | |
4161 /* special case for last picture */ | |
4162 if (s->low_delay==0 && s->next_picture_ptr) { | |
4163 *pict= *(AVFrame*)s->next_picture_ptr; | |
4164 s->next_picture_ptr= NULL; | |
4165 | |
4166 *data_size = sizeof(AVFrame); | |
4167 } | |
4168 | |
4169 return 0; | |
4170 } | |
4171 | |
5127 | 4172 /* We need to set current_picture_ptr before reading the header, |
5128 | 4173 * otherwise we cannot store anything in there. */ |
3359 | 4174 if(s->current_picture_ptr==NULL || s->current_picture_ptr->data[0]){ |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4175 int i= ff_find_unused_picture(s, 0); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4176 s->current_picture_ptr= &s->picture[i]; |
3359 | 4177 } |
4178 | |
8631
2d7269e13a8d
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents:
8627
diff
changeset
|
4179 if (s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU){ |
2d7269e13a8d
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents:
8627
diff
changeset
|
4180 if (v->profile < PROFILE_ADVANCED) |
2d7269e13a8d
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents:
8627
diff
changeset
|
4181 avctx->pix_fmt = PIX_FMT_VDPAU_WMV3; |
2d7269e13a8d
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents:
8627
diff
changeset
|
4182 else |
2d7269e13a8d
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents:
8627
diff
changeset
|
4183 avctx->pix_fmt = PIX_FMT_VDPAU_VC1; |
2d7269e13a8d
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents:
8627
diff
changeset
|
4184 } |
2d7269e13a8d
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents:
8627
diff
changeset
|
4185 |
4462 | 4186 //for advanced profile we may need to parse and unescape data |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4187 if (avctx->codec_id == CODEC_ID_VC1) { |
4462 | 4188 int buf_size2 = 0; |
4189 buf2 = av_mallocz(buf_size + FF_INPUT_BUFFER_PADDING_SIZE); | |
4190 | |
4191 if(IS_MARKER(AV_RB32(buf))){ /* frame starts with marker and needs to be parsed */ | |
6290 | 4192 const uint8_t *start, *end, *next; |
4462 | 4193 int size; |
4194 | |
4195 next = buf; | |
4196 for(start = buf, end = buf + buf_size; next < end; start = next){ | |
4197 next = find_next_marker(start + 4, end); | |
4198 size = next - start - 4; | |
4199 if(size <= 0) continue; | |
4200 switch(AV_RB32(start)){ | |
4201 case VC1_CODE_FRAME: | |
9224
aed92dbae82e
Add support for HW accelerated VC-1 decoding through the new
gb
parents:
9047
diff
changeset
|
4202 if (avctx->hwaccel || |
aed92dbae82e
Add support for HW accelerated VC-1 decoding through the new
gb
parents:
9047
diff
changeset
|
4203 s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU) |
9025 | 4204 buf_start = start; |
4462 | 4205 buf_size2 = vc1_unescape_buffer(start + 4, size, buf2); |
4206 break; | |
4207 case VC1_CODE_ENTRYPOINT: /* it should be before frame data */ | |
4208 buf_size2 = vc1_unescape_buffer(start + 4, size, buf2); | |
4209 init_get_bits(&s->gb, buf2, buf_size2*8); | |
4210 decode_entry_point(avctx, &s->gb); | |
4211 break; | |
4212 case VC1_CODE_SLICE: | |
4213 av_log(avctx, AV_LOG_ERROR, "Sliced decoding is not implemented (yet)\n"); | |
4214 av_free(buf2); | |
4215 return -1; | |
4216 } | |
4217 } | |
4218 }else if(v->interlace && ((buf[0] & 0xC0) == 0xC0)){ /* WVC1 interlaced stores both fields divided by marker */ | |
6304 | 4219 const uint8_t *divider; |
4462 | 4220 |
4221 divider = find_next_marker(buf, buf + buf_size); | |
4222 if((divider == (buf + buf_size)) || AV_RB32(divider) != VC1_CODE_FIELD){ | |
4223 av_log(avctx, AV_LOG_ERROR, "Error in WVC1 interlaced frame\n"); | |
7300 | 4224 av_free(buf2); |
4462 | 4225 return -1; |
4226 } | |
4227 | |
4228 buf_size2 = vc1_unescape_buffer(buf, divider - buf, buf2); | |
4229 // TODO | |
4230 av_free(buf2);return -1; | |
4231 }else{ | |
4232 buf_size2 = vc1_unescape_buffer(buf, buf_size, buf2); | |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4233 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4234 init_get_bits(&s->gb, buf2, buf_size2*8); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4235 } else |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4236 init_get_bits(&s->gb, buf, buf_size*8); |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4237 // do parse frame header |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4238 if(v->profile < PROFILE_ADVANCED) { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4239 if(vc1_parse_frame_header(v, &s->gb) == -1) { |
3694
8765ee4eaa45
Drop unneeded checks before av_free() and change to av_freep() where it's more suitable.
kostya
parents:
3693
diff
changeset
|
4240 av_free(buf2); |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4241 return -1; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4242 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4243 } else { |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4244 if(vc1_parse_frame_header_adv(v, &s->gb) == -1) { |
3694
8765ee4eaa45
Drop unneeded checks before av_free() and change to av_freep() where it's more suitable.
kostya
parents:
3693
diff
changeset
|
4245 av_free(buf2); |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4246 return -1; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4247 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4248 } |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4249 |
6481 | 4250 if(s->pict_type != FF_I_TYPE && !v->res_rtm_flag){ |
3694
8765ee4eaa45
Drop unneeded checks before av_free() and change to av_freep() where it's more suitable.
kostya
parents:
3693
diff
changeset
|
4251 av_free(buf2); |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4252 return -1; |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4253 } |
3359 | 4254 |
4255 // for hurry_up==5 | |
4256 s->current_picture.pict_type= s->pict_type; | |
6481 | 4257 s->current_picture.key_frame= s->pict_type == FF_I_TYPE; |
3359 | 4258 |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4259 /* skip B-frames if we don't have reference frames */ |
6481 | 4260 if(s->last_picture_ptr==NULL && (s->pict_type==FF_B_TYPE || s->dropable)){ |
3694
8765ee4eaa45
Drop unneeded checks before av_free() and change to av_freep() where it's more suitable.
kostya
parents:
3693
diff
changeset
|
4261 av_free(buf2); |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4262 return -1;//buf_size; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4263 } |
3359 | 4264 /* skip b frames if we are in a hurry */ |
6481 | 4265 if(avctx->hurry_up && s->pict_type==FF_B_TYPE) return -1;//buf_size; |
4266 if( (avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type==FF_B_TYPE) | |
4267 || (avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type!=FF_I_TYPE) | |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4268 || avctx->skip_frame >= AVDISCARD_ALL) { |
3694
8765ee4eaa45
Drop unneeded checks before av_free() and change to av_freep() where it's more suitable.
kostya
parents:
3693
diff
changeset
|
4269 av_free(buf2); |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4270 return buf_size; |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4271 } |
3359 | 4272 /* skip everything if we are in a hurry>=5 */ |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4273 if(avctx->hurry_up>=5) { |
3694
8765ee4eaa45
Drop unneeded checks before av_free() and change to av_freep() where it's more suitable.
kostya
parents:
3693
diff
changeset
|
4274 av_free(buf2); |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4275 return -1;//buf_size; |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4276 } |
3359 | 4277 |
4278 if(s->next_p_frame_damaged){ | |
6481 | 4279 if(s->pict_type==FF_B_TYPE) |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4280 return buf_size; |
3359 | 4281 else |
4282 s->next_p_frame_damaged=0; | |
4283 } | |
4284 | |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4285 if(MPV_frame_start(s, avctx) < 0) { |
3694
8765ee4eaa45
Drop unneeded checks before av_free() and change to av_freep() where it's more suitable.
kostya
parents:
3693
diff
changeset
|
4286 av_free(buf2); |
3359 | 4287 return -1; |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4288 } |
3359 | 4289 |
5684 | 4290 s->me.qpel_put= s->dsp.put_qpel_pixels_tab; |
4291 s->me.qpel_avg= s->dsp.avg_qpel_pixels_tab; | |
4292 | |
8631
2d7269e13a8d
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents:
8627
diff
changeset
|
4293 if ((CONFIG_VC1_VDPAU_DECODER || CONFIG_WMV3_VDPAU_DECODER) |
2d7269e13a8d
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents:
8627
diff
changeset
|
4294 &&s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU) |
9025 | 4295 ff_vdpau_vc1_decode_picture(s, buf_start, (buf + buf_size) - buf_start); |
9224
aed92dbae82e
Add support for HW accelerated VC-1 decoding through the new
gb
parents:
9047
diff
changeset
|
4296 else if (avctx->hwaccel) { |
aed92dbae82e
Add support for HW accelerated VC-1 decoding through the new
gb
parents:
9047
diff
changeset
|
4297 if (avctx->hwaccel->start_frame(avctx, buf, buf_size) < 0) |
aed92dbae82e
Add support for HW accelerated VC-1 decoding through the new
gb
parents:
9047
diff
changeset
|
4298 return -1; |
aed92dbae82e
Add support for HW accelerated VC-1 decoding through the new
gb
parents:
9047
diff
changeset
|
4299 if (avctx->hwaccel->decode_slice(avctx, buf_start, (buf + buf_size) - buf_start) < 0) |
aed92dbae82e
Add support for HW accelerated VC-1 decoding through the new
gb
parents:
9047
diff
changeset
|
4300 return -1; |
aed92dbae82e
Add support for HW accelerated VC-1 decoding through the new
gb
parents:
9047
diff
changeset
|
4301 if (avctx->hwaccel->end_frame(avctx) < 0) |
aed92dbae82e
Add support for HW accelerated VC-1 decoding through the new
gb
parents:
9047
diff
changeset
|
4302 return -1; |
aed92dbae82e
Add support for HW accelerated VC-1 decoding through the new
gb
parents:
9047
diff
changeset
|
4303 } else { |
8632 | 4304 ff_er_frame_start(s); |
4305 | |
4306 v->bits = buf_size * 8; | |
4307 vc1_decode_blocks(v); | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4308 //av_log(s->avctx, AV_LOG_INFO, "Consumed %i/%i bits\n", get_bits_count(&s->gb), buf_size*8); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4309 // if(get_bits_count(&s->gb) > buf_size * 8) |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4310 // return -1; |
8632 | 4311 ff_er_frame_end(s); |
8631
2d7269e13a8d
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents:
8627
diff
changeset
|
4312 } |
3359 | 4313 |
4314 MPV_frame_end(s); | |
4315 | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4316 assert(s->current_picture.pict_type == s->current_picture_ptr->pict_type); |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4317 assert(s->current_picture.pict_type == s->pict_type); |
6481 | 4318 if (s->pict_type == FF_B_TYPE || s->low_delay) { |
3359 | 4319 *pict= *(AVFrame*)s->current_picture_ptr; |
4320 } else if (s->last_picture_ptr != NULL) { | |
4321 *pict= *(AVFrame*)s->last_picture_ptr; | |
4322 } | |
4323 | |
4324 if(s->last_picture_ptr || s->low_delay){ | |
4325 *data_size = sizeof(AVFrame); | |
4326 ff_print_debug_info(s, pict); | |
4327 } | |
4328 | |
4329 /* Return the Picture timestamp as the frame number */ | |
5964 | 4330 /* we subtract 1 because it is added on utils.c */ |
3359 | 4331 avctx->frame_number = s->picture_number - 1; |
4332 | |
3694
8765ee4eaa45
Drop unneeded checks before av_free() and change to av_freep() where it's more suitable.
kostya
parents:
3693
diff
changeset
|
4333 av_free(buf2); |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4334 return buf_size; |
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4335 } |
3359 | 4336 |
4337 | |
4338 /** Close a VC1/WMV3 decoder | |
4339 * @warning Initial try at using MpegEncContext stuff | |
4340 */ | |
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6481
diff
changeset
|
4341 static av_cold int vc1_decode_end(AVCodecContext *avctx) |
3359 | 4342 { |
4343 VC1Context *v = avctx->priv_data; | |
4344 | |
4345 av_freep(&v->hrd_rate); | |
4346 av_freep(&v->hrd_buffer); | |
4347 MPV_common_end(&v->s); | |
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
4348 av_freep(&v->mv_type_mb_plane); |
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
4349 av_freep(&v->direct_mb_plane); |
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4350 av_freep(&v->acpred_plane); |
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4351 av_freep(&v->over_flags_plane); |
3396 | 4352 av_freep(&v->mb_type_base); |
7355 | 4353 av_freep(&v->cbp_base); |
6176
1d735690e172
Correctly clean up IntraX8Context upon codec close.
andoma
parents:
6150
diff
changeset
|
4354 ff_intrax8_common_end(&v->x8); |
3359 | 4355 return 0; |
4356 } | |
4357 | |
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4358 |
3359 | 4359 AVCodec vc1_decoder = { |
4360 "vc1", | |
4361 CODEC_TYPE_VIDEO, | |
4362 CODEC_ID_VC1, | |
4363 sizeof(VC1Context), | |
4364 vc1_decode_init, | |
4365 NULL, | |
4366 vc1_decode_end, | |
4367 vc1_decode_frame, | |
4368 CODEC_CAP_DELAY, | |
6712 | 4369 NULL, |
7040
e943e1409077
Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents:
6903
diff
changeset
|
4370 .long_name = NULL_IF_CONFIG_SMALL("SMPTE VC-1"), |
9224
aed92dbae82e
Add support for HW accelerated VC-1 decoding through the new
gb
parents:
9047
diff
changeset
|
4371 .pix_fmts = ff_hwaccel_pixfmt_list_420 |
3359 | 4372 }; |
4373 | |
4374 AVCodec wmv3_decoder = { | |
4375 "wmv3", | |
4376 CODEC_TYPE_VIDEO, | |
4377 CODEC_ID_WMV3, | |
4378 sizeof(VC1Context), | |
4379 vc1_decode_init, | |
4380 NULL, | |
4381 vc1_decode_end, | |
4382 vc1_decode_frame, | |
4383 CODEC_CAP_DELAY, | |
6712 | 4384 NULL, |
7040
e943e1409077
Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents:
6903
diff
changeset
|
4385 .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9"), |
9224
aed92dbae82e
Add support for HW accelerated VC-1 decoding through the new
gb
parents:
9047
diff
changeset
|
4386 .pix_fmts = ff_hwaccel_pixfmt_list_420 |
3359 | 4387 }; |
8631
2d7269e13a8d
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents:
8627
diff
changeset
|
4388 |
2d7269e13a8d
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents:
8627
diff
changeset
|
4389 #if CONFIG_WMV3_VDPAU_DECODER |
2d7269e13a8d
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents:
8627
diff
changeset
|
4390 AVCodec wmv3_vdpau_decoder = { |
2d7269e13a8d
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents:
8627
diff
changeset
|
4391 "wmv3_vdpau", |
2d7269e13a8d
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents:
8627
diff
changeset
|
4392 CODEC_TYPE_VIDEO, |
2d7269e13a8d
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents:
8627
diff
changeset
|
4393 CODEC_ID_WMV3, |
2d7269e13a8d
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents:
8627
diff
changeset
|
4394 sizeof(VC1Context), |
2d7269e13a8d
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents:
8627
diff
changeset
|
4395 vc1_decode_init, |
2d7269e13a8d
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents:
8627
diff
changeset
|
4396 NULL, |
2d7269e13a8d
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents:
8627
diff
changeset
|
4397 vc1_decode_end, |
2d7269e13a8d
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents:
8627
diff
changeset
|
4398 vc1_decode_frame, |
2d7269e13a8d
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents:
8627
diff
changeset
|
4399 CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_HWACCEL_VDPAU, |
2d7269e13a8d
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents:
8627
diff
changeset
|
4400 NULL, |
2d7269e13a8d
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents:
8627
diff
changeset
|
4401 .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9 VDPAU"), |
9047
91f9fe7bedd9
Apply correct pix_fmts to WMV3_VDPAU and VC1_VDPAU.
cehoyos
parents:
9042
diff
changeset
|
4402 .pix_fmts = (enum PixelFormat[]){PIX_FMT_VDPAU_WMV3, PIX_FMT_NONE} |
8631
2d7269e13a8d
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents:
8627
diff
changeset
|
4403 }; |
2d7269e13a8d
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents:
8627
diff
changeset
|
4404 #endif |
2d7269e13a8d
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents:
8627
diff
changeset
|
4405 |
2d7269e13a8d
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents:
8627
diff
changeset
|
4406 #if CONFIG_VC1_VDPAU_DECODER |
2d7269e13a8d
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents:
8627
diff
changeset
|
4407 AVCodec vc1_vdpau_decoder = { |
2d7269e13a8d
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents:
8627
diff
changeset
|
4408 "vc1_vdpau", |
2d7269e13a8d
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents:
8627
diff
changeset
|
4409 CODEC_TYPE_VIDEO, |
2d7269e13a8d
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents:
8627
diff
changeset
|
4410 CODEC_ID_VC1, |
2d7269e13a8d
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents:
8627
diff
changeset
|
4411 sizeof(VC1Context), |
2d7269e13a8d
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents:
8627
diff
changeset
|
4412 vc1_decode_init, |
2d7269e13a8d
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents:
8627
diff
changeset
|
4413 NULL, |
2d7269e13a8d
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents:
8627
diff
changeset
|
4414 vc1_decode_end, |
2d7269e13a8d
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents:
8627
diff
changeset
|
4415 vc1_decode_frame, |
2d7269e13a8d
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents:
8627
diff
changeset
|
4416 CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_HWACCEL_VDPAU, |
2d7269e13a8d
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents:
8627
diff
changeset
|
4417 NULL, |
2d7269e13a8d
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents:
8627
diff
changeset
|
4418 .long_name = NULL_IF_CONFIG_SMALL("SMPTE VC-1 VDPAU"), |
9047
91f9fe7bedd9
Apply correct pix_fmts to WMV3_VDPAU and VC1_VDPAU.
cehoyos
parents:
9042
diff
changeset
|
4419 .pix_fmts = (enum PixelFormat[]){PIX_FMT_VDPAU_VC1, PIX_FMT_NONE} |
8631
2d7269e13a8d
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents:
8627
diff
changeset
|
4420 }; |
2d7269e13a8d
Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents:
8627
diff
changeset
|
4421 #endif |