Mercurial > libavcodec.hg
annotate vc1.c @ 8584:8a47574d9fbc libavcodec
VC-1 display dimensions should affect coded dimensions only (I think)
| author | kostya |
|---|---|
| date | Tue, 13 Jan 2009 08:05:40 +0000 |
| parents | d94775e24b0e |
| children | 8f9f86b93f88 |
| 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 /** | |
| 24 * @file vc1.c | |
| 25 * VC-1 and WMV3 decoder | |
| 26 * | |
| 27 */ | |
| 28 #include "dsputil.h" | |
| 29 #include "avcodec.h" | |
| 30 #include "mpegvideo.h" | |
| 4926 | 31 #include "vc1.h" |
| 3359 | 32 #include "vc1data.h" |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
33 #include "vc1acdata.h" |
| 4965 | 34 #include "msmpeg4data.h" |
| 5605 | 35 #include "unary.h" |
| 5849 | 36 #include "simple_idct.h" |
| 3359 | 37 |
| 38 #undef NDEBUG | |
| 39 #include <assert.h> | |
| 40 | |
| 41 #define MB_INTRA_VLC_BITS 9 | |
| 42 #define DC_VLC_BITS 9 | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
43 #define AC_VLC_BITS 9 |
| 3359 | 44 static const uint16_t table_mb_intra[64][2]; |
| 45 | |
| 46 | |
| 47 /** | |
| 48 * Init VC-1 specific tables and VC1Context members | |
| 49 * @param v The VC1Context to initialize | |
| 50 * @return Status | |
| 51 */ | |
| 52 static int vc1_init_common(VC1Context *v) | |
| 53 { | |
| 54 static int done = 0; | |
| 55 int i = 0; | |
| 56 | |
| 57 v->hrd_rate = v->hrd_buffer = NULL; | |
| 58 | |
| 59 /* VLC tables */ | |
| 60 if(!done) | |
| 61 { | |
| 62 done = 1; | |
| 4949 | 63 init_vlc(&ff_vc1_bfraction_vlc, VC1_BFRACTION_VLC_BITS, 23, |
| 64 ff_vc1_bfraction_bits, 1, 1, | |
| 65 ff_vc1_bfraction_codes, 1, 1, 1); | |
| 66 init_vlc(&ff_vc1_norm2_vlc, VC1_NORM2_VLC_BITS, 4, | |
| 67 ff_vc1_norm2_bits, 1, 1, | |
| 68 ff_vc1_norm2_codes, 1, 1, 1); | |
| 69 init_vlc(&ff_vc1_norm6_vlc, VC1_NORM6_VLC_BITS, 64, | |
| 70 ff_vc1_norm6_bits, 1, 1, | |
| 71 ff_vc1_norm6_codes, 2, 2, 1); | |
| 72 init_vlc(&ff_vc1_imode_vlc, VC1_IMODE_VLC_BITS, 7, | |
| 73 ff_vc1_imode_bits, 1, 1, | |
| 74 ff_vc1_imode_codes, 1, 1, 1); | |
| 3359 | 75 for (i=0; i<3; i++) |
| 76 { | |
| 4949 | 77 init_vlc(&ff_vc1_ttmb_vlc[i], VC1_TTMB_VLC_BITS, 16, |
| 78 ff_vc1_ttmb_bits[i], 1, 1, | |
| 79 ff_vc1_ttmb_codes[i], 2, 2, 1); | |
| 80 init_vlc(&ff_vc1_ttblk_vlc[i], VC1_TTBLK_VLC_BITS, 8, | |
| 81 ff_vc1_ttblk_bits[i], 1, 1, | |
| 82 ff_vc1_ttblk_codes[i], 1, 1, 1); | |
| 83 init_vlc(&ff_vc1_subblkpat_vlc[i], VC1_SUBBLKPAT_VLC_BITS, 15, | |
| 84 ff_vc1_subblkpat_bits[i], 1, 1, | |
| 85 ff_vc1_subblkpat_codes[i], 1, 1, 1); | |
| 3359 | 86 } |
| 87 for(i=0; i<4; i++) | |
| 88 { | |
| 4949 | 89 init_vlc(&ff_vc1_4mv_block_pattern_vlc[i], VC1_4MV_BLOCK_PATTERN_VLC_BITS, 16, |
| 90 ff_vc1_4mv_block_pattern_bits[i], 1, 1, | |
| 91 ff_vc1_4mv_block_pattern_codes[i], 1, 1, 1); | |
| 92 init_vlc(&ff_vc1_cbpcy_p_vlc[i], VC1_CBPCY_P_VLC_BITS, 64, | |
| 93 ff_vc1_cbpcy_p_bits[i], 1, 1, | |
| 94 ff_vc1_cbpcy_p_codes[i], 2, 2, 1); | |
| 95 init_vlc(&ff_vc1_mv_diff_vlc[i], VC1_MV_DIFF_VLC_BITS, 73, | |
| 96 ff_vc1_mv_diff_bits[i], 1, 1, | |
| 97 ff_vc1_mv_diff_codes[i], 2, 2, 1); | |
| 3359 | 98 } |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
99 for(i=0; i<8; i++) |
| 4949 | 100 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
|
101 &vc1_ac_tables[i][0][1], 8, 4, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
102 &vc1_ac_tables[i][0][0], 8, 4, 1); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
103 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
|
104 &ff_msmp4_mb_i_table[0][1], 4, 2, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
105 &ff_msmp4_mb_i_table[0][0], 4, 2, 1); |
| 3359 | 106 } |
| 107 | |
| 108 /* Other defaults */ | |
| 109 v->pq = -1; | |
| 110 v->mvrange = 0; /* 7.1.1.18, p80 */ | |
| 111 | |
| 112 return 0; | |
| 113 } | |
| 114 | |
| 115 /***********************************************************************/ | |
| 116 /** | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
117 * @defgroup bitplane VC9 Bitplane decoding |
| 3359 | 118 * @see 8.7, p56 |
| 119 * @{ | |
| 120 */ | |
| 121 | |
| 122 /** @addtogroup bitplane | |
| 123 * Imode types | |
| 124 * @{ | |
| 125 */ | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
126 enum Imode { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
127 IMODE_RAW, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
128 IMODE_NORM2, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
129 IMODE_DIFF2, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
130 IMODE_NORM6, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
131 IMODE_DIFF6, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
132 IMODE_ROWSKIP, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
133 IMODE_COLSKIP |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
134 }; |
| 3359 | 135 /** @} */ //imode defines |
| 136 | |
| 137 /** Decode rows by checking if they are skipped | |
| 138 * @param plane Buffer to store decoded bits | |
| 139 * @param[in] width Width of this buffer | |
| 140 * @param[in] height Height of this buffer | |
| 141 * @param[in] stride of this buffer | |
| 142 */ | |
| 143 static void decode_rowskip(uint8_t* plane, int width, int height, int stride, GetBitContext *gb){ | |
| 144 int x, y; | |
| 145 | |
| 146 for (y=0; y<height; y++){ | |
| 5513 | 147 if (!get_bits1(gb)) //rowskip |
| 3359 | 148 memset(plane, 0, width); |
| 149 else | |
| 150 for (x=0; x<width; x++) | |
| 5513 | 151 plane[x] = get_bits1(gb); |
| 3359 | 152 plane += stride; |
| 153 } | |
| 154 } | |
| 155 | |
| 156 /** Decode columns by checking if they are skipped | |
| 157 * @param plane Buffer to store decoded bits | |
| 158 * @param[in] width Width of this buffer | |
| 159 * @param[in] height Height of this buffer | |
| 160 * @param[in] stride of this buffer | |
|
5299
4623928e3b9e
Replace non-existing @fixme doxygen tags with @todo.
diego
parents:
5228
diff
changeset
|
161 * @todo FIXME: Optimize |
| 3359 | 162 */ |
| 163 static void decode_colskip(uint8_t* plane, int width, int height, int stride, GetBitContext *gb){ | |
| 164 int x, y; | |
| 165 | |
| 166 for (x=0; x<width; x++){ | |
| 5513 | 167 if (!get_bits1(gb)) //colskip |
| 3359 | 168 for (y=0; y<height; y++) |
| 169 plane[y*stride] = 0; | |
| 170 else | |
| 171 for (y=0; y<height; y++) | |
| 5513 | 172 plane[y*stride] = get_bits1(gb); |
| 3359 | 173 plane ++; |
| 174 } | |
| 175 } | |
| 176 | |
| 177 /** Decode a bitplane's bits | |
| 178 * @param bp Bitplane where to store the decode bits | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
179 * @param v VC-1 context for bit reading and logging |
| 3359 | 180 * @return Status |
|
5299
4623928e3b9e
Replace non-existing @fixme doxygen tags with @todo.
diego
parents:
5228
diff
changeset
|
181 * @todo FIXME: Optimize |
| 3359 | 182 */ |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
183 static int bitplane_decoding(uint8_t* data, int *raw_flag, VC1Context *v) |
| 3359 | 184 { |
| 185 GetBitContext *gb = &v->s.gb; | |
| 186 | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
187 int imode, x, y, code, offset; |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
188 uint8_t invert, *planep = data; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
189 int width, height, stride; |
| 3359 | 190 |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
191 width = v->s.mb_width; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
192 height = v->s.mb_height; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
193 stride = v->s.mb_stride; |
| 5513 | 194 invert = get_bits1(gb); |
| 4949 | 195 imode = get_vlc2(gb, ff_vc1_imode_vlc.table, VC1_IMODE_VLC_BITS, 1); |
| 3359 | 196 |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
197 *raw_flag = 0; |
| 3359 | 198 switch (imode) |
| 199 { | |
| 200 case IMODE_RAW: | |
| 201 //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
|
202 *raw_flag = 1; //invert ignored |
| 3359 | 203 return invert; |
| 204 case IMODE_DIFF2: | |
| 205 case IMODE_NORM2: | |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
206 if ((height * width) & 1) |
| 3359 | 207 { |
| 5513 | 208 *planep++ = get_bits1(gb); |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
209 offset = 1; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
210 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
211 else offset = 0; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
212 // decode bitplane as one long line |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
213 for (y = offset; y < height * width; y += 2) { |
| 4949 | 214 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
|
215 *planep++ = code & 1; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
216 offset++; |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
217 if(offset == width) { |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
218 offset = 0; |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
219 planep += stride - width; |
| 3359 | 220 } |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
221 *planep++ = code >> 1; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
222 offset++; |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
223 if(offset == width) { |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
224 offset = 0; |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
225 planep += stride - width; |
| 3359 | 226 } |
| 227 } | |
| 228 break; | |
| 229 case IMODE_DIFF6: | |
| 230 case IMODE_NORM6: | |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
231 if(!(height % 3) && (width % 3)) { // use 2x3 decoding |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
232 for(y = 0; y < height; y+= 3) { |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
233 for(x = width & 1; x < width; x += 2) { |
| 4949 | 234 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
|
235 if(code < 0){ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
236 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
|
237 return -1; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
238 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
239 planep[x + 0] = (code >> 0) & 1; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
240 planep[x + 1] = (code >> 1) & 1; |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
241 planep[x + 0 + stride] = (code >> 2) & 1; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
242 planep[x + 1 + stride] = (code >> 3) & 1; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
243 planep[x + 0 + stride * 2] = (code >> 4) & 1; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
244 planep[x + 1 + stride * 2] = (code >> 5) & 1; |
| 3359 | 245 } |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
246 planep += stride * 3; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
247 } |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
248 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
|
249 } else { // 3x2 |
|
3405
58c4fd135462
Correctly choose global transform mode, MV mode and fix bitplane decoding
kostya
parents:
3404
diff
changeset
|
250 planep += (height & 1) * stride; |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
251 for(y = height & 1; y < height; y += 2) { |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
252 for(x = width % 3; x < width; x += 3) { |
| 4949 | 253 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
|
254 if(code < 0){ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
255 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
|
256 return -1; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
257 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
258 planep[x + 0] = (code >> 0) & 1; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
259 planep[x + 1] = (code >> 1) & 1; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
260 planep[x + 2] = (code >> 2) & 1; |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
261 planep[x + 0 + stride] = (code >> 3) & 1; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
262 planep[x + 1 + stride] = (code >> 4) & 1; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
263 planep[x + 2 + stride] = (code >> 5) & 1; |
| 3359 | 264 } |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
265 planep += stride * 2; |
| 3359 | 266 } |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
267 x = width % 3; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
268 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
|
269 if(height & 1) decode_rowskip(data+x, width - x, 1, stride, &v->s.gb); |
| 3359 | 270 } |
| 271 break; | |
| 272 case IMODE_ROWSKIP: | |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
273 decode_rowskip(data, width, height, stride, &v->s.gb); |
| 3359 | 274 break; |
| 275 case IMODE_COLSKIP: | |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
276 decode_colskip(data, width, height, stride, &v->s.gb); |
| 3359 | 277 break; |
| 278 default: break; | |
| 279 } | |
| 280 | |
| 281 /* Applying diff operator */ | |
| 282 if (imode == IMODE_DIFF2 || imode == IMODE_DIFF6) | |
| 283 { | |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
284 planep = data; |
| 3359 | 285 planep[0] ^= invert; |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
286 for (x=1; x<width; x++) |
| 3359 | 287 planep[x] ^= planep[x-1]; |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
288 for (y=1; y<height; y++) |
| 3359 | 289 { |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
290 planep += stride; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
291 planep[0] ^= planep[-stride]; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
292 for (x=1; x<width; x++) |
| 3359 | 293 { |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
294 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
|
295 else planep[x] ^= planep[x-1]; |
| 3359 | 296 } |
| 297 } | |
| 298 } | |
| 299 else if (invert) | |
| 300 { | |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
301 planep = data; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
302 for (x=0; x<stride*height; x++) planep[x] = !planep[x]; //FIXME stride |
| 3359 | 303 } |
| 304 return (imode<<1) + invert; | |
| 305 } | |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
306 |
| 3359 | 307 /** @} */ //Bitplane group |
| 308 | |
| 7355 | 309 #define FILTSIGN(a) ((a) >= 0 ? 1 : -1) |
| 310 /** | |
| 311 * VC-1 in-loop deblocking filter for one line | |
| 312 * @param src source block type | |
| 313 * @param pq block quantizer | |
| 314 * @return whether other 3 pairs should be filtered or not | |
| 315 * @see 8.6 | |
| 316 */ | |
| 317 static int vc1_filter_line(uint8_t* src, int stride, int pq){ | |
| 318 int a0, a1, a2, a3, d, clip, filt3 = 0; | |
| 319 uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; | |
| 320 | |
| 321 a0 = (2*(src[-2*stride] - src[ 1*stride]) - 5*(src[-1*stride] - src[ 0*stride]) + 4) >> 3; | |
| 322 if(FFABS(a0) < pq){ | |
| 323 a1 = (2*(src[-4*stride] - src[-1*stride]) - 5*(src[-3*stride] - src[-2*stride]) + 4) >> 3; | |
| 324 a2 = (2*(src[ 0*stride] - src[ 3*stride]) - 5*(src[ 1*stride] - src[ 2*stride]) + 4) >> 3; | |
| 325 a3 = FFMIN(FFABS(a1), FFABS(a2)); | |
| 326 if(a3 < FFABS(a0)){ | |
| 327 d = 5 * ((a0 >=0 ? a3 : -a3) - a0) / 8; | |
| 328 clip = (src[-1*stride] - src[ 0*stride])/2; | |
| 329 if(clip){ | |
| 330 filt3 = 1; | |
| 331 if(clip > 0) | |
| 332 d = av_clip(d, 0, clip); | |
| 333 else | |
| 334 d = av_clip(d, clip, 0); | |
| 335 src[-1*stride] = cm[src[-1*stride] - d]; | |
| 336 src[ 0*stride] = cm[src[ 0*stride] + d]; | |
| 337 } | |
| 338 } | |
| 339 } | |
| 340 return filt3; | |
| 341 } | |
| 342 | |
| 343 /** | |
| 344 * VC-1 in-loop deblocking filter | |
| 345 * @param src source block type | |
| 346 * @param len edge length to filter (4 or 8 pixels) | |
| 347 * @param pq block quantizer | |
| 348 * @see 8.6 | |
| 349 */ | |
| 350 static void vc1_loop_filter(uint8_t* src, int step, int stride, int len, int pq) | |
| 351 { | |
| 352 int i; | |
| 353 int filt3; | |
| 354 | |
| 355 for(i = 0; i < len; i += 4){ | |
| 356 filt3 = vc1_filter_line(src + 2*step, stride, pq); | |
| 357 if(filt3){ | |
| 358 vc1_filter_line(src + 0*step, stride, pq); | |
| 359 vc1_filter_line(src + 1*step, stride, pq); | |
| 360 vc1_filter_line(src + 3*step, stride, pq); | |
| 361 } | |
| 362 src += step * 4; | |
| 363 } | |
| 364 } | |
| 365 | |
| 366 static void vc1_loop_filter_iblk(MpegEncContext *s, int pq) | |
| 367 { | |
| 368 int i, j; | |
| 369 if(!s->first_slice_line) | |
| 370 vc1_loop_filter(s->dest[0], 1, s->linesize, 16, pq); | |
| 371 vc1_loop_filter(s->dest[0] + 8*s->linesize, 1, s->linesize, 16, pq); | |
| 372 for(i = !s->mb_x*8; i < 16; i += 8) | |
| 373 vc1_loop_filter(s->dest[0] + i, s->linesize, 1, 16, pq); | |
| 374 for(j = 0; j < 2; j++){ | |
| 375 if(!s->first_slice_line) | |
| 376 vc1_loop_filter(s->dest[j+1], 1, s->uvlinesize, 8, pq); | |
| 377 if(s->mb_x) | |
| 378 vc1_loop_filter(s->dest[j+1], s->uvlinesize, 1, 8, pq); | |
| 379 } | |
| 380 } | |
| 381 | |
| 3359 | 382 /***********************************************************************/ |
| 383 /** VOP Dquant decoding | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
384 * @param v VC-1 Context |
| 3359 | 385 */ |
| 386 static int vop_dquant_decoding(VC1Context *v) | |
| 387 { | |
| 388 GetBitContext *gb = &v->s.gb; | |
| 389 int pqdiff; | |
| 390 | |
| 391 //variable size | |
| 392 if (v->dquant == 2) | |
| 393 { | |
| 394 pqdiff = get_bits(gb, 3); | |
| 395 if (pqdiff == 7) v->altpq = get_bits(gb, 5); | |
| 396 else v->altpq = v->pq + pqdiff + 1; | |
| 397 } | |
| 398 else | |
| 399 { | |
| 5513 | 400 v->dquantfrm = get_bits1(gb); |
| 3359 | 401 if ( v->dquantfrm ) |
| 402 { | |
| 403 v->dqprofile = get_bits(gb, 2); | |
| 404 switch (v->dqprofile) | |
| 405 { | |
| 406 case DQPROFILE_SINGLE_EDGE: | |
| 407 case DQPROFILE_DOUBLE_EDGES: | |
| 408 v->dqsbedge = get_bits(gb, 2); | |
| 409 break; | |
| 410 case DQPROFILE_ALL_MBS: | |
| 5513 | 411 v->dqbilevel = get_bits1(gb); |
|
5682
8bf94c994691
In case when any quantizer may occur, HALFPQ should be zero
kostya
parents:
5605
diff
changeset
|
412 if(!v->dqbilevel) |
|
8bf94c994691
In case when any quantizer may occur, HALFPQ should be zero
kostya
parents:
5605
diff
changeset
|
413 v->halfpq = 0; |
| 3359 | 414 default: break; //Forbidden ? |
| 415 } | |
| 3451 | 416 if (v->dqbilevel || v->dqprofile != DQPROFILE_ALL_MBS) |
| 3359 | 417 { |
| 418 pqdiff = get_bits(gb, 3); | |
| 419 if (pqdiff == 7) v->altpq = get_bits(gb, 5); | |
| 420 else v->altpq = v->pq + pqdiff + 1; | |
| 421 } | |
| 422 } | |
| 423 } | |
| 424 return 0; | |
| 425 } | |
| 426 | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
427 /** Put block onto picture |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
428 */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
429 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
|
430 { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
431 uint8_t *Y; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
432 int ys, us, vs; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
433 DSPContext *dsp = &v->s.dsp; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
434 |
| 3522 | 435 if(v->rangeredfrm) { |
| 436 int i, j, k; | |
| 437 for(k = 0; k < 6; k++) | |
| 438 for(j = 0; j < 8; j++) | |
| 439 for(i = 0; i < 8; i++) | |
| 440 block[k][i + j*8] = ((block[k][i + j*8] - 128) << 1) + 128; | |
| 441 | |
| 442 } | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
443 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
|
444 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
|
445 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
|
446 Y = v->s.dest[0]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
447 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
448 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
|
449 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
|
450 Y += ys * 8; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
451 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
|
452 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
|
453 |
| 3521 | 454 if(!(v->s.flags & CODEC_FLAG_GRAY)) { |
| 455 dsp->put_pixels_clamped(block[4], v->s.dest[1], us); | |
| 456 dsp->put_pixels_clamped(block[5], v->s.dest[2], vs); | |
| 457 } | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
458 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
459 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
460 /** Do motion compensation over 1 macroblock |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
461 * 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
|
462 */ |
|
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
463 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
|
464 { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
465 MpegEncContext *s = &v->s; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
466 DSPContext *dsp = &v->s.dsp; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
467 uint8_t *srcY, *srcU, *srcV; |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
468 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
|
469 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
470 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
|
471 |
| 3689 | 472 mx = s->mv[dir][0][0]; |
| 473 my = s->mv[dir][0][1]; | |
| 474 | |
| 475 // store motion vectors for further use in B frames | |
| 6481 | 476 if(s->pict_type == FF_P_TYPE) { |
| 3689 | 477 s->current_picture.motion_val[1][s->block_index[0]][0] = mx; |
| 478 s->current_picture.motion_val[1][s->block_index[0]][1] = my; | |
| 479 } | |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
480 uvmx = (mx + ((mx & 3) == 3)) >> 1; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
481 uvmy = (my + ((my & 3) == 3)) >> 1; |
|
4258
4d2f162506e3
10e6l FastUVMC was done right but in the wrong place
kostya
parents:
4247
diff
changeset
|
482 if(v->fastuvmc) { |
|
4d2f162506e3
10e6l FastUVMC was done right but in the wrong place
kostya
parents:
4247
diff
changeset
|
483 uvmx = uvmx + ((uvmx<0)?(uvmx&1):-(uvmx&1)); |
|
4d2f162506e3
10e6l FastUVMC was done right but in the wrong place
kostya
parents:
4247
diff
changeset
|
484 uvmy = uvmy + ((uvmy<0)?(uvmy&1):-(uvmy&1)); |
|
4d2f162506e3
10e6l FastUVMC was done right but in the wrong place
kostya
parents:
4247
diff
changeset
|
485 } |
|
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
486 if(!dir) { |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
487 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
|
488 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
|
489 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
|
490 } else { |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
491 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
|
492 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
|
493 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
|
494 } |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
495 |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
496 src_x = s->mb_x * 16 + (mx >> 2); |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
497 src_y = s->mb_y * 16 + (my >> 2); |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
498 uvsrc_x = s->mb_x * 8 + (uvmx >> 2); |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
499 uvsrc_y = s->mb_y * 8 + (uvmy >> 2); |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
500 |
| 4681 | 501 if(v->profile != PROFILE_ADVANCED){ |
| 502 src_x = av_clip( src_x, -16, s->mb_width * 16); | |
| 503 src_y = av_clip( src_y, -16, s->mb_height * 16); | |
| 504 uvsrc_x = av_clip(uvsrc_x, -8, s->mb_width * 8); | |
| 505 uvsrc_y = av_clip(uvsrc_y, -8, s->mb_height * 8); | |
| 506 }else{ | |
| 507 src_x = av_clip( src_x, -17, s->avctx->coded_width); | |
| 508 src_y = av_clip( src_y, -18, s->avctx->coded_height + 1); | |
| 509 uvsrc_x = av_clip(uvsrc_x, -8, s->avctx->coded_width >> 1); | |
| 510 uvsrc_y = av_clip(uvsrc_y, -8, s->avctx->coded_height >> 1); | |
| 511 } | |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
512 |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
513 srcY += src_y * s->linesize + src_x; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
514 srcU += uvsrc_y * s->uvlinesize + uvsrc_x; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
515 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
|
516 |
| 3521 | 517 /* for grayscale we should not try to read from unknown area */ |
| 518 if(s->flags & CODEC_FLAG_GRAY) { | |
| 519 srcU = s->edge_emu_buffer + 18 * s->linesize; | |
| 520 srcV = s->edge_emu_buffer + 18 * s->linesize; | |
| 521 } | |
| 522 | |
| 3522 | 523 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
|
524 || (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
|
525 || (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
|
526 uint8_t *uvbuf= s->edge_emu_buffer + 19 * s->linesize; |
| 3359 | 527 |
|
3528
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
528 srcY -= s->mspel * (1 + s->linesize); |
|
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
529 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
|
530 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
|
531 srcY = s->edge_emu_buffer; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
532 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
|
533 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
|
534 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
|
535 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
|
536 srcU = uvbuf; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
537 srcV = uvbuf + 16; |
| 3522 | 538 /* if we deal with range reduction we need to scale source blocks */ |
| 539 if(v->rangeredfrm) { | |
| 540 int i, j; | |
| 541 uint8_t *src, *src2; | |
| 542 | |
| 543 src = srcY; | |
|
3528
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
544 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
|
545 for(i = 0; i < 17 + s->mspel*2; i++) src[i] = ((src[i] - 128) >> 1) + 128; |
| 3522 | 546 src += s->linesize; |
| 547 } | |
| 548 src = srcU; src2 = srcV; | |
| 549 for(j = 0; j < 9; j++) { | |
| 550 for(i = 0; i < 9; i++) { | |
| 551 src[i] = ((src[i] - 128) >> 1) + 128; | |
| 552 src2[i] = ((src2[i] - 128) >> 1) + 128; | |
| 553 } | |
| 554 src += s->uvlinesize; | |
| 555 src2 += s->uvlinesize; | |
| 556 } | |
| 557 } | |
| 3406 | 558 /* if we deal with intensity compensation we need to scale source blocks */ |
| 559 if(v->mv_mode == MV_PMODE_INTENSITY_COMP) { | |
| 560 int i, j; | |
| 561 uint8_t *src, *src2; | |
| 562 | |
| 563 src = srcY; | |
|
3528
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
564 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
|
565 for(i = 0; i < 17 + s->mspel*2; i++) src[i] = v->luty[src[i]]; |
| 3406 | 566 src += s->linesize; |
| 567 } | |
| 568 src = srcU; src2 = srcV; | |
| 569 for(j = 0; j < 9; j++) { | |
| 570 for(i = 0; i < 9; i++) { | |
| 571 src[i] = v->lutuv[src[i]]; | |
| 572 src2[i] = v->lutuv[src2[i]]; | |
| 573 } | |
| 574 src += s->uvlinesize; | |
| 575 src2 += s->uvlinesize; | |
| 576 } | |
| 577 } | |
|
3528
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
578 srcY += s->mspel * (1 + s->linesize); |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
579 } |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
580 |
|
3528
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
581 if(s->mspel) { |
|
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
582 dxy = ((my & 3) << 2) | (mx & 3); |
|
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
583 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
|
584 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
|
585 srcY += s->linesize * 8; |
|
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
586 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
|
587 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
|
588 } else { // hpel mc - always used for luma |
|
565d9ddd8eb3
Motion compensation for luma always use halfpel precision.
kostya
parents:
3573
diff
changeset
|
589 dxy = (my & 2) | ((mx & 2) >> 1); |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
590 |
| 3474 | 591 if(!v->rnd) |
| 592 dsp->put_pixels_tab[0][dxy](s->dest[0], srcY, s->linesize, 16); | |
| 593 else | |
| 594 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
|
595 } |
| 3521 | 596 |
| 597 if(s->flags & CODEC_FLAG_GRAY) return; | |
| 3655 | 598 /* Chroma MC always uses qpel bilinear */ |
| 3474 | 599 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
|
600 uvmx = (uvmx&3)<<1; |
|
de842f000384
Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents:
3656
diff
changeset
|
601 uvmy = (uvmy&3)<<1; |
|
de842f000384
Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents:
3656
diff
changeset
|
602 if(!v->rnd){ |
|
de842f000384
Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents:
3656
diff
changeset
|
603 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
|
604 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
|
605 }else{ |
|
de842f000384
Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents:
3656
diff
changeset
|
606 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
|
607 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
|
608 } |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
609 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
610 |
| 3396 | 611 /** Do motion compensation for 4-MV macroblock - luminance block |
| 612 */ | |
| 613 static void vc1_mc_4mv_luma(VC1Context *v, int n) | |
| 614 { | |
| 615 MpegEncContext *s = &v->s; | |
| 616 DSPContext *dsp = &v->s.dsp; | |
| 617 uint8_t *srcY; | |
| 618 int dxy, mx, my, src_x, src_y; | |
| 619 int off; | |
| 620 | |
| 621 if(!v->s.last_picture.data[0])return; | |
| 622 mx = s->mv[0][n][0]; | |
| 623 my = s->mv[0][n][1]; | |
| 624 srcY = s->last_picture.data[0]; | |
| 625 | |
| 626 off = s->linesize * 4 * (n&2) + (n&1) * 8; | |
| 627 | |
| 628 src_x = s->mb_x * 16 + (n&1) * 8 + (mx >> 2); | |
| 629 src_y = s->mb_y * 16 + (n&2) * 4 + (my >> 2); | |
| 630 | |
| 4681 | 631 if(v->profile != PROFILE_ADVANCED){ |
| 632 src_x = av_clip( src_x, -16, s->mb_width * 16); | |
| 633 src_y = av_clip( src_y, -16, s->mb_height * 16); | |
| 634 }else{ | |
| 635 src_x = av_clip( src_x, -17, s->avctx->coded_width); | |
| 636 src_y = av_clip( src_y, -18, s->avctx->coded_height + 1); | |
| 637 } | |
| 3396 | 638 |
| 639 srcY += src_y * s->linesize + src_x; | |
| 640 | |
|
3548
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
641 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
|
642 || (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
|
643 || (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
|
644 srcY -= s->mspel * (1 + s->linesize); |
|
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
645 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
|
646 src_x - s->mspel, src_y - s->mspel, s->h_edge_pos, s->v_edge_pos); |
| 3396 | 647 srcY = s->edge_emu_buffer; |
| 3522 | 648 /* if we deal with range reduction we need to scale source blocks */ |
| 649 if(v->rangeredfrm) { | |
| 650 int i, j; | |
| 651 uint8_t *src; | |
| 652 | |
| 653 src = srcY; | |
|
3528
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
654 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
|
655 for(i = 0; i < 9 + s->mspel*2; i++) src[i] = ((src[i] - 128) >> 1) + 128; |
| 3522 | 656 src += s->linesize; |
| 657 } | |
| 658 } | |
|
3548
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
659 /* 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
|
660 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
|
661 int i, j; |
|
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
662 uint8_t *src; |
|
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
663 |
|
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
664 src = srcY; |
|
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
665 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
|
666 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
|
667 src += s->linesize; |
|
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
668 } |
|
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
669 } |
|
3528
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
670 srcY += s->mspel * (1 + s->linesize); |
| 3396 | 671 } |
| 672 | |
|
3528
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
673 if(s->mspel) { |
|
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
674 dxy = ((my & 3) << 2) | (mx & 3); |
|
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
675 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
|
676 } else { // hpel mc - always used for luma |
|
565d9ddd8eb3
Motion compensation for luma always use halfpel precision.
kostya
parents:
3573
diff
changeset
|
677 dxy = (my & 2) | ((mx & 2) >> 1); |
| 3474 | 678 if(!v->rnd) |
| 679 dsp->put_pixels_tab[1][dxy](s->dest[0] + off, srcY, s->linesize, 8); | |
| 680 else | |
| 681 dsp->put_no_rnd_pixels_tab[1][dxy](s->dest[0] + off, srcY, s->linesize, 8); | |
| 3396 | 682 } |
| 683 } | |
| 684 | |
| 685 static inline int median4(int a, int b, int c, int d) | |
| 686 { | |
| 3404 | 687 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
|
688 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
|
689 else return (FFMIN(b, c) + FFMAX(a, d)) / 2; |
| 3404 | 690 } 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
|
691 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
|
692 else return (FFMIN(a, c) + FFMAX(b, d)) / 2; |
| 3404 | 693 } |
| 3396 | 694 } |
| 695 | |
| 696 | |
| 697 /** Do motion compensation for 4-MV macroblock - both chroma blocks | |
| 698 */ | |
| 699 static void vc1_mc_4mv_chroma(VC1Context *v) | |
| 700 { | |
| 701 MpegEncContext *s = &v->s; | |
| 702 DSPContext *dsp = &v->s.dsp; | |
| 703 uint8_t *srcU, *srcV; | |
| 704 int uvdxy, uvmx, uvmy, uvsrc_x, uvsrc_y; | |
| 705 int i, idx, tx = 0, ty = 0; | |
| 706 int mvx[4], mvy[4], intra[4]; | |
| 707 static const int count[16] = { 0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4}; | |
| 708 | |
| 709 if(!v->s.last_picture.data[0])return; | |
| 3521 | 710 if(s->flags & CODEC_FLAG_GRAY) return; |
| 3396 | 711 |
| 712 for(i = 0; i < 4; i++) { | |
| 713 mvx[i] = s->mv[0][i][0]; | |
| 714 mvy[i] = s->mv[0][i][1]; | |
| 715 intra[i] = v->mb_type[0][s->block_index[i]]; | |
| 716 } | |
| 717 | |
| 718 /* calculate chroma MV vector from four luma MVs */ | |
| 3419 | 719 idx = (intra[3] << 3) | (intra[2] << 2) | (intra[1] << 1) | intra[0]; |
| 3396 | 720 if(!idx) { // all blocks are inter |
| 721 tx = median4(mvx[0], mvx[1], mvx[2], mvx[3]); | |
| 722 ty = median4(mvy[0], mvy[1], mvy[2], mvy[3]); | |
| 723 } else if(count[idx] == 1) { // 3 inter blocks | |
| 724 switch(idx) { | |
| 725 case 0x1: | |
| 726 tx = mid_pred(mvx[1], mvx[2], mvx[3]); | |
| 3419 | 727 ty = mid_pred(mvy[1], mvy[2], mvy[3]); |
| 3396 | 728 break; |
| 729 case 0x2: | |
| 730 tx = mid_pred(mvx[0], mvx[2], mvx[3]); | |
| 3419 | 731 ty = mid_pred(mvy[0], mvy[2], mvy[3]); |
| 3396 | 732 break; |
| 733 case 0x4: | |
| 734 tx = mid_pred(mvx[0], mvx[1], mvx[3]); | |
| 3419 | 735 ty = mid_pred(mvy[0], mvy[1], mvy[3]); |
| 3396 | 736 break; |
| 737 case 0x8: | |
| 738 tx = mid_pred(mvx[0], mvx[1], mvx[2]); | |
| 3419 | 739 ty = mid_pred(mvy[0], mvy[1], mvy[2]); |
| 3396 | 740 break; |
| 741 } | |
| 742 } else if(count[idx] == 2) { | |
| 743 int t1 = 0, t2 = 0; | |
| 744 for(i=0; i<3;i++) if(!intra[i]) {t1 = i; break;} | |
| 745 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
|
746 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
|
747 ty = (mvy[t1] + mvy[t2]) / 2; |
| 4683 | 748 } else { |
| 749 s->current_picture.motion_val[1][s->block_index[0]][0] = 0; | |
| 750 s->current_picture.motion_val[1][s->block_index[0]][1] = 0; | |
| 3396 | 751 return; //no need to do MC for inter blocks |
| 4683 | 752 } |
| 3396 | 753 |
| 3689 | 754 s->current_picture.motion_val[1][s->block_index[0]][0] = tx; |
| 755 s->current_picture.motion_val[1][s->block_index[0]][1] = ty; | |
| 3396 | 756 uvmx = (tx + ((tx&3) == 3)) >> 1; |
| 757 uvmy = (ty + ((ty&3) == 3)) >> 1; | |
|
4258
4d2f162506e3
10e6l FastUVMC was done right but in the wrong place
kostya
parents:
4247
diff
changeset
|
758 if(v->fastuvmc) { |
|
4d2f162506e3
10e6l FastUVMC was done right but in the wrong place
kostya
parents:
4247
diff
changeset
|
759 uvmx = uvmx + ((uvmx<0)?(uvmx&1):-(uvmx&1)); |
|
4d2f162506e3
10e6l FastUVMC was done right but in the wrong place
kostya
parents:
4247
diff
changeset
|
760 uvmy = uvmy + ((uvmy<0)?(uvmy&1):-(uvmy&1)); |
|
4d2f162506e3
10e6l FastUVMC was done right but in the wrong place
kostya
parents:
4247
diff
changeset
|
761 } |
| 3396 | 762 |
| 763 uvsrc_x = s->mb_x * 8 + (uvmx >> 2); | |
| 764 uvsrc_y = s->mb_y * 8 + (uvmy >> 2); | |
| 765 | |
| 4681 | 766 if(v->profile != PROFILE_ADVANCED){ |
| 767 uvsrc_x = av_clip(uvsrc_x, -8, s->mb_width * 8); | |
| 768 uvsrc_y = av_clip(uvsrc_y, -8, s->mb_height * 8); | |
| 769 }else{ | |
| 770 uvsrc_x = av_clip(uvsrc_x, -8, s->avctx->coded_width >> 1); | |
| 771 uvsrc_y = av_clip(uvsrc_y, -8, s->avctx->coded_height >> 1); | |
| 772 } | |
| 4680 | 773 |
| 3396 | 774 srcU = s->last_picture.data[1] + uvsrc_y * s->uvlinesize + uvsrc_x; |
| 775 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
|
776 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
|
777 || (unsigned)uvsrc_x > (s->h_edge_pos >> 1) - 9 |
| 3511 | 778 || (unsigned)uvsrc_y > (s->v_edge_pos >> 1) - 9){ |
| 3396 | 779 ff_emulated_edge_mc(s->edge_emu_buffer , srcU, s->uvlinesize, 8+1, 8+1, |
| 780 uvsrc_x, uvsrc_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1); | |
| 781 ff_emulated_edge_mc(s->edge_emu_buffer + 16, srcV, s->uvlinesize, 8+1, 8+1, | |
| 782 uvsrc_x, uvsrc_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1); | |
| 783 srcU = s->edge_emu_buffer; | |
| 784 srcV = s->edge_emu_buffer + 16; | |
| 3522 | 785 |
| 786 /* if we deal with range reduction we need to scale source blocks */ | |
| 787 if(v->rangeredfrm) { | |
| 788 int i, j; | |
| 789 uint8_t *src, *src2; | |
| 790 | |
| 791 src = srcU; src2 = srcV; | |
| 792 for(j = 0; j < 9; j++) { | |
| 793 for(i = 0; i < 9; i++) { | |
| 794 src[i] = ((src[i] - 128) >> 1) + 128; | |
| 795 src2[i] = ((src2[i] - 128) >> 1) + 128; | |
| 796 } | |
| 797 src += s->uvlinesize; | |
| 798 src2 += s->uvlinesize; | |
| 799 } | |
| 800 } | |
|
3548
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
801 /* 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
|
802 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
|
803 int i, j; |
|
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
804 uint8_t *src, *src2; |
|
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
805 |
|
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
806 src = srcU; src2 = srcV; |
|
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
807 for(j = 0; j < 9; j++) { |
|
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
808 for(i = 0; i < 9; i++) { |
|
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
809 src[i] = v->lutuv[src[i]]; |
|
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
810 src2[i] = v->lutuv[src2[i]]; |
|
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
811 } |
|
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
812 src += s->uvlinesize; |
|
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
813 src2 += s->uvlinesize; |
|
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
814 } |
|
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
815 } |
| 3396 | 816 } |
| 817 | |
| 3655 | 818 /* Chroma MC always uses qpel bilinear */ |
| 3474 | 819 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
|
820 uvmx = (uvmx&3)<<1; |
|
de842f000384
Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents:
3656
diff
changeset
|
821 uvmy = (uvmy&3)<<1; |
|
de842f000384
Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents:
3656
diff
changeset
|
822 if(!v->rnd){ |
|
de842f000384
Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents:
3656
diff
changeset
|
823 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
|
824 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
|
825 }else{ |
|
de842f000384
Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents:
3656
diff
changeset
|
826 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
|
827 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
|
828 } |
| 3396 | 829 } |
| 830 | |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
831 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
|
832 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
833 /** |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
834 * Decode Simple/Main Profiles sequence header |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
835 * @see Figure 7-8, p16-17 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
836 * @param avctx Codec context |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
837 * @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
|
838 * @return Status |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
839 */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
840 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
|
841 { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
842 VC1Context *v = avctx->priv_data; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
843 |
| 3692 | 844 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
|
845 v->profile = get_bits(gb, 2); |
| 4604 | 846 if (v->profile == PROFILE_COMPLEX) |
| 3359 | 847 { |
| 4604 | 848 av_log(avctx, AV_LOG_ERROR, "WMV3 Complex Profile is not fully supported\n"); |
| 3359 | 849 } |
| 850 | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
851 if (v->profile == PROFILE_ADVANCED) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
852 { |
|
6145
ddf5d7fae101
Select scan tables for 8x4 and 4x8 blocks only once.
kostya
parents:
6099
diff
changeset
|
853 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
|
854 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
|
855 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
|
856 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
857 else |
| 3359 | 858 { |
| 7136 | 859 v->zz_8x4 = wmv2_scantableA; |
| 860 v->zz_4x8 = wmv2_scantableB; | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
861 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
|
862 if (v->res_sm) |
| 3359 | 863 { |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
864 av_log(avctx, AV_LOG_ERROR, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
865 "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
|
866 return -1; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
867 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
868 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
869 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
870 // (fps-2)/4 (->30) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
871 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
|
872 // (bitrate-32kbps)/64kbps |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
873 v->bitrtq_postproc = get_bits(gb, 5); //common |
| 5513 | 874 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
|
875 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
|
876 { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
877 av_log(avctx, AV_LOG_ERROR, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
878 "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
|
879 } |
| 7846 | 880 if(v->s.avctx->skip_loop_filter >= AVDISCARD_ALL) |
| 881 v->s.loop_filter = 0; | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
882 |
| 5513 | 883 v->res_x8 = get_bits1(gb); //reserved |
| 884 v->multires = get_bits1(gb); | |
| 885 v->res_fasttx = get_bits1(gb); | |
|
3691
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
886 if (!v->res_fasttx) |
|
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
887 { |
| 6001 | 888 v->s.dsp.vc1_inv_trans_8x8 = ff_simple_idct; |
| 889 v->s.dsp.vc1_inv_trans_8x4 = ff_simple_idct84_add; | |
| 890 v->s.dsp.vc1_inv_trans_4x8 = ff_simple_idct48_add; | |
| 6008 | 891 v->s.dsp.vc1_inv_trans_4x4 = ff_simple_idct44_add; |
| 3359 | 892 } |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
893 |
| 5513 | 894 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
|
895 if (!v->profile && !v->fastuvmc) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
896 { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
897 av_log(avctx, AV_LOG_ERROR, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
898 "FASTUVMC unavailable in Simple Profile\n"); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
899 return -1; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
900 } |
| 5513 | 901 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
|
902 if (!v->profile && v->extended_mv) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
903 { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
904 av_log(avctx, AV_LOG_ERROR, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
905 "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
|
906 return -1; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
907 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
908 v->dquant = get_bits(gb, 2); //common |
| 5513 | 909 v->vstransform = get_bits1(gb); //common |
| 910 | |
| 911 v->res_transtab = get_bits1(gb); | |
|
3691
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
912 if (v->res_transtab) |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
913 { |
|
3691
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
914 av_log(avctx, AV_LOG_ERROR, |
|
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
915 "1 for reserved RES_TRANSTAB is forbidden\n"); |
|
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
916 return -1; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
917 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
918 |
| 5513 | 919 v->overlap = get_bits1(gb); //common |
| 920 | |
| 921 v->s.resync_marker = get_bits1(gb); | |
| 922 v->rangered = get_bits1(gb); | |
|
3691
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
923 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
|
924 { |
|
3691
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
925 av_log(avctx, AV_LOG_INFO, |
|
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
926 "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
|
927 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
928 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
929 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
|
930 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
|
931 |
| 5513 | 932 v->finterpflag = get_bits1(gb); //common |
| 933 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
|
934 if (!v->res_rtm_flag) |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
935 { |
|
3538
f26bf13bbb69
Don't try to decode P-frames from old WMV3 variant until their format is figured
kostya
parents:
3528
diff
changeset
|
936 // 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
|
937 // "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
|
938 av_log(avctx, AV_LOG_ERROR, |
|
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
939 "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
|
940 //return -1; |
|
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
941 } |
| 4742 | 942 //TODO: figure out what they mean (always 0x402F) |
| 943 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
|
944 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
|
945 "Profile %i:\nfrmrtq_postproc=%i, bitrtq_postproc=%i\n" |
| 3457 | 946 "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
|
947 "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
|
948 "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
|
949 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
|
950 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
|
951 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
|
952 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
|
953 ); |
|
3691
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
954 return 0; |
| 3359 | 955 } |
| 956 | |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
957 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
|
958 { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
959 v->res_rtm_flag = 1; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
960 v->level = get_bits(gb, 3); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
961 if(v->level >= 5) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
962 { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
963 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
|
964 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
965 v->chromaformat = get_bits(gb, 2); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
966 if (v->chromaformat != 1) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
967 { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
968 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
|
969 "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
|
970 return -1; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
971 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
972 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
973 // (fps-2)/4 (->30) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
974 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
|
975 // (bitrate-32kbps)/64kbps |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
976 v->bitrtq_postproc = get_bits(gb, 5); //common |
| 5513 | 977 v->postprocflag = get_bits1(gb); //common |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
978 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
979 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
|
980 v->s.avctx->coded_height = (get_bits(gb, 12) + 1) << 1; |
| 4474 | 981 v->s.avctx->width = v->s.avctx->coded_width; |
| 982 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
|
983 v->broadcast = get_bits1(gb); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
984 v->interlace = get_bits1(gb); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
985 v->tfcntrflag = get_bits1(gb); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
986 v->finterpflag = get_bits1(gb); |
| 5519 | 987 skip_bits1(gb); // reserved |
| 4402 | 988 |
| 4680 | 989 v->s.h_edge_pos = v->s.avctx->coded_width; |
| 990 v->s.v_edge_pos = v->s.avctx->coded_height; | |
| 991 | |
| 4402 | 992 av_log(v->s.avctx, AV_LOG_DEBUG, |
| 993 "Advanced Profile level %i:\nfrmrtq_postproc=%i, bitrtq_postproc=%i\n" | |
| 994 "LoopFilter=%i, ChromaFormat=%i, Pulldown=%i, Interlace: %i\n" | |
| 995 "TFCTRflag=%i, FINTERPflag=%i\n", | |
| 996 v->level, v->frmrtq_postproc, v->bitrtq_postproc, | |
| 997 v->s.loop_filter, v->chromaformat, v->broadcast, v->interlace, | |
| 998 v->tfcntrflag, v->finterpflag | |
| 999 ); | |
| 1000 | |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1001 v->psf = get_bits1(gb); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1002 if(v->psf) { //PsF, 6.1.13 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1003 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
|
1004 return -1; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1005 } |
|
4486
1d2320afa864
B-frames could not be determined from broken_link/closed_entry, use fixed value
kostya
parents:
4485
diff
changeset
|
1006 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
|
1007 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
|
1008 int w, h, ar = 0; |
| 4467 | 1009 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
|
1010 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
|
1011 v->s.avctx->coded_height = h = get_bits(gb, 14) + 1; |
| 4467 | 1012 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
|
1013 if(get_bits1(gb)) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1014 ar = get_bits(gb, 4); |
| 4414 | 1015 if(ar && ar < 14){ |
| 4949 | 1016 v->s.avctx->sample_aspect_ratio = ff_vc1_pixel_aspect[ar]; |
| 4414 | 1017 }else if(ar == 15){ |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1018 w = get_bits(gb, 8); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1019 h = get_bits(gb, 8); |
| 4414 | 1020 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
|
1021 } |
| 8583 | 1022 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
|
1023 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1024 if(get_bits1(gb)){ //framerate stuff |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1025 if(get_bits1(gb)) { |
| 4470 | 1026 v->s.avctx->time_base.num = 32; |
| 1027 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
|
1028 } else { |
| 4470 | 1029 int nr, dr; |
| 1030 nr = get_bits(gb, 8); | |
| 1031 dr = get_bits(gb, 4); | |
| 1032 if(nr && nr < 8 && dr && dr < 3){ | |
| 4949 | 1033 v->s.avctx->time_base.num = ff_vc1_fps_dr[dr - 1]; |
| 1034 v->s.avctx->time_base.den = ff_vc1_fps_nr[nr - 1] * 1000; | |
| 4470 | 1035 } |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1036 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1037 } |
|
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)){ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1040 v->color_prim = get_bits(gb, 8); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1041 v->transfer_char = get_bits(gb, 8); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1042 v->matrix_coef = get_bits(gb, 8); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1043 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1044 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1045 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1046 v->hrd_param_flag = get_bits1(gb); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1047 if(v->hrd_param_flag) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1048 int i; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1049 v->hrd_num_leaky_buckets = get_bits(gb, 5); |
| 5519 | 1050 skip_bits(gb, 4); //bitrate exponent |
| 1051 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
|
1052 for(i = 0; i < v->hrd_num_leaky_buckets; i++) { |
| 5519 | 1053 skip_bits(gb, 16); //hrd_rate[n] |
| 1054 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
|
1055 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1056 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1057 return 0; |
|
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 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
|
1061 { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1062 VC1Context *v = avctx->priv_data; |
| 8556 | 1063 int i, blink, clentry; |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1064 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1065 av_log(avctx, AV_LOG_DEBUG, "Entry point: %08X\n", show_bits_long(gb, 32)); |
| 4402 | 1066 blink = get_bits1(gb); // broken link |
|
4486
1d2320afa864
B-frames could not be determined from broken_link/closed_entry, use fixed value
kostya
parents:
4485
diff
changeset
|
1067 clentry = get_bits1(gb); // closed entry |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1068 v->panscanflag = get_bits1(gb); |
| 8556 | 1069 v->refdist_flag = get_bits1(gb); |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1070 v->s.loop_filter = get_bits1(gb); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1071 v->fastuvmc = get_bits1(gb); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1072 v->extended_mv = get_bits1(gb); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1073 v->dquant = get_bits(gb, 2); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1074 v->vstransform = get_bits1(gb); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1075 v->overlap = get_bits1(gb); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1076 v->quantizer_mode = get_bits(gb, 2); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1077 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1078 if(v->hrd_param_flag){ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1079 for(i = 0; i < v->hrd_num_leaky_buckets; i++) { |
| 5519 | 1080 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
|
1081 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1082 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1083 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1084 if(get_bits1(gb)){ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1085 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
|
1086 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
|
1087 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1088 if(v->extended_mv) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1089 v->extended_dmv = get_bits1(gb); |
| 8560 | 1090 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
|
1091 av_log(avctx, AV_LOG_ERROR, "Luma scaling is not supported, expect wrong picture\n"); |
| 8560 | 1092 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
|
1093 } |
| 8560 | 1094 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
|
1095 av_log(avctx, AV_LOG_ERROR, "Chroma scaling is not supported, expect wrong picture\n"); |
| 8560 | 1096 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
|
1097 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1098 |
| 4402 | 1099 av_log(avctx, AV_LOG_DEBUG, "Entry point info:\n" |
| 1100 "BrokenLink=%i, ClosedEntry=%i, PanscanFlag=%i\n" | |
| 1101 "RefDist=%i, Postproc=%i, FastUVMC=%i, ExtMV=%i\n" | |
| 1102 "DQuant=%i, VSTransform=%i, Overlap=%i, Qmode=%i\n", | |
| 8556 | 1103 blink, clentry, v->panscanflag, v->refdist_flag, v->s.loop_filter, |
| 4402 | 1104 v->fastuvmc, v->extended_mv, v->dquant, v->vstransform, v->overlap, v->quantizer_mode); |
| 1105 | |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1106 return 0; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1107 } |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1108 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1109 static int vc1_parse_frame_header(VC1Context *v, GetBitContext* gb) |
| 3359 | 1110 { |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1111 int pqindex, lowquant, status; |
| 3359 | 1112 |
| 5513 | 1113 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
|
1114 skip_bits(gb, 2); //framecnt unused |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1115 v->rangeredfrm = 0; |
| 5513 | 1116 if (v->rangered) v->rangeredfrm = get_bits1(gb); |
| 1117 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
|
1118 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
|
1119 if (!v->s.pict_type) { |
| 6481 | 1120 if (get_bits1(gb)) v->s.pict_type = FF_I_TYPE; |
| 1121 else v->s.pict_type = FF_B_TYPE; | |
| 1122 } else v->s.pict_type = FF_P_TYPE; | |
| 1123 } 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
|
1124 |
| 3689 | 1125 v->bi_type = 0; |
| 6481 | 1126 if(v->s.pict_type == FF_B_TYPE) { |
| 4949 | 1127 v->bfraction = get_vlc2(gb, ff_vc1_bfraction_vlc.table, VC1_BFRACTION_VLC_BITS, 1); |
| 1128 v->bfraction = ff_vc1_bfraction_lut[v->bfraction]; | |
| 3689 | 1129 if(v->bfraction == 0) { |
| 6481 | 1130 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
|
1131 } |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1132 } |
| 6481 | 1133 if(v->s.pict_type == FF_I_TYPE || v->s.pict_type == FF_BI_TYPE) |
| 5519 | 1134 skip_bits(gb, 7); // skip buffer fullness |
| 3359 | 1135 |
| 3474 | 1136 /* calculate RND */ |
| 6481 | 1137 if(v->s.pict_type == FF_I_TYPE || v->s.pict_type == FF_BI_TYPE) |
| 3474 | 1138 v->rnd = 1; |
| 6481 | 1139 if(v->s.pict_type == FF_P_TYPE) |
| 3474 | 1140 v->rnd ^= 1; |
| 1141 | |
| 3359 | 1142 /* Quantizer stuff */ |
| 1143 pqindex = get_bits(gb, 5); | |
| 6150 | 1144 if(!pqindex) return -1; |
| 3359 | 1145 if (v->quantizer_mode == QUANT_FRAME_IMPLICIT) |
| 4949 | 1146 v->pq = ff_vc1_pquant_table[0][pqindex]; |
| 3359 | 1147 else |
| 4949 | 1148 v->pq = ff_vc1_pquant_table[1][pqindex]; |
| 3359 | 1149 |
| 3475 | 1150 v->pquantizer = 1; |
| 3359 | 1151 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
|
1152 v->pquantizer = pqindex < 9; |
| 3475 | 1153 if (v->quantizer_mode == QUANT_NON_UNIFORM) |
| 1154 v->pquantizer = 0; | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1155 v->pqindex = pqindex; |
| 5513 | 1156 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
|
1157 else v->halfpq = 0; |
| 3359 | 1158 if (v->quantizer_mode == QUANT_FRAME_EXPLICIT) |
| 5513 | 1159 v->pquantizer = get_bits1(gb); |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1160 v->dquantfrm = 0; |
| 5511 | 1161 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
|
1162 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
|
1163 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
|
1164 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
|
1165 v->range_y = 1 << (v->k_y - 1); |
|
f024ca7c768b
MVRANGE may occur in all frames and RESPIC in all but B-frames
kostya
parents:
3451
diff
changeset
|
1166 if (v->profile == PROFILE_ADVANCED) |
|
f024ca7c768b
MVRANGE may occur in all frames and RESPIC in all but B-frames
kostya
parents:
3451
diff
changeset
|
1167 { |
| 5513 | 1168 if (v->postprocflag) v->postproc = get_bits1(gb); |
|
3452
f024ca7c768b
MVRANGE may occur in all frames and RESPIC in all but B-frames
kostya
parents:
3451
diff
changeset
|
1169 } |
|
f024ca7c768b
MVRANGE may occur in all frames and RESPIC in all but B-frames
kostya
parents:
3451
diff
changeset
|
1170 else |
| 6481 | 1171 if (v->multires && v->s.pict_type != FF_B_TYPE) v->respic = get_bits(gb, 2); |
| 1172 | |
| 1173 if(v->res_x8 && (v->s.pict_type == FF_I_TYPE || v->s.pict_type == FF_BI_TYPE)){ | |
| 5887 | 1174 v->x8_type = get_bits1(gb); |
| 1175 }else v->x8_type = 0; | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1176 //av_log(v->s.avctx, AV_LOG_INFO, "%c Frame: QP=[%i]%i (+%i/2) %i\n", |
| 6481 | 1177 // (v->s.pict_type == FF_P_TYPE) ? 'P' : ((v->s.pict_type == FF_I_TYPE) ? 'I' : 'B'), pqindex, v->pq, v->halfpq, v->rangeredfrm); |
| 1178 | |
| 1179 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
|
1180 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1181 switch(v->s.pict_type) { |
| 6481 | 1182 case FF_P_TYPE: |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1183 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
|
1184 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
|
1185 else v->tt_index = 2; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1186 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1187 lowquant = (v->pq > 12) ? 0 : 1; |
| 5511 | 1188 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
|
1189 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
|
1190 { |
| 3406 | 1191 int scale, shift, i; |
| 5511 | 1192 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
|
1193 v->lumscale = get_bits(gb, 6); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1194 v->lumshift = get_bits(gb, 6); |
|
3744
805aee1f7cce
For B-frames if the second reference frame signals intensity compensation
kostya
parents:
3743
diff
changeset
|
1195 v->use_ic = 1; |
| 3406 | 1196 /* fill lookup tables for intensity compensation */ |
| 1197 if(!v->lumscale) { | |
| 1198 scale = -64; | |
| 1199 shift = (255 - v->lumshift * 2) << 6; | |
| 1200 if(v->lumshift > 31) | |
| 1201 shift += 128 << 6; | |
| 1202 } else { | |
| 1203 scale = v->lumscale + 32; | |
| 1204 if(v->lumshift > 31) | |
| 1205 shift = (v->lumshift - 64) << 6; | |
| 1206 else | |
| 1207 shift = v->lumshift << 6; | |
| 1208 } | |
| 1209 for(i = 0; i < 256; i++) { | |
| 4594 | 1210 v->luty[i] = av_clip_uint8((scale * i + shift + 32) >> 6); |
| 1211 v->lutuv[i] = av_clip_uint8((scale * (i - 128) + 128*64 + 32) >> 6); | |
| 3406 | 1212 } |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1213 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1214 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
|
1215 v->s.quarter_sample = 0; |
| 3401 | 1216 else if(v->mv_mode == MV_PMODE_INTENSITY_COMP) { |
| 1217 if(v->mv_mode2 == MV_PMODE_1MV_HPEL || v->mv_mode2 == MV_PMODE_1MV_HPEL_BILIN) | |
| 1218 v->s.quarter_sample = 0; | |
| 1219 else | |
| 1220 v->s.quarter_sample = 1; | |
| 1221 } else | |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
1222 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
|
1223 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 | 1224 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1225 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
|
1226 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
|
1227 || 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
|
1228 { |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
1229 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
|
1230 if (status < 0) return -1; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1231 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
|
1232 "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
|
1233 } else { |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
1234 v->mv_type_is_raw = 0; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
1235 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
|
1236 } |
|
3375
a1c2e1603be9
Use MpegEncContext->mbskip_table instead of custom bitplane.
kostya
parents:
3371
diff
changeset
|
1237 status = bitplane_decoding(v->s.mbskip_table, &v->skip_is_raw, v); |
| 3359 | 1238 if (status < 0) return -1; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1239 av_log(v->s.avctx, AV_LOG_DEBUG, "MB Skip plane encoding: " |
| 3359 | 1240 "Imode: %i, Invert: %i\n", status>>1, status&1); |
| 1241 | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1242 /* Hopefully this is correct for P frames */ |
| 4949 | 1243 v->s.mv_table_index = get_bits(gb, 2); //but using ff_vc1_ tables |
| 1244 v->cbpcy_vlc = &ff_vc1_cbpcy_p_vlc[get_bits(gb, 2)]; | |
| 3359 | 1245 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1246 if (v->dquant) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1247 { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1248 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
|
1249 vop_dquant_decoding(v); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1250 } |
| 3359 | 1251 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1252 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
|
1253 if (v->vstransform) |
| 3359 | 1254 { |
| 5513 | 1255 v->ttmbf = get_bits1(gb); |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1256 if (v->ttmbf) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1257 { |
| 4949 | 1258 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
|
1259 } |
|
3506
e0996476198b
Set correctly quantizer and transform mode when parsing frame header.
kostya
parents:
3476
diff
changeset
|
1260 } else { |
|
e0996476198b
Set correctly quantizer and transform mode when parsing frame header.
kostya
parents:
3476
diff
changeset
|
1261 v->ttmbf = 1; |
|
e0996476198b
Set correctly quantizer and transform mode when parsing frame header.
kostya
parents:
3476
diff
changeset
|
1262 v->ttfrm = TT_8X8; |
| 3359 | 1263 } |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1264 break; |
| 6481 | 1265 case FF_B_TYPE: |
|
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1266 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
|
1267 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
|
1268 else v->tt_index = 2; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1269 |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1270 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
|
1271 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
|
1272 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
|
1273 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
|
1274 |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1275 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
|
1276 if (status < 0) return -1; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1277 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
|
1278 "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
|
1279 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
|
1280 if (status < 0) return -1; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1281 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
|
1282 "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
|
1283 |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1284 v->s.mv_table_index = get_bits(gb, 2); |
| 4949 | 1285 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
|
1286 |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1287 if (v->dquant) |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1288 { |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1289 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
|
1290 vop_dquant_decoding(v); |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1291 } |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1292 |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1293 v->ttfrm = 0; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1294 if (v->vstransform) |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1295 { |
| 5513 | 1296 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
|
1297 if (v->ttmbf) |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1298 { |
| 4949 | 1299 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
|
1300 } |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1301 } else { |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1302 v->ttmbf = 1; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1303 v->ttfrm = TT_8X8; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1304 } |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1305 break; |
| 3359 | 1306 } |
| 1307 | |
| 5892 | 1308 if(!v->x8_type) |
| 3359 | 1309 { |
| 5892 | 1310 /* AC Syntax */ |
| 1311 v->c_ac_table_index = decode012(gb); | |
| 6481 | 1312 if (v->s.pict_type == FF_I_TYPE || v->s.pict_type == FF_BI_TYPE) |
| 5892 | 1313 { |
| 1314 v->y_ac_table_index = decode012(gb); | |
| 1315 } | |
| 1316 /* DC Syntax */ | |
| 1317 v->s.dc_table_index = get_bits1(gb); | |
| 3359 | 1318 } |
| 1319 | |
| 6481 | 1320 if(v->s.pict_type == FF_BI_TYPE) { |
| 1321 v->s.pict_type = FF_B_TYPE; | |
| 3689 | 1322 v->bi_type = 1; |
| 1323 } | |
| 3359 | 1324 return 0; |
| 1325 } | |
| 1326 | |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1327 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
|
1328 { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1329 int pqindex, lowquant; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1330 int status; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1331 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1332 v->p_frame_skipped = 0; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1333 |
|
4487
0a0a9f0c9c2d
Progressive frames disguised as interlaced are supported
kostya
parents:
4486
diff
changeset
|
1334 if(v->interlace){ |
| 4471 | 1335 v->fcm = decode012(gb); |
|
4487
0a0a9f0c9c2d
Progressive frames disguised as interlaced are supported
kostya
parents:
4486
diff
changeset
|
1336 if(v->fcm) return -1; // interlaced frames/fields are not implemented |
|
0a0a9f0c9c2d
Progressive frames disguised as interlaced are supported
kostya
parents:
4486
diff
changeset
|
1337 } |
| 5511 | 1338 switch(get_unary(gb, 0, 4)) { |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1339 case 0: |
| 6481 | 1340 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
|
1341 break; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1342 case 1: |
| 6481 | 1343 v->s.pict_type = FF_B_TYPE; |
| 4238 | 1344 break; |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1345 case 2: |
| 6481 | 1346 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
|
1347 break; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1348 case 3: |
| 6481 | 1349 v->s.pict_type = FF_BI_TYPE; |
| 3693 | 1350 break; |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1351 case 4: |
| 6481 | 1352 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
|
1353 v->p_frame_skipped = 1; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1354 return 0; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1355 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1356 if(v->tfcntrflag) |
| 5519 | 1357 skip_bits(gb, 8); |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1358 if(v->broadcast) { |
| 4485 | 1359 if(!v->interlace || v->psf) { |
| 4471 | 1360 v->rptfrm = get_bits(gb, 2); |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1361 } else { |
| 4471 | 1362 v->tff = get_bits1(gb); |
| 1363 v->rptfrm = get_bits1(gb); | |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1364 } |
|
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->panscanflag) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1367 //... |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1368 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1369 v->rnd = get_bits1(gb); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1370 if(v->interlace) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1371 v->uvsamp = get_bits1(gb); |
| 5513 | 1372 if(v->finterpflag) v->interpfrm = get_bits1(gb); |
| 6481 | 1373 if(v->s.pict_type == FF_B_TYPE) { |
| 4949 | 1374 v->bfraction = get_vlc2(gb, ff_vc1_bfraction_vlc.table, VC1_BFRACTION_VLC_BITS, 1); |
| 1375 v->bfraction = ff_vc1_bfraction_lut[v->bfraction]; | |
| 4238 | 1376 if(v->bfraction == 0) { |
| 6481 | 1377 v->s.pict_type = FF_BI_TYPE; /* XXX: should not happen here */ |
| 4238 | 1378 } |
| 1379 } | |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1380 pqindex = get_bits(gb, 5); |
| 6150 | 1381 if(!pqindex) return -1; |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1382 v->pqindex = pqindex; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1383 if (v->quantizer_mode == QUANT_FRAME_IMPLICIT) |
| 4949 | 1384 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
|
1385 else |
| 4949 | 1386 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
|
1387 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1388 v->pquantizer = 1; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1389 if (v->quantizer_mode == QUANT_FRAME_IMPLICIT) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1390 v->pquantizer = pqindex < 9; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1391 if (v->quantizer_mode == QUANT_NON_UNIFORM) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1392 v->pquantizer = 0; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1393 v->pqindex = pqindex; |
| 5513 | 1394 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
|
1395 else v->halfpq = 0; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1396 if (v->quantizer_mode == QUANT_FRAME_EXPLICIT) |
| 5513 | 1397 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
|
1398 if(v->postprocflag) |
|
cddc3677e7dc
421l: postproc flag may be present in any VC-1 AP frame type
kostya
parents:
7846
diff
changeset
|
1399 v->postproc = get_bits1(gb); |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1400 |
| 6481 | 1401 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
|
1402 |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1403 switch(v->s.pict_type) { |
| 6481 | 1404 case FF_I_TYPE: |
| 1405 case FF_BI_TYPE: | |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1406 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
|
1407 if (status < 0) return -1; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1408 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
|
1409 "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
|
1410 v->condover = CONDOVER_NONE; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1411 if(v->overlap && v->pq <= 8) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1412 v->condover = decode012(gb); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1413 if(v->condover == CONDOVER_SELECT) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1414 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
|
1415 if (status < 0) return -1; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1416 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
|
1417 "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
|
1418 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1419 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1420 break; |
| 6481 | 1421 case FF_P_TYPE: |
| 5511 | 1422 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
|
1423 else v->mvrange = 0; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1424 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
|
1425 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
|
1426 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
|
1427 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
|
1428 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1429 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
|
1430 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
|
1431 else v->tt_index = 2; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1432 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1433 lowquant = (v->pq > 12) ? 0 : 1; |
| 5511 | 1434 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
|
1435 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
|
1436 { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1437 int scale, shift, i; |
| 5511 | 1438 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
|
1439 v->lumscale = get_bits(gb, 6); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1440 v->lumshift = get_bits(gb, 6); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1441 /* fill lookup tables for intensity compensation */ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1442 if(!v->lumscale) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1443 scale = -64; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1444 shift = (255 - v->lumshift * 2) << 6; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1445 if(v->lumshift > 31) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1446 shift += 128 << 6; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1447 } else { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1448 scale = v->lumscale + 32; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1449 if(v->lumshift > 31) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1450 shift = (v->lumshift - 64) << 6; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1451 else |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1452 shift = v->lumshift << 6; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1453 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1454 for(i = 0; i < 256; i++) { |
| 4594 | 1455 v->luty[i] = av_clip_uint8((scale * i + shift + 32) >> 6); |
| 1456 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
|
1457 } |
|
4518
e3c43b4aa9ac
Intensity compensation for B-frames in AP was missing
kostya
parents:
4487
diff
changeset
|
1458 v->use_ic = 1; |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1459 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1460 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
|
1461 v->s.quarter_sample = 0; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1462 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
|
1463 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
|
1464 v->s.quarter_sample = 0; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1465 else |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1466 v->s.quarter_sample = 1; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1467 } else |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1468 v->s.quarter_sample = 1; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1469 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
|
1470 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1471 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
|
1472 v->mv_mode2 == MV_PMODE_MIXED_MV) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1473 || v->mv_mode == MV_PMODE_MIXED_MV) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1474 { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1475 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
|
1476 if (status < 0) return -1; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1477 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
|
1478 "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
|
1479 } else { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1480 v->mv_type_is_raw = 0; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1481 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
|
1482 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1483 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
|
1484 if (status < 0) return -1; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1485 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
|
1486 "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
|
1487 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1488 /* Hopefully this is correct for P frames */ |
| 4949 | 1489 v->s.mv_table_index = get_bits(gb, 2); //but using ff_vc1_ tables |
| 1490 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
|
1491 if (v->dquant) |
|
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 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
|
1494 vop_dquant_decoding(v); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1495 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1496 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1497 v->ttfrm = 0; //FIXME Is that so ? |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1498 if (v->vstransform) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1499 { |
| 5513 | 1500 v->ttmbf = get_bits1(gb); |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1501 if (v->ttmbf) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1502 { |
| 4949 | 1503 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
|
1504 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1505 } else { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1506 v->ttmbf = 1; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1507 v->ttfrm = TT_8X8; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1508 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1509 break; |
| 6481 | 1510 case FF_B_TYPE: |
| 5511 | 1511 if (v->extended_mv) v->mvrange = get_unary(gb, 0, 3); |
| 4238 | 1512 else v->mvrange = 0; |
| 1513 v->k_x = v->mvrange + 9 + (v->mvrange >> 1); //k_x can be 9 10 12 13 | |
| 1514 v->k_y = v->mvrange + 8; //k_y can be 8 9 10 11 | |
| 1515 v->range_x = 1 << (v->k_x - 1); | |
| 1516 v->range_y = 1 << (v->k_y - 1); | |
| 1517 | |
| 1518 if (v->pq < 5) v->tt_index = 0; | |
| 1519 else if(v->pq < 13) v->tt_index = 1; | |
| 1520 else v->tt_index = 2; | |
| 1521 | |
| 1522 lowquant = (v->pq > 12) ? 0 : 1; | |
| 1523 v->mv_mode = get_bits1(gb) ? MV_PMODE_1MV : MV_PMODE_1MV_HPEL_BILIN; | |
| 1524 v->s.quarter_sample = (v->mv_mode == MV_PMODE_1MV); | |
| 1525 v->s.mspel = v->s.quarter_sample; | |
| 1526 | |
| 1527 status = bitplane_decoding(v->direct_mb_plane, &v->dmb_is_raw, v); | |
| 1528 if (status < 0) return -1; | |
| 1529 av_log(v->s.avctx, AV_LOG_DEBUG, "MB Direct Type plane encoding: " | |
| 1530 "Imode: %i, Invert: %i\n", status>>1, status&1); | |
| 1531 status = bitplane_decoding(v->s.mbskip_table, &v->skip_is_raw, v); | |
| 1532 if (status < 0) return -1; | |
| 1533 av_log(v->s.avctx, AV_LOG_DEBUG, "MB Skip plane encoding: " | |
| 1534 "Imode: %i, Invert: %i\n", status>>1, status&1); | |
| 1535 | |
| 1536 v->s.mv_table_index = get_bits(gb, 2); | |
| 4949 | 1537 v->cbpcy_vlc = &ff_vc1_cbpcy_p_vlc[get_bits(gb, 2)]; |
| 4238 | 1538 |
| 1539 if (v->dquant) | |
| 1540 { | |
| 1541 av_log(v->s.avctx, AV_LOG_DEBUG, "VOP DQuant info\n"); | |
| 1542 vop_dquant_decoding(v); | |
| 1543 } | |
| 1544 | |
| 1545 v->ttfrm = 0; | |
| 1546 if (v->vstransform) | |
| 1547 { | |
| 5513 | 1548 v->ttmbf = get_bits1(gb); |
| 4238 | 1549 if (v->ttmbf) |
| 1550 { | |
| 4949 | 1551 v->ttfrm = ff_vc1_ttfrm_to_tt[get_bits(gb, 2)]; |
| 4238 | 1552 } |
| 1553 } else { | |
| 1554 v->ttmbf = 1; | |
| 1555 v->ttfrm = TT_8X8; | |
| 1556 } | |
| 1557 break; | |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1558 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1559 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1560 /* AC Syntax */ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1561 v->c_ac_table_index = decode012(gb); |
| 6481 | 1562 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
|
1563 { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1564 v->y_ac_table_index = decode012(gb); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1565 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1566 /* DC Syntax */ |
| 5513 | 1567 v->s.dc_table_index = get_bits1(gb); |
| 6481 | 1568 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
|
1569 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
|
1570 vop_dquant_decoding(v); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1571 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1572 |
| 3693 | 1573 v->bi_type = 0; |
| 6481 | 1574 if(v->s.pict_type == FF_BI_TYPE) { |
| 1575 v->s.pict_type = FF_B_TYPE; | |
| 3693 | 1576 v->bi_type = 1; |
| 1577 } | |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1578 return 0; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1579 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1580 |
| 3359 | 1581 /***********************************************************************/ |
| 1582 /** | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1583 * @defgroup block VC-1 Block-level functions |
| 3359 | 1584 * @see 7.1.4, p91 and 8.1.1.7, p(1)04 |
| 1585 * @{ | |
| 1586 */ | |
| 1587 | |
| 1588 /** | |
| 1589 * @def GET_MQUANT | |
| 1590 * @brief Get macroblock-level quantizer scale | |
| 1591 */ | |
| 1592 #define GET_MQUANT() \ | |
| 1593 if (v->dquantfrm) \ | |
| 1594 { \ | |
| 3404 | 1595 int edges = 0; \ |
| 3359 | 1596 if (v->dqprofile == DQPROFILE_ALL_MBS) \ |
| 1597 { \ | |
| 1598 if (v->dqbilevel) \ | |
| 1599 { \ | |
| 5513 | 1600 mquant = (get_bits1(gb)) ? v->altpq : v->pq; \ |
| 3359 | 1601 } \ |
| 1602 else \ | |
| 1603 { \ | |
| 1604 mqdiff = get_bits(gb, 3); \ | |
| 1605 if (mqdiff != 7) mquant = v->pq + mqdiff; \ | |
| 1606 else mquant = get_bits(gb, 5); \ | |
| 1607 } \ | |
| 1608 } \ | |
| 3404 | 1609 if(v->dqprofile == DQPROFILE_SINGLE_EDGE) \ |
| 1610 edges = 1 << v->dqsbedge; \ | |
| 3396 | 1611 else if(v->dqprofile == DQPROFILE_DOUBLE_EDGES) \ |
| 3404 | 1612 edges = (3 << v->dqsbedge) % 15; \ |
| 3396 | 1613 else if(v->dqprofile == DQPROFILE_FOUR_EDGES) \ |
| 3404 | 1614 edges = 15; \ |
| 1615 if((edges&1) && !s->mb_x) \ | |
| 1616 mquant = v->altpq; \ | |
| 3451 | 1617 if((edges&2) && s->first_slice_line) \ |
| 3404 | 1618 mquant = v->altpq; \ |
| 1619 if((edges&4) && s->mb_x == (s->mb_width - 1)) \ | |
| 1620 mquant = v->altpq; \ | |
| 1621 if((edges&8) && s->mb_y == (s->mb_height - 1)) \ | |
| 1622 mquant = v->altpq; \ | |
| 3359 | 1623 } |
| 1624 | |
| 1625 /** | |
| 1626 * @def GET_MVDATA(_dmv_x, _dmv_y) | |
| 1627 * @brief Get MV differentials | |
| 1628 * @see MVDATA decoding from 8.3.5.2, p(1)20 | |
| 1629 * @param _dmv_x Horizontal differential for decoded MV | |
| 1630 * @param _dmv_y Vertical differential for decoded MV | |
| 1631 */ | |
| 1632 #define GET_MVDATA(_dmv_x, _dmv_y) \ | |
| 4949 | 1633 index = 1 + get_vlc2(gb, ff_vc1_mv_diff_vlc[s->mv_table_index].table,\ |
| 3359 | 1634 VC1_MV_DIFF_VLC_BITS, 2); \ |
| 1635 if (index > 36) \ | |
| 1636 { \ | |
| 1637 mb_has_coeffs = 1; \ | |
| 1638 index -= 37; \ | |
| 1639 } \ | |
| 1640 else mb_has_coeffs = 0; \ | |
| 1641 s->mb_intra = 0; \ | |
| 1642 if (!index) { _dmv_x = _dmv_y = 0; } \ | |
| 1643 else if (index == 35) \ | |
| 1644 { \ | |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
1645 _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
|
1646 _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
|
1647 } \ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1648 else if (index == 36) \ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1649 { \ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1650 _dmv_x = 0; \ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1651 _dmv_y = 0; \ |
| 3359 | 1652 s->mb_intra = 1; \ |
| 1653 } \ | |
| 1654 else \ | |
| 1655 { \ | |
| 1656 index1 = index%6; \ | |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
1657 if (!s->quarter_sample && index1 == 5) val = 1; \ |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
1658 else val = 0; \ |
|
3366
c59aa4cdf042
This should make P-frames decoding work on x86 (by avoiding get_bits(0))
kostya
parents:
3364
diff
changeset
|
1659 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
|
1660 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
|
1661 else val = 0; \ |
| 3359 | 1662 sign = 0 - (val&1); \ |
| 1663 _dmv_x = (sign ^ ((val>>1) + offset_table[index1])) - sign; \ | |
| 1664 \ | |
| 1665 index1 = index/6; \ | |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
1666 if (!s->quarter_sample && index1 == 5) val = 1; \ |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
1667 else val = 0; \ |
|
3366
c59aa4cdf042
This should make P-frames decoding work on x86 (by avoiding get_bits(0))
kostya
parents:
3364
diff
changeset
|
1668 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
|
1669 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
|
1670 else val = 0; \ |
| 3359 | 1671 sign = 0 - (val&1); \ |
| 1672 _dmv_y = (sign ^ ((val>>1) + offset_table[index1])) - sign; \ | |
| 1673 } | |
| 1674 | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1675 /** Predict and set motion vector |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1676 */ |
| 3396 | 1677 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
|
1678 { |
| 3396 | 1679 int xy, wrap, off = 0; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1680 int16_t *A, *B, *C; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1681 int px, py; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1682 int sum; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1683 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1684 /* scale MV difference to be quad-pel */ |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
1685 dmv_x <<= 1 - s->quarter_sample; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
1686 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
|
1687 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1688 wrap = s->b8_stride; |
| 3396 | 1689 xy = s->block_index[n]; |
| 1690 | |
| 1691 if(s->mb_intra){ | |
| 1692 s->mv[0][n][0] = s->current_picture.motion_val[0][xy][0] = 0; | |
| 1693 s->mv[0][n][1] = s->current_picture.motion_val[0][xy][1] = 0; | |
| 4683 | 1694 s->current_picture.motion_val[1][xy][0] = 0; |
| 1695 s->current_picture.motion_val[1][xy][1] = 0; | |
| 3396 | 1696 if(mv1) { /* duplicate motion data for 1-MV block */ |
| 1697 s->current_picture.motion_val[0][xy + 1][0] = 0; | |
| 1698 s->current_picture.motion_val[0][xy + 1][1] = 0; | |
| 1699 s->current_picture.motion_val[0][xy + wrap][0] = 0; | |
| 1700 s->current_picture.motion_val[0][xy + wrap][1] = 0; | |
| 1701 s->current_picture.motion_val[0][xy + wrap + 1][0] = 0; | |
| 1702 s->current_picture.motion_val[0][xy + wrap + 1][1] = 0; | |
| 4683 | 1703 s->current_picture.motion_val[1][xy + 1][0] = 0; |
| 1704 s->current_picture.motion_val[1][xy + 1][1] = 0; | |
| 1705 s->current_picture.motion_val[1][xy + wrap][0] = 0; | |
| 1706 s->current_picture.motion_val[1][xy + wrap][1] = 0; | |
| 1707 s->current_picture.motion_val[1][xy + wrap + 1][0] = 0; | |
| 1708 s->current_picture.motion_val[1][xy + wrap + 1][1] = 0; | |
| 3396 | 1709 } |
| 1710 return; | |
| 1711 } | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1712 |
| 3396 | 1713 C = s->current_picture.motion_val[0][xy - 1]; |
| 1714 A = s->current_picture.motion_val[0][xy - wrap]; | |
| 1715 if(mv1) | |
| 1716 off = (s->mb_x == (s->mb_width - 1)) ? -1 : 2; | |
| 1717 else { | |
| 1718 //in 4-MV mode different blocks have different B predictor position | |
| 1719 switch(n){ | |
| 1720 case 0: | |
| 1721 off = (s->mb_x > 0) ? -1 : 1; | |
| 1722 break; | |
| 1723 case 1: | |
| 1724 off = (s->mb_x == (s->mb_width - 1)) ? -1 : 1; | |
| 1725 break; | |
| 1726 case 2: | |
| 1727 off = 1; | |
| 1728 break; | |
| 1729 case 3: | |
| 1730 off = -1; | |
| 1731 } | |
| 1732 } | |
| 1733 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
|
1734 |
| 3396 | 1735 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
|
1736 if(s->mb_width == 1) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1737 px = A[0]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1738 py = A[1]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1739 } else { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1740 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
|
1741 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
|
1742 } |
| 3396 | 1743 } 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
|
1744 px = C[0]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1745 py = C[1]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1746 } else { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1747 px = py = 0; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1748 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1749 /* 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
|
1750 { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1751 int qx, qy, X, Y; |
|
3400
84de54d536bd
4-MV mode final fixes (now it works for non-exotic modes)
kostya
parents:
3399
diff
changeset
|
1752 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
|
1753 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
|
1754 X = (s->mb_width << 6) - 4; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1755 Y = (s->mb_height << 6) - 4; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1756 if(mv1) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1757 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
|
1758 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
|
1759 } else { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1760 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
|
1761 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
|
1762 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1763 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
|
1764 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
|
1765 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1766 /* Calculate hybrid prediction as specified in 8.3.5.3.5 */ |
| 3396 | 1767 if((!s->first_slice_line || (n==2 || n==3)) && (s->mb_x || (n==1 || n==3))) { |
| 1768 if(is_intra[xy - wrap]) | |
| 4001 | 1769 sum = FFABS(px) + FFABS(py); |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1770 else |
| 4001 | 1771 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
|
1772 if(sum > 32) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1773 if(get_bits1(&s->gb)) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1774 px = A[0]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1775 py = A[1]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1776 } else { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1777 px = C[0]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1778 py = C[1]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1779 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1780 } else { |
| 3396 | 1781 if(is_intra[xy - 1]) |
| 4001 | 1782 sum = FFABS(px) + FFABS(py); |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1783 else |
| 4001 | 1784 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
|
1785 if(sum > 32) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1786 if(get_bits1(&s->gb)) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1787 px = A[0]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1788 py = A[1]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1789 } else { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1790 px = C[0]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1791 py = C[1]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1792 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1793 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1794 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1795 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1796 /* store MV using signed modulus of MV range defined in 4.11 */ |
| 3396 | 1797 s->mv[0][n][0] = s->current_picture.motion_val[0][xy][0] = ((px + dmv_x + r_x) & ((r_x << 1) - 1)) - r_x; |
| 1798 s->mv[0][n][1] = s->current_picture.motion_val[0][xy][1] = ((py + dmv_y + r_y) & ((r_y << 1) - 1)) - r_y; | |
| 1799 if(mv1) { /* duplicate motion data for 1-MV block */ | |
| 1800 s->current_picture.motion_val[0][xy + 1][0] = s->current_picture.motion_val[0][xy][0]; | |
| 1801 s->current_picture.motion_val[0][xy + 1][1] = s->current_picture.motion_val[0][xy][1]; | |
| 1802 s->current_picture.motion_val[0][xy + wrap][0] = s->current_picture.motion_val[0][xy][0]; | |
| 1803 s->current_picture.motion_val[0][xy + wrap][1] = s->current_picture.motion_val[0][xy][1]; | |
| 1804 s->current_picture.motion_val[0][xy + wrap + 1][0] = s->current_picture.motion_val[0][xy][0]; | |
| 1805 s->current_picture.motion_val[0][xy + wrap + 1][1] = s->current_picture.motion_val[0][xy][1]; | |
| 1806 } | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1807 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1808 |
|
3553
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1809 /** 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
|
1810 */ |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1811 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
|
1812 { |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1813 MpegEncContext *s = &v->s; |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1814 DSPContext *dsp = &v->s.dsp; |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1815 uint8_t *srcY, *srcU, *srcV; |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1816 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
|
1817 |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1818 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
|
1819 |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1820 mx = s->mv[1][0][0]; |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1821 my = s->mv[1][0][1]; |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1822 uvmx = (mx + ((mx & 3) == 3)) >> 1; |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1823 uvmy = (my + ((my & 3) == 3)) >> 1; |
|
4258
4d2f162506e3
10e6l FastUVMC was done right but in the wrong place
kostya
parents:
4247
diff
changeset
|
1824 if(v->fastuvmc) { |
|
4d2f162506e3
10e6l FastUVMC was done right but in the wrong place
kostya
parents:
4247
diff
changeset
|
1825 uvmx = uvmx + ((uvmx<0)?-(uvmx&1):(uvmx&1)); |
|
4d2f162506e3
10e6l FastUVMC was done right but in the wrong place
kostya
parents:
4247
diff
changeset
|
1826 uvmy = uvmy + ((uvmy<0)?-(uvmy&1):(uvmy&1)); |
|
4d2f162506e3
10e6l FastUVMC was done right but in the wrong place
kostya
parents:
4247
diff
changeset
|
1827 } |
|
3553
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1828 srcY = s->next_picture.data[0]; |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1829 srcU = s->next_picture.data[1]; |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1830 srcV = s->next_picture.data[2]; |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1831 |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1832 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
|
1833 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
|
1834 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
|
1835 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
|
1836 |
| 4681 | 1837 if(v->profile != PROFILE_ADVANCED){ |
| 1838 src_x = av_clip( src_x, -16, s->mb_width * 16); | |
| 1839 src_y = av_clip( src_y, -16, s->mb_height * 16); | |
| 1840 uvsrc_x = av_clip(uvsrc_x, -8, s->mb_width * 8); | |
| 1841 uvsrc_y = av_clip(uvsrc_y, -8, s->mb_height * 8); | |
| 1842 }else{ | |
| 1843 src_x = av_clip( src_x, -17, s->avctx->coded_width); | |
| 1844 src_y = av_clip( src_y, -18, s->avctx->coded_height + 1); | |
| 1845 uvsrc_x = av_clip(uvsrc_x, -8, s->avctx->coded_width >> 1); | |
| 1846 uvsrc_y = av_clip(uvsrc_y, -8, s->avctx->coded_height >> 1); | |
| 1847 } | |
|
3553
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1848 |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1849 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
|
1850 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
|
1851 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
|
1852 |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1853 /* 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
|
1854 if(s->flags & CODEC_FLAG_GRAY) { |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1855 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
|
1856 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
|
1857 } |
|
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 if(v->rangeredfrm |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1860 || (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
|
1861 || (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
|
1862 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
|
1863 |
| 3708 | 1864 srcY -= s->mspel * (1 + s->linesize); |
| 1865 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
|
1866 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
|
1867 srcY = s->edge_emu_buffer; |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1868 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
|
1869 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
|
1870 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
|
1871 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
|
1872 srcU = uvbuf; |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1873 srcV = uvbuf + 16; |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1874 /* 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
|
1875 if(v->rangeredfrm) { |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1876 int i, j; |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1877 uint8_t *src, *src2; |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1878 |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1879 src = srcY; |
| 3708 | 1880 for(j = 0; j < 17 + s->mspel*2; j++) { |
| 1881 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
|
1882 src += s->linesize; |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1883 } |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1884 src = srcU; src2 = srcV; |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1885 for(j = 0; j < 9; j++) { |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1886 for(i = 0; i < 9; i++) { |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1887 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
|
1888 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
|
1889 } |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1890 src += s->uvlinesize; |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1891 src2 += s->uvlinesize; |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1892 } |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1893 } |
| 3708 | 1894 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
|
1895 } |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1896 |
|
3654
565d9ddd8eb3
Motion compensation for luma always use halfpel precision.
kostya
parents:
3573
diff
changeset
|
1897 mx >>= 1; |
|
565d9ddd8eb3
Motion compensation for luma always use halfpel precision.
kostya
parents:
3573
diff
changeset
|
1898 my >>= 1; |
|
565d9ddd8eb3
Motion compensation for luma always use halfpel precision.
kostya
parents:
3573
diff
changeset
|
1899 dxy = ((my & 1) << 1) | (mx & 1); |
|
565d9ddd8eb3
Motion compensation for luma always use halfpel precision.
kostya
parents:
3573
diff
changeset
|
1900 |
|
565d9ddd8eb3
Motion compensation for luma always use halfpel precision.
kostya
parents:
3573
diff
changeset
|
1901 dsp->avg_pixels_tab[0][dxy](s->dest[0], srcY, s->linesize, 16); |
|
3553
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 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
|
1904 /* Chroma MC always uses qpel blilinear */ |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1905 uvdxy = ((uvmy & 3) << 2) | (uvmx & 3); |
| 3709 | 1906 uvmx = (uvmx&3)<<1; |
| 1907 uvmy = (uvmy&3)<<1; | |
| 1908 dsp->avg_h264_chroma_pixels_tab[0](s->dest[1], srcU, s->uvlinesize, 8, uvmx, uvmy); | |
| 1909 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
|
1910 } |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
1911 |
|
4283
d6f83e2f8804
rename always_inline to av_always_inline and move to common.h
mru
parents:
4258
diff
changeset
|
1912 static av_always_inline int scale_mv(int value, int bfrac, int inv, int qs) |
| 3689 | 1913 { |
| 1914 int n = bfrac; | |
| 1915 | |
| 1916 #if B_FRACTION_DEN==256 | |
| 1917 if(inv) | |
| 1918 n -= 256; | |
| 1919 if(!qs) | |
| 1920 return 2 * ((value * n + 255) >> 9); | |
| 1921 return (value * n + 128) >> 8; | |
| 1922 #else | |
| 1923 if(inv) | |
| 1924 n -= B_FRACTION_DEN; | |
| 1925 if(!qs) | |
| 1926 return 2 * ((value * n + B_FRACTION_DEN - 1) / (2 * B_FRACTION_DEN)); | |
| 1927 return (value * n + B_FRACTION_DEN/2) / B_FRACTION_DEN; | |
| 1928 #endif | |
| 1929 } | |
| 1930 | |
|
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1931 /** 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
|
1932 */ |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1933 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
|
1934 { |
|
3744
805aee1f7cce
For B-frames if the second reference frame signals intensity compensation
kostya
parents:
3743
diff
changeset
|
1935 if(v->use_ic) { |
|
805aee1f7cce
For B-frames if the second reference frame signals intensity compensation
kostya
parents:
3743
diff
changeset
|
1936 v->mv_mode2 = v->mv_mode; |
|
805aee1f7cce
For B-frames if the second reference frame signals intensity compensation
kostya
parents:
3743
diff
changeset
|
1937 v->mv_mode = MV_PMODE_INTENSITY_COMP; |
|
805aee1f7cce
For B-frames if the second reference frame signals intensity compensation
kostya
parents:
3743
diff
changeset
|
1938 } |
| 3689 | 1939 if(direct) { |
| 1940 vc1_mc_1mv(v, 0); | |
| 1941 vc1_interp_mc(v); | |
|
3744
805aee1f7cce
For B-frames if the second reference frame signals intensity compensation
kostya
parents:
3743
diff
changeset
|
1942 if(v->use_ic) v->mv_mode = v->mv_mode2; |
| 3689 | 1943 return; |
| 1944 } | |
| 1945 if(mode == BMV_TYPE_INTERPOLATED) { | |
| 1946 vc1_mc_1mv(v, 0); | |
| 1947 vc1_interp_mc(v); | |
|
3744
805aee1f7cce
For B-frames if the second reference frame signals intensity compensation
kostya
parents:
3743
diff
changeset
|
1948 if(v->use_ic) v->mv_mode = v->mv_mode2; |
| 3689 | 1949 return; |
| 1950 } | |
| 1951 | |
|
3744
805aee1f7cce
For B-frames if the second reference frame signals intensity compensation
kostya
parents:
3743
diff
changeset
|
1952 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
|
1953 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
|
1954 if(v->use_ic) v->mv_mode = v->mv_mode2; |
| 3689 | 1955 } |
| 1956 | |
| 1957 static inline void vc1_pred_b_mv(VC1Context *v, int dmv_x[2], int dmv_y[2], int direct, int mvtype) | |
| 1958 { | |
|
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1959 MpegEncContext *s = &v->s; |
| 3689 | 1960 int xy, wrap, off = 0; |
| 1961 int16_t *A, *B, *C; | |
| 1962 int px, py; | |
| 1963 int sum; | |
| 1964 int r_x, r_y; | |
| 1965 const uint8_t *is_intra = v->mb_type[0]; | |
| 1966 | |
| 1967 r_x = v->range_x; | |
| 1968 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
|
1969 /* 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
|
1970 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
|
1971 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
|
1972 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
|
1973 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
|
1974 |
| 3689 | 1975 wrap = s->b8_stride; |
| 1976 xy = s->block_index[0]; | |
| 1977 | |
| 1978 if(s->mb_intra) { | |
| 1979 s->current_picture.motion_val[0][xy][0] = | |
| 1980 s->current_picture.motion_val[0][xy][1] = | |
| 1981 s->current_picture.motion_val[1][xy][0] = | |
| 1982 s->current_picture.motion_val[1][xy][1] = 0; | |
| 1983 return; | |
| 1984 } | |
|
3743
fc613a610303
Reorder MV order in B-frames so no swapping in vc1_b_mc() is needed
kostya
parents:
3711
diff
changeset
|
1985 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
|
1986 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
|
1987 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
|
1988 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
|
1989 |
|
bc40c297ea15
Pullback should be performed on scaled motion vectors in B-frames
kostya
parents:
4834
diff
changeset
|
1990 /* 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
|
1991 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
|
1992 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
|
1993 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
|
1994 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
|
1995 if(direct) { |
| 3689 | 1996 s->current_picture.motion_val[0][xy][0] = s->mv[0][0][0]; |
| 1997 s->current_picture.motion_val[0][xy][1] = s->mv[0][0][1]; | |
| 1998 s->current_picture.motion_val[1][xy][0] = s->mv[1][0][0]; | |
| 1999 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
|
2000 return; |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2001 } |
| 3689 | 2002 |
|
3743
fc613a610303
Reorder MV order in B-frames so no swapping in vc1_b_mc() is needed
kostya
parents:
3711
diff
changeset
|
2003 if((mvtype == BMV_TYPE_FORWARD) || (mvtype == BMV_TYPE_INTERPOLATED)) { |
| 3689 | 2004 C = s->current_picture.motion_val[0][xy - 2]; |
| 2005 A = s->current_picture.motion_val[0][xy - wrap*2]; | |
| 2006 off = (s->mb_x == (s->mb_width - 1)) ? -2 : 2; | |
| 2007 B = s->current_picture.motion_val[0][xy - wrap*2 + off]; | |
| 2008 | |
|
4834
300b60dee58c
Set C predictor to zero if unavailable (should fix B-frame border artifacts)
kostya
parents:
4784
diff
changeset
|
2009 if(!s->mb_x) C[0] = C[1] = 0; |
| 3689 | 2010 if(!s->first_slice_line) { // predictor A is not out of bounds |
| 2011 if(s->mb_width == 1) { | |
| 2012 px = A[0]; | |
| 2013 py = A[1]; | |
| 2014 } else { | |
| 2015 px = mid_pred(A[0], B[0], C[0]); | |
| 2016 py = mid_pred(A[1], B[1], C[1]); | |
| 2017 } | |
| 2018 } else if(s->mb_x) { // predictor C is not out of bounds | |
| 2019 px = C[0]; | |
| 2020 py = C[1]; | |
| 2021 } else { | |
| 2022 px = py = 0; | |
| 2023 } | |
| 2024 /* Pullback MV as specified in 8.3.5.3.4 */ | |
| 2025 { | |
| 2026 int qx, qy, X, Y; | |
| 2027 if(v->profile < PROFILE_ADVANCED) { | |
| 2028 qx = (s->mb_x << 5); | |
| 2029 qy = (s->mb_y << 5); | |
| 2030 X = (s->mb_width << 5) - 4; | |
| 2031 Y = (s->mb_height << 5) - 4; | |
| 2032 if(qx + px < -28) px = -28 - qx; | |
| 2033 if(qy + py < -28) py = -28 - qy; | |
| 2034 if(qx + px > X) px = X - qx; | |
| 2035 if(qy + py > Y) py = Y - qy; | |
| 2036 } else { | |
| 2037 qx = (s->mb_x << 6); | |
| 2038 qy = (s->mb_y << 6); | |
| 2039 X = (s->mb_width << 6) - 4; | |
| 2040 Y = (s->mb_height << 6) - 4; | |
| 2041 if(qx + px < -60) px = -60 - qx; | |
| 2042 if(qy + py < -60) py = -60 - qy; | |
| 2043 if(qx + px > X) px = X - qx; | |
| 2044 if(qy + py > Y) py = Y - qy; | |
| 2045 } | |
| 2046 } | |
| 2047 /* Calculate hybrid prediction as specified in 8.3.5.3.5 */ | |
| 2048 if(0 && !s->first_slice_line && s->mb_x) { | |
| 2049 if(is_intra[xy - wrap]) | |
| 4001 | 2050 sum = FFABS(px) + FFABS(py); |
| 3689 | 2051 else |
| 4001 | 2052 sum = FFABS(px - A[0]) + FFABS(py - A[1]); |
| 3689 | 2053 if(sum > 32) { |
| 2054 if(get_bits1(&s->gb)) { | |
| 2055 px = A[0]; | |
| 2056 py = A[1]; | |
| 2057 } else { | |
| 2058 px = C[0]; | |
| 2059 py = C[1]; | |
| 2060 } | |
| 2061 } else { | |
| 2062 if(is_intra[xy - 2]) | |
| 4001 | 2063 sum = FFABS(px) + FFABS(py); |
| 3689 | 2064 else |
| 4001 | 2065 sum = FFABS(px - C[0]) + FFABS(py - C[1]); |
| 3689 | 2066 if(sum > 32) { |
| 2067 if(get_bits1(&s->gb)) { | |
| 2068 px = A[0]; | |
| 2069 py = A[1]; | |
| 2070 } else { | |
| 2071 px = C[0]; | |
| 2072 py = C[1]; | |
| 2073 } | |
| 2074 } | |
| 2075 } | |
|
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
2076 } |
| 3689 | 2077 /* store MV using signed modulus of MV range defined in 4.11 */ |
| 2078 s->mv[0][0][0] = ((px + dmv_x[0] + r_x) & ((r_x << 1) - 1)) - r_x; | |
| 2079 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
|
2080 } |
|
3743
fc613a610303
Reorder MV order in B-frames so no swapping in vc1_b_mc() is needed
kostya
parents:
3711
diff
changeset
|
2081 if((mvtype == BMV_TYPE_BACKWARD) || (mvtype == BMV_TYPE_INTERPOLATED)) { |
| 3689 | 2082 C = s->current_picture.motion_val[1][xy - 2]; |
| 2083 A = s->current_picture.motion_val[1][xy - wrap*2]; | |
| 2084 off = (s->mb_x == (s->mb_width - 1)) ? -2 : 2; | |
| 2085 B = s->current_picture.motion_val[1][xy - wrap*2 + off]; | |
| 2086 | |
|
4834
300b60dee58c
Set C predictor to zero if unavailable (should fix B-frame border artifacts)
kostya
parents:
4784
diff
changeset
|
2087 if(!s->mb_x) C[0] = C[1] = 0; |
| 3689 | 2088 if(!s->first_slice_line) { // predictor A is not out of bounds |
| 2089 if(s->mb_width == 1) { | |
| 2090 px = A[0]; | |
| 2091 py = A[1]; | |
| 2092 } else { | |
| 2093 px = mid_pred(A[0], B[0], C[0]); | |
| 2094 py = mid_pred(A[1], B[1], C[1]); | |
| 2095 } | |
| 2096 } else if(s->mb_x) { // predictor C is not out of bounds | |
| 2097 px = C[0]; | |
| 2098 py = C[1]; | |
| 2099 } else { | |
| 2100 px = py = 0; | |
| 2101 } | |
| 2102 /* Pullback MV as specified in 8.3.5.3.4 */ | |
| 2103 { | |
| 2104 int qx, qy, X, Y; | |
| 2105 if(v->profile < PROFILE_ADVANCED) { | |
| 2106 qx = (s->mb_x << 5); | |
| 2107 qy = (s->mb_y << 5); | |
| 2108 X = (s->mb_width << 5) - 4; | |
| 2109 Y = (s->mb_height << 5) - 4; | |
| 2110 if(qx + px < -28) px = -28 - qx; | |
| 2111 if(qy + py < -28) py = -28 - qy; | |
| 2112 if(qx + px > X) px = X - qx; | |
| 2113 if(qy + py > Y) py = Y - qy; | |
| 2114 } else { | |
| 2115 qx = (s->mb_x << 6); | |
| 2116 qy = (s->mb_y << 6); | |
| 2117 X = (s->mb_width << 6) - 4; | |
| 2118 Y = (s->mb_height << 6) - 4; | |
| 2119 if(qx + px < -60) px = -60 - qx; | |
| 2120 if(qy + py < -60) py = -60 - qy; | |
| 2121 if(qx + px > X) px = X - qx; | |
| 2122 if(qy + py > Y) py = Y - qy; | |
| 2123 } | |
| 2124 } | |
| 2125 /* Calculate hybrid prediction as specified in 8.3.5.3.5 */ | |
| 2126 if(0 && !s->first_slice_line && s->mb_x) { | |
| 2127 if(is_intra[xy - wrap]) | |
| 4001 | 2128 sum = FFABS(px) + FFABS(py); |
| 3689 | 2129 else |
| 4001 | 2130 sum = FFABS(px - A[0]) + FFABS(py - A[1]); |
| 3689 | 2131 if(sum > 32) { |
| 2132 if(get_bits1(&s->gb)) { | |
| 2133 px = A[0]; | |
| 2134 py = A[1]; | |
| 2135 } else { | |
| 2136 px = C[0]; | |
| 2137 py = C[1]; | |
| 2138 } | |
| 2139 } else { | |
| 2140 if(is_intra[xy - 2]) | |
| 4001 | 2141 sum = FFABS(px) + FFABS(py); |
| 3689 | 2142 else |
| 4001 | 2143 sum = FFABS(px - C[0]) + FFABS(py - C[1]); |
| 3689 | 2144 if(sum > 32) { |
| 2145 if(get_bits1(&s->gb)) { | |
| 2146 px = A[0]; | |
| 2147 py = A[1]; | |
| 2148 } else { | |
| 2149 px = C[0]; | |
| 2150 py = C[1]; | |
| 2151 } | |
| 2152 } | |
| 2153 } | |
| 2154 } | |
| 2155 /* store MV using signed modulus of MV range defined in 4.11 */ | |
| 2156 | |
| 2157 s->mv[1][0][0] = ((px + dmv_x[1] + r_x) & ((r_x << 1) - 1)) - r_x; | |
| 2158 s->mv[1][0][1] = ((py + dmv_y[1] + r_y) & ((r_y << 1) - 1)) - r_y; | |
| 2159 } | |
| 2160 s->current_picture.motion_val[0][xy][0] = s->mv[0][0][0]; | |
| 2161 s->current_picture.motion_val[0][xy][1] = s->mv[0][0][1]; | |
| 2162 s->current_picture.motion_val[1][xy][0] = s->mv[1][0][0]; | |
| 2163 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
|
2164 } |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
2165 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2166 /** Get predicted DC value for I-frames only |
| 3359 | 2167 * prediction dir: left=0, top=1 |
| 2168 * @param s MpegEncContext | |
| 2169 * @param[in] n block index in the current MB | |
| 2170 * @param dc_val_ptr Pointer to DC predictor | |
| 2171 * @param dir_ptr Prediction direction for use in AC prediction | |
| 2172 */ | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2173 static inline int vc1_i_pred_dc(MpegEncContext *s, int overlap, int pq, int n, |
| 3781 | 2174 int16_t **dc_val_ptr, int *dir_ptr) |
| 3359 | 2175 { |
| 2176 int a, b, c, wrap, pred, scale; | |
| 3781 | 2177 int16_t *dc_val; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2178 static const uint16_t dcpred[32] = { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2179 -1, 1024, 512, 341, 256, 205, 171, 146, 128, |
| 3359 | 2180 114, 102, 93, 85, 79, 73, 68, 64, |
| 2181 60, 57, 54, 51, 49, 47, 45, 43, | |
| 2182 41, 39, 38, 37, 35, 34, 33 | |
| 2183 }; | |
| 2184 | |
| 2185 /* find prediction - wmv3_dc_scale always used here in fact */ | |
| 2186 if (n < 4) scale = s->y_dc_scale; | |
| 2187 else scale = s->c_dc_scale; | |
| 2188 | |
| 2189 wrap = s->block_wrap[n]; | |
| 2190 dc_val= s->dc_val[0] + s->block_index[n]; | |
| 2191 | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2192 /* B A |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2193 * C X |
| 3359 | 2194 */ |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2195 c = dc_val[ - 1]; |
| 3359 | 2196 b = dc_val[ - 1 - wrap]; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2197 a = dc_val[ - wrap]; |
| 3359 | 2198 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2199 if (pq < 9 || !overlap) |
| 3359 | 2200 { |
| 2201 /* Set outer values */ | |
|
3449
ec6096b1ab04
Use s->first_slice_line in checks instead of s->mb_y
kostya
parents:
3430
diff
changeset
|
2202 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
|
2203 if (s->mb_x == 0 && (n!=1 && n!=3)) b=c=dcpred[scale]; |
| 3359 | 2204 } |
| 2205 else | |
| 2206 { | |
| 2207 /* Set outer values */ | |
|
3449
ec6096b1ab04
Use s->first_slice_line in checks instead of s->mb_y
kostya
parents:
3430
diff
changeset
|
2208 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
|
2209 if (s->mb_x == 0 && (n!=1 && n!=3)) b=c=0; |
| 3359 | 2210 } |
| 2211 | |
| 2212 if (abs(a - b) <= abs(b - c)) { | |
| 2213 pred = c; | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2214 *dir_ptr = 1;//left |
| 3359 | 2215 } else { |
| 2216 pred = a; | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2217 *dir_ptr = 0;//top |
| 3359 | 2218 } |
| 2219 | |
| 2220 /* update predictor */ | |
| 2221 *dc_val_ptr = &dc_val[0]; | |
| 2222 return pred; | |
| 2223 } | |
| 2224 | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2225 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2226 /** Get predicted DC value |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2227 * prediction dir: left=0, top=1 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2228 * @param s MpegEncContext |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2229 * @param[in] n block index in the current MB |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2230 * @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
|
2231 * @param dir_ptr Prediction direction for use in AC prediction |
| 3359 | 2232 */ |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2233 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
|
2234 int a_avail, int c_avail, |
| 3781 | 2235 int16_t **dc_val_ptr, int *dir_ptr) |
| 3359 | 2236 { |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2237 int a, b, c, wrap, pred, scale; |
| 3781 | 2238 int16_t *dc_val; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2239 int mb_pos = s->mb_x + s->mb_y * s->mb_stride; |
| 3429 | 2240 int q1, q2 = 0; |
| 3359 | 2241 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2242 /* 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
|
2243 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
|
2244 else scale = s->c_dc_scale; |
| 3359 | 2245 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2246 wrap = s->block_wrap[n]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2247 dc_val= s->dc_val[0] + s->block_index[n]; |
| 3359 | 2248 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2249 /* B A |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2250 * C X |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2251 */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2252 c = dc_val[ - 1]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2253 b = dc_val[ - 1 - wrap]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2254 a = dc_val[ - wrap]; |
|
3508
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2255 /* scale predictors if needed */ |
|
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2256 q1 = s->current_picture.qscale_table[mb_pos]; |
|
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2257 if(c_avail && (n!= 1 && n!=3)) { |
|
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2258 q2 = s->current_picture.qscale_table[mb_pos - 1]; |
|
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2259 if(q2 && q2 != q1) |
| 4949 | 2260 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
|
2261 } |
|
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2262 if(a_avail && (n!= 2 && n!=3)) { |
|
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2263 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
|
2264 if(q2 && q2 != q1) |
| 4949 | 2265 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
|
2266 } |
|
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2267 if(a_avail && c_avail && (n!=3)) { |
|
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2268 int off = mb_pos; |
|
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2269 if(n != 1) off--; |
|
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2270 if(n != 2) off -= s->mb_stride; |
|
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2271 q2 = s->current_picture.qscale_table[off]; |
|
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2272 if(q2 && q2 != q1) |
| 4949 | 2273 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
|
2274 } |
| 3359 | 2275 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2276 if(a_avail && c_avail) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2277 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
|
2278 pred = c; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2279 *dir_ptr = 1;//left |
| 3359 | 2280 } else { |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2281 pred = a; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2282 *dir_ptr = 0;//top |
| 3359 | 2283 } |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2284 } else if(a_avail) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2285 pred = a; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2286 *dir_ptr = 0;//top |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2287 } else if(c_avail) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2288 pred = c; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2289 *dir_ptr = 1;//left |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2290 } else { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2291 pred = 0; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2292 *dir_ptr = 1;//left |
| 3359 | 2293 } |
| 2294 | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2295 /* update predictor */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2296 *dc_val_ptr = &dc_val[0]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2297 return pred; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2298 } |
| 3359 | 2299 |
| 2300 | |
| 2301 /** | |
| 2302 * @defgroup std_mb VC1 Macroblock-level functions in Simple/Main Profiles | |
| 2303 * @see 7.1.4, p91 and 8.1.1.7, p(1)04 | |
| 2304 * @{ | |
| 2305 */ | |
| 2306 | |
| 2307 static inline int vc1_coded_block_pred(MpegEncContext * s, int n, uint8_t **coded_block_ptr) | |
| 2308 { | |
| 2309 int xy, wrap, pred, a, b, c; | |
| 2310 | |
| 2311 xy = s->block_index[n]; | |
| 2312 wrap = s->b8_stride; | |
| 2313 | |
| 2314 /* B C | |
| 2315 * A X | |
| 2316 */ | |
| 2317 a = s->coded_block[xy - 1 ]; | |
| 2318 b = s->coded_block[xy - 1 - wrap]; | |
| 2319 c = s->coded_block[xy - wrap]; | |
| 2320 | |
| 2321 if (b == c) { | |
| 2322 pred = a; | |
| 2323 } else { | |
| 2324 pred = c; | |
| 2325 } | |
| 2326 | |
| 2327 /* store value */ | |
| 2328 *coded_block_ptr = &s->coded_block[xy]; | |
| 2329 | |
| 2330 return pred; | |
| 2331 } | |
| 2332 | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2333 /** |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2334 * Decode one AC coefficient |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2335 * @param v The VC1 context |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2336 * @param last Last coefficient |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2337 * @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
|
2338 * @param value Decoded AC coefficient value |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2339 * @see 8.1.3.4 |
| 3359 | 2340 */ |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2341 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
|
2342 { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2343 GetBitContext *gb = &v->s.gb; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2344 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
|
2345 |
| 4949 | 2346 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
|
2347 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
|
2348 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
|
2349 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
|
2350 lst = index >= vc1_last_decode_table[codingset]; |
| 5513 | 2351 if(get_bits1(gb)) |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2352 level = -level; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2353 } else { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2354 escape = decode210(gb); |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
2355 if (escape != 2) { |
| 4949 | 2356 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
|
2357 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
|
2358 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
|
2359 lst = index >= vc1_last_decode_table[codingset]; |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
2360 if(escape == 0) { |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
2361 if(lst) |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
2362 level += vc1_last_delta_level_table[codingset][run]; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
2363 else |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
2364 level += vc1_delta_level_table[codingset][run]; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
2365 } else { |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
2366 if(lst) |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
2367 run += vc1_last_delta_run_table[codingset][level] + 1; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
2368 else |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
2369 run += vc1_delta_run_table[codingset][level] + 1; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
2370 } |
| 5513 | 2371 if(get_bits1(gb)) |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2372 level = -level; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2373 } else { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2374 int sign; |
| 5513 | 2375 lst = get_bits1(gb); |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2376 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
|
2377 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
|
2378 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
|
2379 if(!v->s.esc3_level_length) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2380 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
|
2381 } else { //table 60 |
| 5511 | 2382 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
|
2383 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2384 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
|
2385 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2386 run = get_bits(gb, v->s.esc3_run_length); |
| 5513 | 2387 sign = get_bits1(gb); |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2388 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
|
2389 if(sign) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2390 level = -level; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2391 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2392 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2393 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2394 *last = lst; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2395 *skip = run; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2396 *value = level; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2397 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2398 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2399 /** 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
|
2400 * @param v VC1Context |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2401 * @param block block to decode |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2402 * @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
|
2403 * @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
|
2404 */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2405 static int vc1_decode_i_block(VC1Context *v, DCTELEM block[64], int n, int coded, int codingset) |
| 3359 | 2406 { |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2407 GetBitContext *gb = &v->s.gb; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2408 MpegEncContext *s = &v->s; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2409 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
|
2410 int run_diff, i; |
| 3781 | 2411 int16_t *dc_val; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2412 int16_t *ac_val, *ac_val2; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2413 int dcdiff; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2414 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2415 /* Get DC differential */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2416 if (n < 4) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2417 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
|
2418 } else { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2419 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
|
2420 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2421 if (dcdiff < 0){ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2422 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
|
2423 return -1; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2424 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2425 if (dcdiff) |
|
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 if (dcdiff == 119 /* ESC index value */) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2428 { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2429 /* TODO: Optimize */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2430 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
|
2431 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
|
2432 else dcdiff = get_bits(gb, 8); |
|
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 else |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2435 { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2436 if (v->pq == 1) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2437 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
|
2438 else if (v->pq == 2) |
| 5513 | 2439 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
|
2440 } |
| 5513 | 2441 if (get_bits1(gb)) |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2442 dcdiff = -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 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2445 /* Prediction */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2446 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
|
2447 *dc_val = dcdiff; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2448 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2449 /* 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
|
2450 if (n < 4) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2451 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
|
2452 } else { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2453 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
|
2454 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2455 /* Skip ? */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2456 run_diff = 0; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2457 i = 0; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2458 if (!coded) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2459 goto not_coded; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2460 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2461 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2462 //AC Decoding |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2463 i = 1; |
|
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 { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2466 int last = 0, skip, value; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2467 const int8_t *zz_table; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2468 int scale; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2469 int k; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2470 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2471 scale = v->pq * 2 + v->halfpq; |
|
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 if(v->s.ac_pred) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2474 if(!dc_pred_dir) |
| 7136 | 2475 zz_table = wmv1_scantable[2]; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2476 else |
| 7136 | 2477 zz_table = wmv1_scantable[3]; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2478 } else |
| 7136 | 2479 zz_table = wmv1_scantable[1]; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2480 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2481 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
|
2482 ac_val2 = ac_val; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2483 if(dc_pred_dir) //left |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2484 ac_val -= 16; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2485 else //top |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2486 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
|
2487 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2488 while (!last) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2489 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
|
2490 i += skip; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2491 if(i > 63) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2492 break; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2493 block[zz_table[i++]] = value; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2494 } |
| 3359 | 2495 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2496 /* apply AC prediction if needed */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2497 if(s->ac_pred) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2498 if(dc_pred_dir) { //left |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2499 for(k = 1; k < 8; k++) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2500 block[k << 3] += ac_val[k]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2501 } else { //top |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2502 for(k = 1; k < 8; k++) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2503 block[k] += ac_val[k + 8]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2504 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2505 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2506 /* save AC coeffs for further prediction */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2507 for(k = 1; k < 8; k++) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2508 ac_val2[k] = block[k << 3]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2509 ac_val2[k + 8] = block[k]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2510 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2511 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2512 /* scale AC coeffs */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2513 for(k = 1; k < 64; k++) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2514 if(block[k]) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2515 block[k] *= scale; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2516 if(!v->pquantizer) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2517 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
|
2518 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2519 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2520 if(s->ac_pred) i = 63; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2521 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2522 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2523 not_coded: |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2524 if(!coded) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2525 int k, scale; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2526 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
|
2527 ac_val2 = ac_val; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2528 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2529 scale = v->pq * 2 + v->halfpq; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2530 memset(ac_val2, 0, 16 * 2); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2531 if(dc_pred_dir) {//left |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2532 ac_val -= 16; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2533 if(s->ac_pred) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2534 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
|
2535 } else {//top |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2536 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
|
2537 if(s->ac_pred) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2538 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
|
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 /* apply AC prediction if needed */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2542 if(s->ac_pred) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2543 if(dc_pred_dir) { //left |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2544 for(k = 1; k < 8; k++) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2545 block[k << 3] = ac_val[k] * scale; |
| 3509 | 2546 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
|
2547 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
|
2548 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2549 } else { //top |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2550 for(k = 1; k < 8; k++) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2551 block[k] = ac_val[k + 8] * scale; |
| 3509 | 2552 if(!v->pquantizer && block[k]) |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2553 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
|
2554 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2555 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2556 i = 63; |
|
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 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2559 s->block_last_index[n] = i; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2560 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2561 return 0; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2562 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2563 |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2564 /** 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
|
2565 * @param v VC1Context |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2566 * @param block block to decode |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2567 * @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
|
2568 * @param codingset set of VLC to decode data |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2569 */ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2570 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
|
2571 { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2572 GetBitContext *gb = &v->s.gb; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2573 MpegEncContext *s = &v->s; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2574 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
|
2575 int run_diff, i; |
| 3781 | 2576 int16_t *dc_val; |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2577 int16_t *ac_val, *ac_val2; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2578 int dcdiff; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2579 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
|
2580 int use_pred = s->ac_pred; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2581 int scale; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2582 int q1, q2 = 0; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2583 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
|
2584 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2585 /* Get DC differential */ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2586 if (n < 4) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2587 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
|
2588 } else { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2589 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
|
2590 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2591 if (dcdiff < 0){ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2592 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
|
2593 return -1; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2594 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2595 if (dcdiff) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2596 { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2597 if (dcdiff == 119 /* ESC index value */) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2598 { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2599 /* TODO: Optimize */ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2600 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
|
2601 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
|
2602 else dcdiff = get_bits(gb, 8); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2603 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2604 else |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2605 { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2606 if (mquant == 1) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2607 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
|
2608 else if (mquant == 2) |
| 5513 | 2609 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
|
2610 } |
| 5513 | 2611 if (get_bits1(gb)) |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2612 dcdiff = -dcdiff; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2613 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2614 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2615 /* Prediction */ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2616 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
|
2617 *dc_val = dcdiff; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2618 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2619 /* 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
|
2620 if (n < 4) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2621 block[0] = dcdiff * s->y_dc_scale; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2622 } else { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2623 block[0] = dcdiff * s->c_dc_scale; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2624 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2625 /* Skip ? */ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2626 run_diff = 0; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2627 i = 0; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2628 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2629 //AC Decoding |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2630 i = 1; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2631 |
| 5194 | 2632 /* 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
|
2633 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
|
2634 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
|
2635 ac_val2 = ac_val; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2636 |
|
5683
dbc41b5a10e7
HALFPQ should be used only for when PQUANT is selected
kostya
parents:
5682
diff
changeset
|
2637 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
|
2638 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2639 if(dc_pred_dir) //left |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2640 ac_val -= 16; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2641 else //top |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2642 ac_val -= 16 * s->block_wrap[n]; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2643 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2644 q1 = s->current_picture.qscale_table[mb_pos]; |
| 4456 | 2645 if(dc_pred_dir && c_avail && mb_pos) q2 = s->current_picture.qscale_table[mb_pos - 1]; |
| 2646 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
|
2647 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
|
2648 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
|
2649 if(n==3) q2 = q1; |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2650 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2651 if(coded) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2652 int last = 0, skip, value; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2653 const int8_t *zz_table; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2654 int k; |
|
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 if(v->s.ac_pred) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2657 if(!dc_pred_dir) |
| 7136 | 2658 zz_table = wmv1_scantable[2]; |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2659 else |
| 7136 | 2660 zz_table = wmv1_scantable[3]; |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2661 } else |
| 7136 | 2662 zz_table = wmv1_scantable[1]; |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2663 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2664 while (!last) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2665 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
|
2666 i += skip; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2667 if(i > 63) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2668 break; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2669 block[zz_table[i++]] = value; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2670 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2671 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2672 /* apply AC prediction if needed */ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2673 if(use_pred) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2674 /* scale predictors if needed*/ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2675 if(q2 && q1!=q2) { |
| 4236 | 2676 q1 = q1 * 2 + ((q1 == v->pq) ? v->halfpq : 0) - 1; |
| 2677 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
|
2678 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2679 if(dc_pred_dir) { //left |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2680 for(k = 1; k < 8; k++) |
| 4949 | 2681 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
|
2682 } else { //top |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2683 for(k = 1; k < 8; k++) |
| 4949 | 2684 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
|
2685 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2686 } else { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2687 if(dc_pred_dir) { //left |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2688 for(k = 1; k < 8; k++) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2689 block[k << 3] += ac_val[k]; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2690 } else { //top |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2691 for(k = 1; k < 8; k++) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2692 block[k] += ac_val[k + 8]; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2693 } |
|
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 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2696 /* save AC coeffs for further prediction */ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2697 for(k = 1; k < 8; k++) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2698 ac_val2[k] = block[k << 3]; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2699 ac_val2[k + 8] = block[k]; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2700 } |
|
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 /* scale AC coeffs */ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2703 for(k = 1; k < 64; k++) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2704 if(block[k]) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2705 block[k] *= scale; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2706 if(!v->pquantizer) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2707 block[k] += (block[k] < 0) ? -mquant : mquant; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2708 } |
|
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(use_pred) i = 63; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2711 } else { // no AC coeffs |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2712 int k; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2713 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2714 memset(ac_val2, 0, 16 * 2); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2715 if(dc_pred_dir) {//left |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2716 if(use_pred) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2717 memcpy(ac_val2, ac_val, 8 * 2); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2718 if(q2 && q1!=q2) { |
| 4236 | 2719 q1 = q1 * 2 + ((q1 == v->pq) ? v->halfpq : 0) - 1; |
| 2720 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
|
2721 for(k = 1; k < 8; k++) |
| 4949 | 2722 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
|
2723 } |
|
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 } else {//top |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2726 if(use_pred) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2727 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
|
2728 if(q2 && q1!=q2) { |
| 4236 | 2729 q1 = q1 * 2 + ((q1 == v->pq) ? v->halfpq : 0) - 1; |
| 2730 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
|
2731 for(k = 1; k < 8; k++) |
| 4949 | 2732 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
|
2733 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2734 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2735 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2736 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2737 /* apply AC prediction if needed */ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2738 if(use_pred) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2739 if(dc_pred_dir) { //left |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2740 for(k = 1; k < 8; k++) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2741 block[k << 3] = ac_val2[k] * scale; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2742 if(!v->pquantizer && block[k << 3]) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2743 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
|
2744 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2745 } else { //top |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2746 for(k = 1; k < 8; k++) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2747 block[k] = ac_val2[k + 8] * scale; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2748 if(!v->pquantizer && block[k]) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2749 block[k] += (block[k] < 0) ? -mquant : mquant; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2750 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2751 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2752 i = 63; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2753 } |
|
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 s->block_last_index[n] = i; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2756 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2757 return 0; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2758 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2759 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2760 /** 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
|
2761 * @param v VC1Context |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2762 * @param block block to decode |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2763 * @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
|
2764 * @param mquant block quantizer |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2765 * @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
|
2766 */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2767 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
|
2768 { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2769 GetBitContext *gb = &v->s.gb; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2770 MpegEncContext *s = &v->s; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2771 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
|
2772 int run_diff, i; |
| 3781 | 2773 int16_t *dc_val; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2774 int16_t *ac_val, *ac_val2; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2775 int dcdiff; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2776 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
|
2777 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
|
2778 int use_pred = s->ac_pred; |
|
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
2779 int scale; |
| 3429 | 2780 int q1, q2 = 0; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2781 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2782 /* 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
|
2783 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
|
2784 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2785 /* 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
|
2786 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
|
2787 s->c_dc_scale = s->c_dc_scale_table[mquant]; |
| 3359 | 2788 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2789 /* Get DC differential */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2790 if (n < 4) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2791 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
|
2792 } else { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2793 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
|
2794 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2795 if (dcdiff < 0){ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2796 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
|
2797 return -1; |
|
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 if (dcdiff) |
|
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 if (dcdiff == 119 /* ESC index value */) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2802 { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2803 /* TODO: Optimize */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2804 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
|
2805 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
|
2806 else dcdiff = get_bits(gb, 8); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2807 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2808 else |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2809 { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2810 if (mquant == 1) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2811 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
|
2812 else if (mquant == 2) |
| 5513 | 2813 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
|
2814 } |
| 5513 | 2815 if (get_bits1(gb)) |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2816 dcdiff = -dcdiff; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2817 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2818 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2819 /* Prediction */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2820 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
|
2821 *dc_val = dcdiff; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2822 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2823 /* 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
|
2824 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2825 if (n < 4) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2826 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
|
2827 } else { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2828 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
|
2829 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2830 /* Skip ? */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2831 run_diff = 0; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2832 i = 0; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2833 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2834 //AC Decoding |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2835 i = 1; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2836 |
|
3399
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
2837 /* 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
|
2838 if(!a_avail) dc_pred_dir = 1; |
|
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
2839 if(!c_avail) dc_pred_dir = 0; |
|
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
2840 if(!a_avail && !c_avail) use_pred = 0; |
|
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
2841 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
|
2842 ac_val2 = ac_val; |
|
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
2843 |
| 3475 | 2844 scale = mquant * 2 + v->halfpq; |
|
3399
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
2845 |
|
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
2846 if(dc_pred_dir) //left |
|
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
2847 ac_val -= 16; |
|
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
2848 else //top |
|
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
2849 ac_val -= 16 * s->block_wrap[n]; |
|
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
2850 |
| 3429 | 2851 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
|
2852 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
|
2853 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
|
2854 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
|
2855 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
|
2856 if(n==3) q2 = q1; |
| 3429 | 2857 |
|
3399
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
2858 if(coded) { |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2859 int last = 0, skip, value; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2860 const int8_t *zz_table; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2861 int k; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2862 |
| 7136 | 2863 zz_table = wmv1_scantable[0]; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2864 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2865 while (!last) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2866 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
|
2867 i += skip; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2868 if(i > 63) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2869 break; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2870 block[zz_table[i++]] = value; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2871 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2872 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2873 /* apply AC prediction if needed */ |
|
3378
d7dda9fd99c8
Adjust AC prediction if (some) predictors are not available.
kostya
parents:
3377
diff
changeset
|
2874 if(use_pred) { |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2875 /* scale predictors if needed*/ |
| 3429 | 2876 if(q2 && q1!=q2) { |
| 4236 | 2877 q1 = q1 * 2 + ((q1 == v->pq) ? v->halfpq : 0) - 1; |
| 2878 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
|
2879 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2880 if(dc_pred_dir) { //left |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2881 for(k = 1; k < 8; k++) |
| 4949 | 2882 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
|
2883 } else { //top |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2884 for(k = 1; k < 8; k++) |
| 4949 | 2885 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
|
2886 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2887 } else { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2888 if(dc_pred_dir) { //left |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2889 for(k = 1; k < 8; k++) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2890 block[k << 3] += ac_val[k]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2891 } else { //top |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2892 for(k = 1; k < 8; k++) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2893 block[k] += ac_val[k + 8]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2894 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2895 } |
|
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 /* save AC coeffs for further prediction */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2898 for(k = 1; k < 8; k++) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2899 ac_val2[k] = block[k << 3]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2900 ac_val2[k + 8] = block[k]; |
| 3359 | 2901 } |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2902 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2903 /* scale AC coeffs */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2904 for(k = 1; k < 64; k++) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2905 if(block[k]) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2906 block[k] *= scale; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2907 if(!v->pquantizer) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2908 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
|
2909 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2910 |
|
3378
d7dda9fd99c8
Adjust AC prediction if (some) predictors are not available.
kostya
parents:
3377
diff
changeset
|
2911 if(use_pred) i = 63; |
|
3399
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
2912 } else { // no AC coeffs |
|
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
2913 int k; |
|
3378
d7dda9fd99c8
Adjust AC prediction if (some) predictors are not available.
kostya
parents:
3377
diff
changeset
|
2914 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2915 memset(ac_val2, 0, 16 * 2); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2916 if(dc_pred_dir) {//left |
| 3396 | 2917 if(use_pred) { |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2918 memcpy(ac_val2, ac_val, 8 * 2); |
| 3429 | 2919 if(q2 && q1!=q2) { |
| 4236 | 2920 q1 = q1 * 2 + ((q1 == v->pq) ? v->halfpq : 0) - 1; |
| 2921 q2 = q2 * 2 + ((q2 == v->pq) ? v->halfpq : 0) - 1; | |
| 3396 | 2922 for(k = 1; k < 8; k++) |
| 4949 | 2923 ac_val2[k] = (ac_val2[k] * q2 * ff_vc1_dqscale[q1 - 1] + 0x20000) >> 18; |
| 3396 | 2924 } |
| 2925 } | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2926 } else {//top |
| 3396 | 2927 if(use_pred) { |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2928 memcpy(ac_val2 + 8, ac_val + 8, 8 * 2); |
| 3429 | 2929 if(q2 && q1!=q2) { |
| 4236 | 2930 q1 = q1 * 2 + ((q1 == v->pq) ? v->halfpq : 0) - 1; |
| 2931 q2 = q2 * 2 + ((q2 == v->pq) ? v->halfpq : 0) - 1; | |
| 3396 | 2932 for(k = 1; k < 8; k++) |
| 4949 | 2933 ac_val2[k + 8] = (ac_val2[k + 8] * q2 * ff_vc1_dqscale[q1 - 1] + 0x20000) >> 18; |
| 3396 | 2934 } |
| 2935 } | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2936 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2937 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2938 /* apply AC prediction if needed */ |
|
3378
d7dda9fd99c8
Adjust AC prediction if (some) predictors are not available.
kostya
parents:
3377
diff
changeset
|
2939 if(use_pred) { |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2940 if(dc_pred_dir) { //left |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2941 for(k = 1; k < 8; k++) { |
| 3396 | 2942 block[k << 3] = ac_val2[k] * scale; |
| 3509 | 2943 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
|
2944 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
|
2945 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2946 } else { //top |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2947 for(k = 1; k < 8; k++) { |
| 3396 | 2948 block[k] = ac_val2[k + 8] * scale; |
| 3509 | 2949 if(!v->pquantizer && block[k]) |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2950 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
|
2951 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2952 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2953 i = 63; |
| 3359 | 2954 } |
| 2955 } | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2956 s->block_last_index[n] = i; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2957 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2958 return 0; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2959 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2960 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2961 /** Decode P block |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2962 */ |
|
5997
90de28dfd8d6
Switch VC-1 decoder to output decoded residual immediately.
kostya
parents:
5964
diff
changeset
|
2963 static int vc1_decode_p_block(VC1Context *v, DCTELEM block[64], int n, int mquant, int ttmb, int first_block, |
| 7355 | 2964 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
|
2965 { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2966 MpegEncContext *s = &v->s; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2967 GetBitContext *gb = &s->gb; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2968 int i, j; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2969 int subblkpat = 0; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2970 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
|
2971 int ttblk = ttmb & 7; |
| 7355 | 2972 int pat = 0; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2973 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2974 if(ttmb == -1) { |
| 4949 | 2975 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
|
2976 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2977 if(ttblk == TT_4X4) { |
| 4949 | 2978 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
|
2979 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2980 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
|
2981 subblkpat = decode012(gb); |
|
3364
59c10b66fbbc
Added loop filtering as ersatz for overlap filter (improves picture quality for coarse quantization).
kostya
parents:
3363
diff
changeset
|
2982 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
|
2983 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
|
2984 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
|
2985 } |
| 4948 | 2986 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
|
2987 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2988 // 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
|
2989 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
|
2990 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
|
2991 ttblk = TT_8X4; |
|
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 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
|
2994 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
|
2995 ttblk = TT_4X8; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2996 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2997 switch(ttblk) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2998 case TT_8X8: |
| 7355 | 2999 pat = 0xF; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3000 i = 0; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3001 last = 0; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3002 while (!last) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3003 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
|
3004 i += skip; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3005 if(i > 63) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3006 break; |
| 7136 | 3007 idx = wmv1_scantable[0][i++]; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3008 block[idx] = value * scale; |
| 3475 | 3009 if(!v->pquantizer) |
| 3010 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
|
3011 } |
|
5997
90de28dfd8d6
Switch VC-1 decoder to output decoded residual immediately.
kostya
parents:
5964
diff
changeset
|
3012 if(!skip_block){ |
|
90de28dfd8d6
Switch VC-1 decoder to output decoded residual immediately.
kostya
parents:
5964
diff
changeset
|
3013 s->dsp.vc1_inv_trans_8x8(block); |
|
90de28dfd8d6
Switch VC-1 decoder to output decoded residual immediately.
kostya
parents:
5964
diff
changeset
|
3014 s->dsp.add_pixels_clamped(block, dst, linesize); |
| 7355 | 3015 if(apply_filter && cbp_top & 0xC) |
| 3016 vc1_loop_filter(dst, 1, linesize, 8, mquant); | |
| 3017 if(apply_filter && cbp_left & 0xA) | |
| 3018 vc1_loop_filter(dst, linesize, 1, 8, mquant); | |
|
5997
90de28dfd8d6
Switch VC-1 decoder to output decoded residual immediately.
kostya
parents:
5964
diff
changeset
|
3019 } |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3020 break; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3021 case TT_4X4: |
| 7355 | 3022 pat = ~subblkpat & 0xF; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3023 for(j = 0; j < 4; j++) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3024 last = subblkpat & (1 << (3 - j)); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3025 i = 0; |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3026 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
|
3027 while (!last) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3028 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
|
3029 i += skip; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3030 if(i > 15) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3031 break; |
| 4949 | 3032 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
|
3033 block[idx + off] = value * scale; |
| 3475 | 3034 if(!v->pquantizer) |
| 3035 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
|
3036 } |
| 7355 | 3037 if(!(subblkpat & (1 << (3 - j))) && !skip_block){ |
|
5997
90de28dfd8d6
Switch VC-1 decoder to output decoded residual immediately.
kostya
parents:
5964
diff
changeset
|
3038 s->dsp.vc1_inv_trans_4x4(dst + (j&1)*4 + (j&2)*2*linesize, linesize, block + off); |
| 7355 | 3039 if(apply_filter && (j&2 ? pat & (1<<(j-2)) : (cbp_top & (1 << (j + 2))))) |
| 3040 vc1_loop_filter(dst + (j&1)*4 + (j&2)*2*linesize, 1, linesize, 4, mquant); | |
| 3041 if(apply_filter && (j&1 ? pat & (1<<(j-1)) : (cbp_left & (1 << (j + 1))))) | |
| 3042 vc1_loop_filter(dst + (j&1)*4 + (j&2)*2*linesize, linesize, 1, 4, mquant); | |
| 3043 } | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3044 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3045 break; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3046 case TT_8X4: |
| 7355 | 3047 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
|
3048 for(j = 0; j < 2; j++) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3049 last = subblkpat & (1 << (1 - j)); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3050 i = 0; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3051 off = j * 32; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3052 while (!last) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3053 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
|
3054 i += skip; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3055 if(i > 31) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3056 break; |
|
6145
ddf5d7fae101
Select scan tables for 8x4 and 4x8 blocks only once.
kostya
parents:
6099
diff
changeset
|
3057 idx = v->zz_8x4[i++]+off; |
|
ddf5d7fae101
Select scan tables for 8x4 and 4x8 blocks only once.
kostya
parents:
6099
diff
changeset
|
3058 block[idx] = value * scale; |
| 3475 | 3059 if(!v->pquantizer) |
|
6145
ddf5d7fae101
Select scan tables for 8x4 and 4x8 blocks only once.
kostya
parents:
6099
diff
changeset
|
3060 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
|
3061 } |
| 7355 | 3062 if(!(subblkpat & (1 << (1 - j))) && !skip_block){ |
|
5997
90de28dfd8d6
Switch VC-1 decoder to output decoded residual immediately.
kostya
parents:
5964
diff
changeset
|
3063 s->dsp.vc1_inv_trans_8x4(dst + j*4*linesize, linesize, block + off); |
| 7355 | 3064 if(apply_filter && j ? pat & 0x3 : (cbp_top & 0xC)) |
| 3065 vc1_loop_filter(dst + j*4*linesize, 1, linesize, 8, mquant); | |
| 3066 if(apply_filter && cbp_left & (2 << j)) | |
| 3067 vc1_loop_filter(dst + j*4*linesize, linesize, 1, 4, mquant); | |
| 3068 } | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3069 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3070 break; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3071 case TT_4X8: |
| 7355 | 3072 pat = ~(subblkpat*5) & 0xF; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3073 for(j = 0; j < 2; j++) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3074 last = subblkpat & (1 << (1 - j)); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3075 i = 0; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3076 off = j * 4; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3077 while (!last) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3078 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
|
3079 i += skip; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3080 if(i > 31) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3081 break; |
|
6145
ddf5d7fae101
Select scan tables for 8x4 and 4x8 blocks only once.
kostya
parents:
6099
diff
changeset
|
3082 idx = v->zz_4x8[i++]+off; |
|
ddf5d7fae101
Select scan tables for 8x4 and 4x8 blocks only once.
kostya
parents:
6099
diff
changeset
|
3083 block[idx] = value * scale; |
| 3475 | 3084 if(!v->pquantizer) |
|
6145
ddf5d7fae101
Select scan tables for 8x4 and 4x8 blocks only once.
kostya
parents:
6099
diff
changeset
|
3085 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
|
3086 } |
| 7355 | 3087 if(!(subblkpat & (1 << (1 - j))) && !skip_block){ |
|
5997
90de28dfd8d6
Switch VC-1 decoder to output decoded residual immediately.
kostya
parents:
5964
diff
changeset
|
3088 s->dsp.vc1_inv_trans_4x8(dst + j*4, linesize, block + off); |
| 7355 | 3089 if(apply_filter && cbp_top & (2 << j)) |
| 3090 vc1_loop_filter(dst + j*4, 1, linesize, 4, mquant); | |
| 3091 if(apply_filter && j ? pat & 0x5 : (cbp_left & 0xA)) | |
| 3092 vc1_loop_filter(dst + j*4, linesize, 1, 8, mquant); | |
| 3093 } | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3094 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3095 break; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3096 } |
| 7355 | 3097 return pat; |
| 3359 | 3098 } |
| 3099 | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3100 |
| 3359 | 3101 /** Decode one P-frame MB (in Simple/Main profile) |
| 3102 */ | |
|
3476
33a177588139
Don't pass block[6][64] parameter to decode_p_mb as we always use s->block
kostya
parents:
3475
diff
changeset
|
3103 static int vc1_decode_p_mb(VC1Context *v) |
| 3359 | 3104 { |
| 3105 MpegEncContext *s = &v->s; | |
| 3106 GetBitContext *gb = &s->gb; | |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3107 int i, j; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3108 int mb_pos = s->mb_x + s->mb_y * s->mb_stride; |
| 3359 | 3109 int cbp; /* cbp decoding stuff */ |
| 3110 int mqdiff, mquant; /* MB quantization */ | |
|
3405
58c4fd135462
Correctly choose global transform mode, MV mode and fix bitplane decoding
kostya
parents:
3404
diff
changeset
|
3111 int ttmb = v->ttfrm; /* MB Transform type */ |
| 3359 | 3112 |
| 3113 static const int size_table[6] = { 0, 2, 3, 4, 5, 8 }, | |
| 3114 offset_table[6] = { 0, 1, 3, 7, 15, 31 }; | |
| 3115 int mb_has_coeffs = 1; /* last_flag */ | |
| 3116 int dmv_x, dmv_y; /* Differential MV components */ | |
| 6903 | 3117 int index, index1; /* LUT indexes */ |
| 3359 | 3118 int val, sign; /* temp values */ |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3119 int first_block = 1; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3120 int dst_idx, off; |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3121 int skipped, fourmv; |
| 7355 | 3122 int block_cbp = 0, pat; |
| 7846 | 3123 int apply_loop_filter; |
| 3359 | 3124 |
| 3125 mquant = v->pq; /* Loosy initialization */ | |
| 3126 | |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3127 if (v->mv_type_is_raw) |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3128 fourmv = get_bits1(gb); |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3129 else |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3130 fourmv = v->mv_type_mb_plane[mb_pos]; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3131 if (v->skip_is_raw) |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3132 skipped = get_bits1(gb); |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3133 else |
|
3375
a1c2e1603be9
Use MpegEncContext->mbskip_table instead of custom bitplane.
kostya
parents:
3371
diff
changeset
|
3134 skipped = v->s.mbskip_table[mb_pos]; |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3135 |
| 3396 | 3136 s->dsp.clear_blocks(s->block[0]); |
| 3137 | |
| 7846 | 3138 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
|
3139 if (!fourmv) /* 1MV mode */ |
| 3359 | 3140 { |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3141 if (!skipped) |
| 3359 | 3142 { |
| 3143 GET_MVDATA(dmv_x, dmv_y); | |
| 3144 | |
| 3689 | 3145 if (s->mb_intra) { |
| 3146 s->current_picture.motion_val[1][s->block_index[0]][0] = 0; | |
| 3147 s->current_picture.motion_val[1][s->block_index[0]][1] = 0; | |
| 3148 } | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3149 s->current_picture.mb_type[mb_pos] = s->mb_intra ? MB_TYPE_INTRA : MB_TYPE_16x16; |
| 3396 | 3150 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
|
3151 |
| 3359 | 3152 /* FIXME Set DC val for inter block ? */ |
| 3153 if (s->mb_intra && !mb_has_coeffs) | |
| 3154 { | |
| 3155 GET_MQUANT(); | |
| 5513 | 3156 s->ac_pred = get_bits1(gb); |
| 3359 | 3157 cbp = 0; |
| 3158 } | |
| 3159 else if (mb_has_coeffs) | |
| 3160 { | |
| 5513 | 3161 if (s->mb_intra) s->ac_pred = get_bits1(gb); |
| 3359 | 3162 cbp = get_vlc2(&v->s.gb, v->cbpcy_vlc->table, VC1_CBPCY_P_VLC_BITS, 2); |
| 3163 GET_MQUANT(); | |
| 3164 } | |
| 3165 else | |
| 3166 { | |
| 3167 mquant = v->pq; | |
| 3168 cbp = 0; | |
| 3169 } | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3170 s->current_picture.qscale_table[mb_pos] = mquant; |
| 3359 | 3171 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3172 if (!v->ttmbf && !s->mb_intra && mb_has_coeffs) |
| 4949 | 3173 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
|
3174 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
|
3175 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
|
3176 dst_idx = 0; |
| 3359 | 3177 for (i=0; i<6; i++) |
| 3178 { | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3179 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
|
3180 dst_idx += i >> 2; |
| 3359 | 3181 val = ((cbp >> (5 - i)) & 1); |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3182 off = (i & 4) ? 0 : ((i & 1) * 8 + (i & 2) * 4 * s->linesize); |
| 3396 | 3183 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
|
3184 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
|
3185 /* 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
|
3186 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
|
3187 if(i == 2 || i == 3 || !s->first_slice_line) |
| 3396 | 3188 v->a_avail = v->mb_type[0][s->block_index[i] - s->block_wrap[i]]; |
| 3189 if(i == 1 || i == 3 || s->mb_x) | |
| 3190 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
|
3191 |
|
3476
33a177588139
Don't pass block[6][64] parameter to decode_p_mb as we always use s->block
kostya
parents:
3475
diff
changeset
|
3192 vc1_decode_intra_block(v, s->block[i], i, val, mquant, (i&4)?v->codingset2:v->codingset); |
| 3521 | 3193 if((i>3) && (s->flags & CODEC_FLAG_GRAY)) continue; |
| 3527 | 3194 s->dsp.vc1_inv_trans_8x8(s->block[i]); |
| 3522 | 3195 if(v->rangeredfrm) for(j = 0; j < 64; j++) s->block[i][j] <<= 1; |
| 5921 | 3196 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
|
3197 if(v->pq >= 9 && v->overlap) { |
| 4209 | 3198 if(v->c_avail) |
| 4239 | 3199 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
|
3200 if(v->a_avail) |
| 4239 | 3201 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
|
3202 } |
| 7846 | 3203 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 | 3204 int left_cbp, top_cbp; |
| 3205 if(i & 4){ | |
| 3206 left_cbp = v->cbp[s->mb_x - 1] >> (i * 4); | |
| 3207 top_cbp = v->cbp[s->mb_x - s->mb_stride] >> (i * 4); | |
| 3208 }else{ | |
| 8582 | 3209 left_cbp = (i & 1) ? (cbp >> ((i-1)*4)) : (v->cbp[s->mb_x - 1] >> ((i+1)*4)); |
| 3210 top_cbp = (i & 2) ? (cbp >> ((i-2)*4)) : (v->cbp[s->mb_x - s->mb_stride] >> ((i+2)*4)); | |
| 7355 | 3211 } |
| 3212 if(left_cbp & 0xC) | |
| 3213 vc1_loop_filter(s->dest[dst_idx] + off, 1, i & 4 ? s->uvlinesize : s->linesize, 8, mquant); | |
| 3214 if(top_cbp & 0xA) | |
| 3215 vc1_loop_filter(s->dest[dst_idx] + off, i & 4 ? s->uvlinesize : s->linesize, 1, 8, mquant); | |
| 3216 } | |
| 3217 block_cbp |= 0xF << (i << 2); | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3218 } else if(val) { |
| 7355 | 3219 int left_cbp = 0, top_cbp = 0, filter = 0; |
| 7846 | 3220 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 | 3221 filter = 1; |
| 3222 if(i & 4){ | |
| 3223 left_cbp = v->cbp[s->mb_x - 1] >> (i * 4); | |
| 3224 top_cbp = v->cbp[s->mb_x - s->mb_stride] >> (i * 4); | |
| 3225 }else{ | |
| 8582 | 3226 left_cbp = (i & 1) ? (cbp >> ((i-1)*4)) : (v->cbp[s->mb_x - 1] >> ((i+1)*4)); |
| 3227 top_cbp = (i & 2) ? (cbp >> ((i-2)*4)) : (v->cbp[s->mb_x - s->mb_stride] >> ((i+2)*4)); | |
| 7355 | 3228 } |
| 8582 | 3229 if(left_cbp & 0xC) |
| 3230 vc1_loop_filter(s->dest[dst_idx] + off, 1, i & 4 ? s->uvlinesize : s->linesize, 8, mquant); | |
| 3231 if(top_cbp & 0xA) | |
| 3232 vc1_loop_filter(s->dest[dst_idx] + off, i & 4 ? s->uvlinesize : s->linesize, 1, 8, mquant); | |
| 7355 | 3233 } |
| 3234 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); | |
| 3235 block_cbp |= pat << (i << 2); | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3236 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
|
3237 first_block = 0; |
| 3359 | 3238 } |
| 3239 } | |
| 3240 } | |
| 3241 else //Skipped | |
| 3242 { | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3243 s->mb_intra = 0; |
|
3507
44e0a262d500
Set DC = 0 for skipped MB as it interferes DC prediction
kostya
parents:
3506
diff
changeset
|
3244 for(i = 0; i < 6; i++) { |
|
44e0a262d500
Set DC = 0 for skipped MB as it interferes DC prediction
kostya
parents:
3506
diff
changeset
|
3245 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
|
3246 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
|
3247 } |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3248 s->current_picture.mb_type[mb_pos] = MB_TYPE_SKIP; |
| 3396 | 3249 s->current_picture.qscale_table[mb_pos] = 0; |
| 3250 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
|
3251 vc1_mc_1mv(v, 0); |
| 3359 | 3252 return 0; |
| 3253 } | |
| 3254 } //1MV mode | |
| 3255 else //4MV mode | |
| 3396 | 3256 { |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3257 if (!skipped /* unskipped MB */) |
| 3359 | 3258 { |
| 3396 | 3259 int intra_count = 0, coded_inter = 0; |
| 3260 int is_intra[6], is_coded[6]; | |
| 3359 | 3261 /* Get CBPCY */ |
| 3262 cbp = get_vlc2(&v->s.gb, v->cbpcy_vlc->table, VC1_CBPCY_P_VLC_BITS, 2); | |
| 3396 | 3263 for (i=0; i<6; i++) |
| 3359 | 3264 { |
| 3265 val = ((cbp >> (5 - i)) & 1); | |
| 3396 | 3266 s->dc_val[0][s->block_index[i]] = 0; |
| 3267 s->mb_intra = 0; | |
| 3268 if(i < 4) { | |
| 3269 dmv_x = dmv_y = 0; | |
| 3270 s->mb_intra = 0; | |
| 3271 mb_has_coeffs = 0; | |
| 3272 if(val) { | |
| 3273 GET_MVDATA(dmv_x, dmv_y); | |
| 3274 } | |
| 3275 vc1_pred_mv(s, i, dmv_x, dmv_y, 0, v->range_x, v->range_y, v->mb_type[0]); | |
| 3276 if(!s->mb_intra) vc1_mc_4mv_luma(v, i); | |
| 3277 intra_count += s->mb_intra; | |
| 3278 is_intra[i] = s->mb_intra; | |
| 3279 is_coded[i] = mb_has_coeffs; | |
| 3280 } | |
| 3281 if(i&4){ | |
| 3282 is_intra[i] = (intra_count >= 3); | |
| 3283 is_coded[i] = val; | |
| 3359 | 3284 } |
| 3396 | 3285 if(i == 4) vc1_mc_4mv_chroma(v); |
| 3286 v->mb_type[0][s->block_index[i]] = is_intra[i]; | |
| 3287 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
|
3288 } |
| 3453 | 3289 // if there are no coded blocks then don't do anything more |
| 3514 | 3290 if(!intra_count && !coded_inter) return 0; |
| 3396 | 3291 dst_idx = 0; |
| 3292 GET_MQUANT(); | |
| 3293 s->current_picture.qscale_table[mb_pos] = mquant; | |
| 3294 /* test if block is intra and has pred */ | |
| 3295 { | |
| 3296 int intrapred = 0; | |
| 3297 for(i=0; i<6; i++) | |
| 3298 if(is_intra[i]) { | |
|
3449
ec6096b1ab04
Use s->first_slice_line in checks instead of s->mb_y
kostya
parents:
3430
diff
changeset
|
3299 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
|
3300 || ((s->mb_x || (i==1 || i==3)) && v->mb_type[0][s->block_index[i] - 1])) { |
| 3396 | 3301 intrapred = 1; |
| 3302 break; | |
| 3303 } | |
| 3304 } | |
| 5513 | 3305 if(intrapred)s->ac_pred = get_bits1(gb); |
| 3396 | 3306 else s->ac_pred = 0; |
| 3307 } | |
| 3308 if (!v->ttmbf && coded_inter) | |
| 4949 | 3309 ttmb = get_vlc2(gb, ff_vc1_ttmb_vlc[v->tt_index].table, VC1_TTMB_VLC_BITS, 2); |
| 3396 | 3310 for (i=0; i<6; i++) |
| 3311 { | |
| 3312 dst_idx += i >> 2; | |
| 3313 off = (i & 4) ? 0 : ((i & 1) * 8 + (i & 2) * 4 * s->linesize); | |
| 3314 s->mb_intra = is_intra[i]; | |
| 3315 if (is_intra[i]) { | |
| 3316 /* check if prediction blocks A and C are available */ | |
| 3317 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
|
3318 if(i == 2 || i == 3 || !s->first_slice_line) |
| 3396 | 3319 v->a_avail = v->mb_type[0][s->block_index[i] - s->block_wrap[i]]; |
| 3320 if(i == 1 || i == 3 || s->mb_x) | |
| 3321 v->c_avail = v->mb_type[0][s->block_index[i] - 1]; | |
| 3359 | 3322 |
| 3396 | 3323 vc1_decode_intra_block(v, s->block[i], i, is_coded[i], mquant, (i&4)?v->codingset2:v->codingset); |
| 3521 | 3324 if((i>3) && (s->flags & CODEC_FLAG_GRAY)) continue; |
| 3527 | 3325 s->dsp.vc1_inv_trans_8x8(s->block[i]); |
| 3522 | 3326 if(v->rangeredfrm) for(j = 0; j < 64; j++) s->block[i][j] <<= 1; |
| 5921 | 3327 s->dsp.put_signed_pixels_clamped(s->block[i], s->dest[dst_idx] + off, (i&4)?s->uvlinesize:s->linesize); |
| 3396 | 3328 if(v->pq >= 9 && v->overlap) { |
| 4209 | 3329 if(v->c_avail) |
| 4239 | 3330 s->dsp.vc1_h_overlap(s->dest[dst_idx] + off, s->linesize >> ((i & 4) >> 2)); |
| 3396 | 3331 if(v->a_avail) |
| 4239 | 3332 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
|
3333 } |
| 7355 | 3334 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)){ |
| 3335 int left_cbp, top_cbp; | |
| 3336 if(i & 4){ | |
| 3337 left_cbp = v->cbp[s->mb_x - 1] >> (i * 4); | |
| 3338 top_cbp = v->cbp[s->mb_x - s->mb_stride] >> (i * 4); | |
| 3339 }else{ | |
| 8582 | 3340 left_cbp = (i & 1) ? (cbp >> ((i-1)*4)) : (v->cbp[s->mb_x - 1] >> ((i+1)*4)); |
| 3341 top_cbp = (i & 2) ? (cbp >> ((i-2)*4)) : (v->cbp[s->mb_x - s->mb_stride] >> ((i+2)*4)); | |
| 7355 | 3342 } |
| 3343 if(left_cbp & 0xC) | |
| 3344 vc1_loop_filter(s->dest[dst_idx] + off, 1, i & 4 ? s->uvlinesize : s->linesize, 8, mquant); | |
| 3345 if(top_cbp & 0xA) | |
| 3346 vc1_loop_filter(s->dest[dst_idx] + off, i & 4 ? s->uvlinesize : s->linesize, 1, 8, mquant); | |
| 3347 } | |
| 3348 block_cbp |= 0xF << (i << 2); | |
| 3396 | 3349 } else if(is_coded[i]) { |
| 7355 | 3350 int left_cbp = 0, top_cbp = 0, filter = 0; |
| 3351 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)){ | |
| 3352 filter = 1; | |
| 3353 if(i & 4){ | |
| 3354 left_cbp = v->cbp[s->mb_x - 1] >> (i * 4); | |
| 3355 top_cbp = v->cbp[s->mb_x - s->mb_stride] >> (i * 4); | |
| 3356 }else{ | |
| 8582 | 3357 left_cbp = (i & 1) ? (cbp >> ((i-1)*4)) : (v->cbp[s->mb_x - 1] >> ((i+1)*4)); |
| 3358 top_cbp = (i & 2) ? (cbp >> ((i-2)*4)) : (v->cbp[s->mb_x - s->mb_stride] >> ((i+2)*4)); | |
| 7355 | 3359 } |
| 8582 | 3360 if(left_cbp & 0xC) |
| 3361 vc1_loop_filter(s->dest[dst_idx] + off, 1, i & 4 ? s->uvlinesize : s->linesize, 8, mquant); | |
| 3362 if(top_cbp & 0xA) | |
| 3363 vc1_loop_filter(s->dest[dst_idx] + off, i & 4 ? s->uvlinesize : s->linesize, 1, 8, mquant); | |
| 7355 | 3364 } |
| 3365 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); | |
| 3366 block_cbp |= pat << (i << 2); | |
| 3396 | 3367 if(!v->ttmbf && ttmb < 8) ttmb = -1; |
| 3368 first_block = 0; | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3369 } |
| 3359 | 3370 } |
| 7355 | 3371 return 0; |
| 3359 | 3372 } |
| 3373 else //Skipped MB | |
| 3374 { | |
|
3400
84de54d536bd
4-MV mode final fixes (now it works for non-exotic modes)
kostya
parents:
3399
diff
changeset
|
3375 s->mb_intra = 0; |
| 3514 | 3376 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
|
3377 for (i=0; i<6; i++) { |
|
44e0a262d500
Set DC = 0 for skipped MB as it interferes DC prediction
kostya
parents:
3506
diff
changeset
|
3378 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
|
3379 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
|
3380 } |
| 3359 | 3381 for (i=0; i<4; i++) |
| 3382 { | |
| 3396 | 3383 vc1_pred_mv(s, i, 0, 0, 0, v->range_x, v->range_y, v->mb_type[0]); |
| 3384 vc1_mc_4mv_luma(v, i); | |
| 3359 | 3385 } |
| 3396 | 3386 vc1_mc_4mv_chroma(v); |
| 3387 s->current_picture.qscale_table[mb_pos] = 0; | |
| 3359 | 3388 return 0; |
| 3389 } | |
| 3390 } | |
| 7355 | 3391 v->cbp[s->mb_x] = block_cbp; |
| 3359 | 3392 |
| 3393 /* Should never happen */ | |
| 3394 return -1; | |
| 3395 } | |
| 3396 | |
|
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3397 /** 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
|
3398 */ |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3399 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
|
3400 { |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3401 MpegEncContext *s = &v->s; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3402 GetBitContext *gb = &s->gb; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3403 int i, j; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3404 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
|
3405 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
|
3406 int mqdiff, mquant; /* MB quantization */ |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3407 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
|
3408 |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3409 static const int size_table[6] = { 0, 2, 3, 4, 5, 8 }, |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3410 offset_table[6] = { 0, 1, 3, 7, 15, 31 }; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3411 int mb_has_coeffs = 0; /* last_flag */ |
| 6903 | 3412 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
|
3413 int val, sign; /* temp values */ |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3414 int first_block = 1; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3415 int dst_idx, off; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3416 int skipped, direct; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3417 int dmv_x[2], dmv_y[2]; |
|
3690
35aae593db08
[Cosmetics] Remove some done TODOs/FIXMEs from comments
kostya
parents:
3689
diff
changeset
|
3418 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
|
3419 |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3420 mquant = v->pq; /* Loosy initialization */ |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3421 s->mb_intra = 0; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3422 |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3423 if (v->dmb_is_raw) |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3424 direct = get_bits1(gb); |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3425 else |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3426 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
|
3427 if (v->skip_is_raw) |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3428 skipped = get_bits1(gb); |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3429 else |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3430 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
|
3431 |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3432 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
|
3433 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
|
3434 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
|
3435 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
|
3436 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
|
3437 } |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3438 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
|
3439 |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3440 if (!direct) { |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3441 if (!skipped) { |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3442 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
|
3443 dmv_x[1] = dmv_x[0]; |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
3444 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
|
3445 } |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3446 if(skipped || !s->mb_intra) { |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3447 bmvtype = decode012(gb); |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3448 switch(bmvtype) { |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3449 case 0: |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3450 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
|
3451 break; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3452 case 1: |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3453 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
|
3454 break; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3455 case 2: |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3456 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
|
3457 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
|
3458 } |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3459 } |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3460 } |
| 3689 | 3461 for(i = 0; i < 6; i++) |
| 3462 v->mb_type[0][s->block_index[i]] = s->mb_intra; | |
| 3463 | |
|
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3464 if (skipped) { |
| 3689 | 3465 if(direct) bmvtype = BMV_TYPE_INTERPOLATED; |
| 3466 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
|
3467 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
|
3468 return; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3469 } |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3470 if (direct) { |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3471 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
|
3472 GET_MQUANT(); |
|
3553
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
3473 s->mb_intra = 0; |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
3474 mb_has_coeffs = 0; |
|
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3475 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
|
3476 if(!v->ttmbf) |
| 4949 | 3477 ttmb = get_vlc2(gb, ff_vc1_ttmb_vlc[v->tt_index].table, VC1_TTMB_VLC_BITS, 2); |
| 3689 | 3478 dmv_x[0] = dmv_y[0] = dmv_x[1] = dmv_y[1] = 0; |
| 3479 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
|
3480 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
|
3481 } else { |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3482 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
|
3483 /* no coded blocks - effectively skipped */ |
| 3689 | 3484 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
|
3485 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
|
3486 return; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3487 } |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3488 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
|
3489 GET_MQUANT(); |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3490 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
|
3491 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
|
3492 cbp = 0; |
| 3689 | 3493 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
|
3494 } else { |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3495 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
|
3496 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
|
3497 if(!mb_has_coeffs) { |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3498 /* interpolated skipped block */ |
| 3689 | 3499 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
|
3500 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
|
3501 return; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3502 } |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3503 } |
| 3689 | 3504 vc1_pred_b_mv(v, dmv_x, dmv_y, direct, bmvtype); |
| 3505 if(!s->mb_intra) { | |
|
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3506 vc1_b_mc(v, dmv_x, dmv_y, direct, bmvtype); |
| 3689 | 3507 } |
|
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3508 if(s->mb_intra) |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3509 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
|
3510 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
|
3511 GET_MQUANT(); |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3512 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
|
3513 if(!v->ttmbf && !s->mb_intra && mb_has_coeffs) |
| 4949 | 3514 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
|
3515 } |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3516 } |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3517 dst_idx = 0; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3518 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
|
3519 { |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3520 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
|
3521 dst_idx += i >> 2; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3522 val = ((cbp >> (5 - i)) & 1); |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3523 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
|
3524 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
|
3525 if(s->mb_intra) { |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3526 /* 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
|
3527 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
|
3528 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
|
3529 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
|
3530 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
|
3531 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
|
3532 |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3533 vc1_decode_intra_block(v, s->block[i], i, val, mquant, (i&4)?v->codingset2:v->codingset); |
| 3521 | 3534 if((i>3) && (s->flags & CODEC_FLAG_GRAY)) continue; |
| 3527 | 3535 s->dsp.vc1_inv_trans_8x8(s->block[i]); |
| 3522 | 3536 if(v->rangeredfrm) for(j = 0; j < 64; j++) s->block[i][j] <<= 1; |
| 5921 | 3537 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
|
3538 } else if(val) { |
| 7355 | 3539 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
|
3540 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
|
3541 first_block = 0; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3542 } |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3543 } |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3544 } |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3545 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3546 /** Decode blocks of I-frame |
| 3359 | 3547 */ |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3548 static void vc1_decode_i_blocks(VC1Context *v) |
| 3359 | 3549 { |
| 3450 | 3550 int k, j; |
| 3359 | 3551 MpegEncContext *s = &v->s; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3552 int cbp, val; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3553 uint8_t *coded_val; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3554 int mb_pos; |
| 3359 | 3555 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3556 /* 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
|
3557 switch(v->y_ac_table_index){ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3558 case 0: |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3559 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
|
3560 break; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3561 case 1: |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3562 v->codingset = CS_HIGH_MOT_INTRA; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3563 break; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3564 case 2: |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3565 v->codingset = CS_MID_RATE_INTRA; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3566 break; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3567 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3568 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3569 switch(v->c_ac_table_index){ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3570 case 0: |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3571 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
|
3572 break; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3573 case 1: |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3574 v->codingset2 = CS_HIGH_MOT_INTER; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3575 break; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3576 case 2: |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3577 v->codingset2 = CS_MID_RATE_INTER; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3578 break; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3579 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3580 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3581 /* 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
|
3582 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
|
3583 s->c_dc_scale = s->c_dc_scale_table[v->pq]; |
| 3359 | 3584 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3585 //do frame decode |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3586 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
|
3587 s->mb_intra = 1; |
|
3449
ec6096b1ab04
Use s->first_slice_line in checks instead of s->mb_y
kostya
parents:
3430
diff
changeset
|
3588 s->first_slice_line = 1; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3589 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
|
3590 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
|
3591 ff_init_block_index(s); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3592 ff_update_block_index(s); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3593 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
|
3594 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
|
3595 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
|
3596 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
|
3597 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
|
3598 s->current_picture.motion_val[1][s->block_index[0]][1] = 0; |
| 3359 | 3599 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3600 // do actual MB decoding and displaying |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3601 cbp = get_vlc2(&v->s.gb, ff_msmp4_mb_i_vlc.table, MB_INTRA_VLC_BITS, 2); |
| 5513 | 3602 v->s.ac_pred = get_bits1(&v->s.gb); |
| 3359 | 3603 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3604 for(k = 0; k < 6; k++) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3605 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
|
3606 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3607 if (k < 4) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3608 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
|
3609 val = val ^ pred; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3610 *coded_val = val; |
|
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 cbp |= val << (5 - k); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3613 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3614 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
|
3615 |
| 3527 | 3616 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
|
3617 if(v->pq >= 9 && v->overlap) { |
| 3450 | 3618 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
|
3619 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3620 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3621 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3622 vc1_put_block(v, s->block); |
|
3690
35aae593db08
[Cosmetics] Remove some done TODOs/FIXMEs from comments
kostya
parents:
3689
diff
changeset
|
3623 if(v->pq >= 9 && v->overlap) { |
| 4209 | 3624 if(s->mb_x) { |
| 4239 | 3625 s->dsp.vc1_h_overlap(s->dest[0], s->linesize); |
| 3626 s->dsp.vc1_h_overlap(s->dest[0] + 8 * s->linesize, s->linesize); | |
| 4209 | 3627 if(!(s->flags & CODEC_FLAG_GRAY)) { |
| 4239 | 3628 s->dsp.vc1_h_overlap(s->dest[1], s->uvlinesize); |
| 3629 s->dsp.vc1_h_overlap(s->dest[2], s->uvlinesize); | |
| 4209 | 3630 } |
| 3631 } | |
| 4239 | 3632 s->dsp.vc1_h_overlap(s->dest[0] + 8, s->linesize); |
| 3633 s->dsp.vc1_h_overlap(s->dest[0] + 8 * s->linesize + 8, s->linesize); | |
| 3450 | 3634 if(!s->first_slice_line) { |
| 4239 | 3635 s->dsp.vc1_v_overlap(s->dest[0], s->linesize); |
| 3636 s->dsp.vc1_v_overlap(s->dest[0] + 8, s->linesize); | |
| 3521 | 3637 if(!(s->flags & CODEC_FLAG_GRAY)) { |
| 4239 | 3638 s->dsp.vc1_v_overlap(s->dest[1], s->uvlinesize); |
| 3639 s->dsp.vc1_v_overlap(s->dest[2], s->uvlinesize); | |
| 3521 | 3640 } |
|
3364
59c10b66fbbc
Added loop filtering as ersatz for overlap filter (improves picture quality for coarse quantization).
kostya
parents:
3363
diff
changeset
|
3641 } |
| 4239 | 3642 s->dsp.vc1_v_overlap(s->dest[0] + 8 * s->linesize, s->linesize); |
| 3643 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
|
3644 } |
| 7355 | 3645 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
|
3646 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3647 if(get_bits_count(&s->gb) > v->bits) { |
| 5684 | 3648 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
|
3649 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
|
3650 return; |
| 3359 | 3651 } |
| 3652 } | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3653 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
|
3654 s->first_slice_line = 0; |
| 3359 | 3655 } |
| 5684 | 3656 ff_er_add_slice(s, 0, 0, s->mb_width - 1, s->mb_height - 1, (AC_END|DC_END|MV_END)); |
| 3359 | 3657 } |
| 3658 | |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3659 /** 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
|
3660 */ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3661 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
|
3662 { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3663 int k, j; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3664 MpegEncContext *s = &v->s; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3665 int cbp, val; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3666 uint8_t *coded_val; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3667 int mb_pos; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3668 int mquant = v->pq; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3669 int mqdiff; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3670 int overlap; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3671 GetBitContext *gb = &s->gb; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3672 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3673 /* select codingmode used for VLC tables selection */ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3674 switch(v->y_ac_table_index){ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3675 case 0: |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3676 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
|
3677 break; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3678 case 1: |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3679 v->codingset = CS_HIGH_MOT_INTRA; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3680 break; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3681 case 2: |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3682 v->codingset = CS_MID_RATE_INTRA; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3683 break; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3684 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3685 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3686 switch(v->c_ac_table_index){ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3687 case 0: |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3688 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
|
3689 break; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3690 case 1: |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3691 v->codingset2 = CS_HIGH_MOT_INTER; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3692 break; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3693 case 2: |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3694 v->codingset2 = CS_MID_RATE_INTER; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3695 break; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3696 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3697 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3698 //do frame decode |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3699 s->mb_x = s->mb_y = 0; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3700 s->mb_intra = 1; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3701 s->first_slice_line = 1; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3702 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
|
3703 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
|
3704 ff_init_block_index(s); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3705 ff_update_block_index(s); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3706 s->dsp.clear_blocks(s->block[0]); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3707 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
|
3708 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
|
3709 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
|
3710 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
|
3711 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3712 // do actual MB decoding and displaying |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3713 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
|
3714 if(v->acpred_is_raw) |
| 5513 | 3715 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
|
3716 else |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3717 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
|
3718 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3719 if(v->condover == CONDOVER_SELECT) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3720 if(v->overflg_is_raw) |
| 5513 | 3721 overlap = get_bits1(&v->s.gb); |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3722 else |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3723 overlap = v->over_flags_plane[mb_pos]; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3724 } else |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3725 overlap = (v->condover == CONDOVER_ALL); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3726 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3727 GET_MQUANT(); |
|
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 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
|
3730 /* 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
|
3731 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
|
3732 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
|
3733 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3734 for(k = 0; k < 6; k++) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3735 val = ((cbp >> (5 - k)) & 1); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3736 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3737 if (k < 4) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3738 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
|
3739 val = val ^ pred; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3740 *coded_val = val; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3741 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3742 cbp |= val << (5 - k); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3743 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3744 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
|
3745 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
|
3746 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3747 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
|
3748 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3749 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
|
3750 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
|
3751 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3752 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3753 vc1_put_block(v, s->block); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3754 if(overlap) { |
| 4209 | 3755 if(s->mb_x) { |
| 4239 | 3756 s->dsp.vc1_h_overlap(s->dest[0], s->linesize); |
| 3757 s->dsp.vc1_h_overlap(s->dest[0] + 8 * s->linesize, s->linesize); | |
| 4209 | 3758 if(!(s->flags & CODEC_FLAG_GRAY)) { |
| 4239 | 3759 s->dsp.vc1_h_overlap(s->dest[1], s->uvlinesize); |
| 3760 s->dsp.vc1_h_overlap(s->dest[2], s->uvlinesize); | |
| 4209 | 3761 } |
| 3762 } | |
| 4239 | 3763 s->dsp.vc1_h_overlap(s->dest[0] + 8, s->linesize); |
| 3764 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
|
3765 if(!s->first_slice_line) { |
| 4239 | 3766 s->dsp.vc1_v_overlap(s->dest[0], s->linesize); |
| 3767 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
|
3768 if(!(s->flags & CODEC_FLAG_GRAY)) { |
| 4239 | 3769 s->dsp.vc1_v_overlap(s->dest[1], s->uvlinesize); |
| 3770 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
|
3771 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3772 } |
| 4239 | 3773 s->dsp.vc1_v_overlap(s->dest[0] + 8 * s->linesize, s->linesize); |
| 3774 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
|
3775 } |
| 7355 | 3776 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
|
3777 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3778 if(get_bits_count(&s->gb) > v->bits) { |
| 5684 | 3779 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
|
3780 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
|
3781 return; |
|
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 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
|
3785 s->first_slice_line = 0; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3786 } |
| 5684 | 3787 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
|
3788 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3789 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3790 static void vc1_decode_p_blocks(VC1Context *v) |
| 3359 | 3791 { |
| 3792 MpegEncContext *s = &v->s; | |
| 3793 | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3794 /* 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
|
3795 switch(v->c_ac_table_index){ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3796 case 0: |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3797 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
|
3798 break; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3799 case 1: |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3800 v->codingset = CS_HIGH_MOT_INTRA; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3801 break; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3802 case 2: |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3803 v->codingset = CS_MID_RATE_INTRA; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3804 break; |
| 3359 | 3805 } |
| 3806 | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3807 switch(v->c_ac_table_index){ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3808 case 0: |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3809 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
|
3810 break; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3811 case 1: |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3812 v->codingset2 = CS_HIGH_MOT_INTER; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3813 break; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3814 case 2: |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3815 v->codingset2 = CS_MID_RATE_INTER; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3816 break; |
| 3359 | 3817 } |
| 3818 | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3819 s->first_slice_line = 1; |
| 7355 | 3820 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
|
3821 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
|
3822 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
|
3823 ff_init_block_index(s); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3824 ff_update_block_index(s); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3825 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
|
3826 |
|
3476
33a177588139
Don't pass block[6][64] parameter to decode_p_mb as we always use s->block
kostya
parents:
3475
diff
changeset
|
3827 vc1_decode_p_mb(v); |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3828 if(get_bits_count(&s->gb) > v->bits || get_bits_count(&s->gb) < 0) { |
| 5684 | 3829 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
|
3830 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
|
3831 return; |
| 3359 | 3832 } |
| 3833 } | |
| 7355 | 3834 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
|
3835 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
|
3836 s->first_slice_line = 0; |
| 3359 | 3837 } |
| 5684 | 3838 ff_er_add_slice(s, 0, 0, s->mb_width - 1, s->mb_height - 1, (AC_END|DC_END|MV_END)); |
| 3359 | 3839 } |
| 3840 | |
|
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3841 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
|
3842 { |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3843 MpegEncContext *s = &v->s; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3844 |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3845 /* 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
|
3846 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
|
3847 case 0: |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3848 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
|
3849 break; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3850 case 1: |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3851 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
|
3852 break; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3853 case 2: |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3854 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
|
3855 break; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3856 } |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3857 |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3858 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
|
3859 case 0: |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3860 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
|
3861 break; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3862 case 1: |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3863 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
|
3864 break; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3865 case 2: |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3866 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
|
3867 break; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3868 } |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3869 |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3870 s->first_slice_line = 1; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3871 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
|
3872 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
|
3873 ff_init_block_index(s); |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3874 ff_update_block_index(s); |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3875 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
|
3876 |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3877 vc1_decode_b_mb(v); |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3878 if(get_bits_count(&s->gb) > v->bits || get_bits_count(&s->gb) < 0) { |
| 5684 | 3879 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
|
3880 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
|
3881 return; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3882 } |
| 7355 | 3883 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
|
3884 } |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3885 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
|
3886 s->first_slice_line = 0; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3887 } |
| 5684 | 3888 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
|
3889 } |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3890 |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3891 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
|
3892 { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3893 MpegEncContext *s = &v->s; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3894 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3895 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
|
3896 s->first_slice_line = 1; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3897 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
|
3898 s->mb_x = 0; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3899 ff_init_block_index(s); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3900 ff_update_block_index(s); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3901 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
|
3902 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
|
3903 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
|
3904 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
|
3905 s->first_slice_line = 0; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3906 } |
| 6481 | 3907 s->pict_type = FF_P_TYPE; |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3908 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3909 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3910 static void vc1_decode_blocks(VC1Context *v) |
| 3359 | 3911 { |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3912 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3913 v->s.esc3_level_length = 0; |
| 5887 | 3914 if(v->x8_type){ |
| 3915 ff_intrax8_decode_picture(&v->x8, 2*v->pq+v->halfpq, v->pq*(!v->pquantizer) ); | |
| 5894 | 3916 }else{ |
| 3359 | 3917 |
| 5893 | 3918 switch(v->s.pict_type) { |
| 6481 | 3919 case FF_I_TYPE: |
| 4433 | 3920 if(v->profile == PROFILE_ADVANCED) |
| 3921 vc1_decode_i_blocks_adv(v); | |
| 3922 else | |
| 3923 vc1_decode_i_blocks(v); | |
| 5893 | 3924 break; |
| 6481 | 3925 case FF_P_TYPE: |
| 5893 | 3926 if(v->p_frame_skipped) |
| 3927 vc1_decode_skip_blocks(v); | |
| 3928 else | |
| 3929 vc1_decode_p_blocks(v); | |
| 3930 break; | |
| 6481 | 3931 case FF_B_TYPE: |
| 5893 | 3932 if(v->bi_type){ |
| 3933 if(v->profile == PROFILE_ADVANCED) | |
| 3934 vc1_decode_i_blocks_adv(v); | |
| 3935 else | |
| 3936 vc1_decode_i_blocks(v); | |
| 3937 }else | |
| 3938 vc1_decode_b_blocks(v); | |
| 3939 break; | |
| 3940 } | |
| 5894 | 3941 } |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3942 } |
| 3359 | 3943 |
| 4462 | 3944 /** Find VC-1 marker in buffer |
| 3945 * @return position where next marker starts or end of buffer if no marker found | |
| 3946 */ | |
| 6304 | 3947 static av_always_inline const uint8_t* find_next_marker(const uint8_t *src, const uint8_t *end) |
| 4462 | 3948 { |
| 3949 uint32_t mrk = 0xFFFFFFFF; | |
| 3950 | |
| 3951 if(end-src < 4) return end; | |
| 3952 while(src < end){ | |
| 3953 mrk = (mrk << 8) | *src++; | |
| 3954 if(IS_MARKER(mrk)) | |
| 3955 return src-4; | |
| 3956 } | |
| 3957 return end; | |
| 3958 } | |
| 3959 | |
| 6304 | 3960 static av_always_inline int vc1_unescape_buffer(const uint8_t *src, int size, uint8_t *dst) |
| 4462 | 3961 { |
| 3962 int dsize = 0, i; | |
| 3963 | |
| 3964 if(size < 4){ | |
| 3965 for(dsize = 0; dsize < size; dsize++) *dst++ = *src++; | |
| 3966 return size; | |
| 3967 } | |
| 3968 for(i = 0; i < size; i++, src++) { | |
| 3969 if(src[0] == 3 && i >= 2 && !src[-1] && !src[-2] && i < size-1 && src[1] < 4) { | |
| 3970 dst[dsize++] = src[1]; | |
| 3971 src++; | |
| 3972 i++; | |
| 3973 } else | |
| 3974 dst[dsize++] = *src; | |
| 3975 } | |
| 3976 return dsize; | |
| 3977 } | |
| 3359 | 3978 |
| 3979 /** Initialize a VC1/WMV3 decoder | |
| 3980 * @todo TODO: Handle VC-1 IDUs (Transport level?) | |
| 3981 * @todo TODO: Decypher remaining bits in extra_data | |
| 3982 */ | |
|
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6481
diff
changeset
|
3983 static av_cold int vc1_decode_init(AVCodecContext *avctx) |
| 3359 | 3984 { |
| 3985 VC1Context *v = avctx->priv_data; | |
| 3986 MpegEncContext *s = &v->s; | |
| 3987 GetBitContext gb; | |
| 3988 | |
| 3989 if (!avctx->extradata_size || !avctx->extradata) return -1; | |
| 3521 | 3990 if (!(avctx->flags & CODEC_FLAG_GRAY)) |
| 3991 avctx->pix_fmt = PIX_FMT_YUV420P; | |
| 3992 else | |
| 3993 avctx->pix_fmt = PIX_FMT_GRAY8; | |
| 3359 | 3994 v->s.avctx = avctx; |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3995 avctx->flags |= CODEC_FLAG_EMU_EDGE; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3996 v->s.flags |= CODEC_FLAG_EMU_EDGE; |
| 3359 | 3997 |
| 5887 | 3998 if(avctx->idct_algo==FF_IDCT_AUTO){ |
| 3999 avctx->idct_algo=FF_IDCT_WMV2; | |
| 4000 } | |
| 4001 | |
| 3359 | 4002 if(ff_h263_decode_init(avctx) < 0) |
| 4003 return -1; | |
| 4004 if (vc1_init_common(v) < 0) return -1; | |
| 4005 | |
| 4006 avctx->coded_width = avctx->width; | |
| 4007 avctx->coded_height = avctx->height; | |
| 4008 if (avctx->codec_id == CODEC_ID_WMV3) | |
| 4009 { | |
| 4010 int count = 0; | |
| 4011 | |
| 4012 // looks like WMV3 has a sequence header stored in the extradata | |
| 4013 // advanced sequence header may be before the first frame | |
| 4014 // the last byte of the extradata is a version number, 1 for the | |
| 4015 // samples we can decode | |
| 4016 | |
| 4017 init_get_bits(&gb, avctx->extradata, avctx->extradata_size*8); | |
| 4018 | |
| 4019 if (decode_sequence_header(avctx, &gb) < 0) | |
| 4020 return -1; | |
| 4021 | |
| 4022 count = avctx->extradata_size*8 - get_bits_count(&gb); | |
| 4023 if (count>0) | |
| 4024 { | |
| 4025 av_log(avctx, AV_LOG_INFO, "Extra data: %i bits left, value: %X\n", | |
| 4026 count, get_bits(&gb, count)); | |
| 4027 } | |
| 4028 else if (count < 0) | |
| 4029 { | |
| 4030 av_log(avctx, AV_LOG_INFO, "Read %i bits in overflow\n", -count); | |
| 4031 } | |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4032 } else { // VC1/WVC1 |
| 6304 | 4033 const uint8_t *start = avctx->extradata; |
| 4034 uint8_t *end = avctx->extradata + avctx->extradata_size; | |
| 4035 const uint8_t *next; | |
| 4036 int size, buf2_size; | |
| 4462 | 4037 uint8_t *buf2 = NULL; |
| 6350 | 4038 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
|
4039 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4040 if(avctx->extradata_size < 16) { |
| 4462 | 4041 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
|
4042 return -1; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4043 } |
| 4462 | 4044 |
| 4045 buf2 = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); | |
| 4046 if(start[0]) start++; // in WVC1 extradata first byte is its size | |
| 4047 next = start; | |
| 4048 for(; next < end; start = next){ | |
| 4049 next = find_next_marker(start + 4, end); | |
| 4050 size = next - start - 4; | |
| 4051 if(size <= 0) continue; | |
| 4052 buf2_size = vc1_unescape_buffer(start + 4, size, buf2); | |
| 4053 init_get_bits(&gb, buf2, buf2_size * 8); | |
| 4054 switch(AV_RB32(start)){ | |
| 4055 case VC1_CODE_SEQHDR: | |
| 4056 if(decode_sequence_header(avctx, &gb) < 0){ | |
| 4057 av_free(buf2); | |
| 4058 return -1; | |
| 4059 } | |
| 6350 | 4060 seq_initialized = 1; |
| 4462 | 4061 break; |
| 4062 case VC1_CODE_ENTRYPOINT: | |
| 4063 if(decode_entry_point(avctx, &gb) < 0){ | |
| 4064 av_free(buf2); | |
| 4065 return -1; | |
| 4066 } | |
| 6350 | 4067 ep_initialized = 1; |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4068 break; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4069 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4070 } |
| 4462 | 4071 av_free(buf2); |
| 6350 | 4072 if(!seq_initialized || !ep_initialized){ |
| 4462 | 4073 av_log(avctx, AV_LOG_ERROR, "Incomplete extradata\n"); |
| 4074 return -1; | |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4075 } |
| 3359 | 4076 } |
| 4077 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
|
4078 s->low_delay = !avctx->has_b_frames; |
| 3359 | 4079 |
| 4080 s->mb_width = (avctx->coded_width+15)>>4; | |
| 4081 s->mb_height = (avctx->coded_height+15)>>4; | |
| 4082 | |
| 4083 /* Allocate mb bitplanes */ | |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
4084 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
|
4085 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
|
4086 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
|
4087 v->over_flags_plane = av_malloc(s->mb_stride * s->mb_height); |
| 3359 | 4088 |
| 7355 | 4089 v->cbp_base = av_malloc(sizeof(v->cbp_base[0]) * 2 * s->mb_stride); |
| 4090 v->cbp = v->cbp_base + s->mb_stride; | |
| 4091 | |
| 3396 | 4092 /* allocate block type info in that way so it could be used with s->block_index[] */ |
| 4093 v->mb_type_base = av_malloc(s->b8_stride * (s->mb_height * 2 + 1) + s->mb_stride * (s->mb_height + 1) * 2); | |
| 4094 v->mb_type[0] = v->mb_type_base + s->b8_stride + 1; | |
| 4095 v->mb_type[1] = v->mb_type_base + s->b8_stride * (s->mb_height * 2 + 1) + s->mb_stride + 1; | |
| 4096 v->mb_type[2] = v->mb_type[1] + s->mb_stride * (s->mb_height + 1); | |
| 4097 | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4098 /* Init coded blocks info */ |
| 3359 | 4099 if (v->profile == PROFILE_ADVANCED) |
| 4100 { | |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
4101 // 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
|
4102 // return -1; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
4103 // 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
|
4104 // return -1; |
| 3359 | 4105 } |
| 4106 | |
| 5887 | 4107 ff_intrax8_common_init(&v->x8,s); |
| 3359 | 4108 return 0; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4109 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4110 |
| 3359 | 4111 |
| 4112 /** Decode a VC1/WMV3 frame | |
| 4113 * @todo TODO: Handle VC-1 IDUs (Transport level?) | |
| 4114 */ | |
| 4115 static int vc1_decode_frame(AVCodecContext *avctx, | |
| 4116 void *data, int *data_size, | |
| 6290 | 4117 const uint8_t *buf, int buf_size) |
| 3359 | 4118 { |
| 4119 VC1Context *v = avctx->priv_data; | |
| 4120 MpegEncContext *s = &v->s; | |
| 4121 AVFrame *pict = data; | |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4122 uint8_t *buf2 = NULL; |
| 3359 | 4123 |
| 4124 /* no supplementary picture */ | |
| 4125 if (buf_size == 0) { | |
| 4126 /* special case for last picture */ | |
| 4127 if (s->low_delay==0 && s->next_picture_ptr) { | |
| 4128 *pict= *(AVFrame*)s->next_picture_ptr; | |
| 4129 s->next_picture_ptr= NULL; | |
| 4130 | |
| 4131 *data_size = sizeof(AVFrame); | |
| 4132 } | |
| 4133 | |
| 4134 return 0; | |
| 4135 } | |
| 4136 | |
| 5127 | 4137 /* We need to set current_picture_ptr before reading the header, |
| 5128 | 4138 * otherwise we cannot store anything in there. */ |
| 3359 | 4139 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
|
4140 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
|
4141 s->current_picture_ptr= &s->picture[i]; |
| 3359 | 4142 } |
| 4143 | |
| 4462 | 4144 //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
|
4145 if (avctx->codec_id == CODEC_ID_VC1) { |
| 4462 | 4146 int buf_size2 = 0; |
| 4147 buf2 = av_mallocz(buf_size + FF_INPUT_BUFFER_PADDING_SIZE); | |
| 4148 | |
| 4149 if(IS_MARKER(AV_RB32(buf))){ /* frame starts with marker and needs to be parsed */ | |
| 6290 | 4150 const uint8_t *start, *end, *next; |
| 4462 | 4151 int size; |
| 4152 | |
| 4153 next = buf; | |
| 4154 for(start = buf, end = buf + buf_size; next < end; start = next){ | |
| 4155 next = find_next_marker(start + 4, end); | |
| 4156 size = next - start - 4; | |
| 4157 if(size <= 0) continue; | |
| 4158 switch(AV_RB32(start)){ | |
| 4159 case VC1_CODE_FRAME: | |
| 4160 buf_size2 = vc1_unescape_buffer(start + 4, size, buf2); | |
| 4161 break; | |
| 4162 case VC1_CODE_ENTRYPOINT: /* it should be before frame data */ | |
| 4163 buf_size2 = vc1_unescape_buffer(start + 4, size, buf2); | |
| 4164 init_get_bits(&s->gb, buf2, buf_size2*8); | |
| 4165 decode_entry_point(avctx, &s->gb); | |
| 4166 break; | |
| 4167 case VC1_CODE_SLICE: | |
| 4168 av_log(avctx, AV_LOG_ERROR, "Sliced decoding is not implemented (yet)\n"); | |
| 4169 av_free(buf2); | |
| 4170 return -1; | |
| 4171 } | |
| 4172 } | |
| 4173 }else if(v->interlace && ((buf[0] & 0xC0) == 0xC0)){ /* WVC1 interlaced stores both fields divided by marker */ | |
| 6304 | 4174 const uint8_t *divider; |
| 4462 | 4175 |
| 4176 divider = find_next_marker(buf, buf + buf_size); | |
| 4177 if((divider == (buf + buf_size)) || AV_RB32(divider) != VC1_CODE_FIELD){ | |
| 4178 av_log(avctx, AV_LOG_ERROR, "Error in WVC1 interlaced frame\n"); | |
| 7300 | 4179 av_free(buf2); |
| 4462 | 4180 return -1; |
| 4181 } | |
| 4182 | |
| 4183 buf_size2 = vc1_unescape_buffer(buf, divider - buf, buf2); | |
| 4184 // TODO | |
| 4185 av_free(buf2);return -1; | |
| 4186 }else{ | |
| 4187 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
|
4188 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4189 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
|
4190 } else |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4191 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
|
4192 // do parse frame header |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4193 if(v->profile < PROFILE_ADVANCED) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4194 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
|
4195 av_free(buf2); |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4196 return -1; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4197 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4198 } else { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4199 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
|
4200 av_free(buf2); |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4201 return -1; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4202 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4203 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4204 |
| 6481 | 4205 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
|
4206 av_free(buf2); |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4207 return -1; |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4208 } |
| 3359 | 4209 |
| 4210 // for hurry_up==5 | |
| 4211 s->current_picture.pict_type= s->pict_type; | |
| 6481 | 4212 s->current_picture.key_frame= s->pict_type == FF_I_TYPE; |
| 3359 | 4213 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4214 /* skip B-frames if we don't have reference frames */ |
| 6481 | 4215 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
|
4216 av_free(buf2); |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4217 return -1;//buf_size; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4218 } |
| 3359 | 4219 /* skip b frames if we are in a hurry */ |
| 6481 | 4220 if(avctx->hurry_up && s->pict_type==FF_B_TYPE) return -1;//buf_size; |
| 4221 if( (avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type==FF_B_TYPE) | |
| 4222 || (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
|
4223 || 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
|
4224 av_free(buf2); |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4225 return buf_size; |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4226 } |
| 3359 | 4227 /* 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
|
4228 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
|
4229 av_free(buf2); |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4230 return -1;//buf_size; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4231 } |
| 3359 | 4232 |
| 4233 if(s->next_p_frame_damaged){ | |
| 6481 | 4234 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
|
4235 return buf_size; |
| 3359 | 4236 else |
| 4237 s->next_p_frame_damaged=0; | |
| 4238 } | |
| 4239 | |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4240 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
|
4241 av_free(buf2); |
| 3359 | 4242 return -1; |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4243 } |
| 3359 | 4244 |
| 5684 | 4245 s->me.qpel_put= s->dsp.put_qpel_pixels_tab; |
| 4246 s->me.qpel_avg= s->dsp.avg_qpel_pixels_tab; | |
| 4247 | |
| 3359 | 4248 ff_er_frame_start(s); |
| 4249 | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4250 v->bits = buf_size * 8; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4251 vc1_decode_blocks(v); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4252 //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
|
4253 // 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
|
4254 // return -1; |
| 3359 | 4255 ff_er_frame_end(s); |
| 4256 | |
| 4257 MPV_frame_end(s); | |
| 4258 | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4259 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
|
4260 assert(s->current_picture.pict_type == s->pict_type); |
| 6481 | 4261 if (s->pict_type == FF_B_TYPE || s->low_delay) { |
| 3359 | 4262 *pict= *(AVFrame*)s->current_picture_ptr; |
| 4263 } else if (s->last_picture_ptr != NULL) { | |
| 4264 *pict= *(AVFrame*)s->last_picture_ptr; | |
| 4265 } | |
| 4266 | |
| 4267 if(s->last_picture_ptr || s->low_delay){ | |
| 4268 *data_size = sizeof(AVFrame); | |
| 4269 ff_print_debug_info(s, pict); | |
| 4270 } | |
| 4271 | |
| 4272 /* Return the Picture timestamp as the frame number */ | |
| 5964 | 4273 /* we subtract 1 because it is added on utils.c */ |
| 3359 | 4274 avctx->frame_number = s->picture_number - 1; |
| 4275 | |
|
3694
8765ee4eaa45
Drop unneeded checks before av_free() and change to av_freep() where it's more suitable.
kostya
parents:
3693
diff
changeset
|
4276 av_free(buf2); |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4277 return buf_size; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4278 } |
| 3359 | 4279 |
| 4280 | |
| 4281 /** Close a VC1/WMV3 decoder | |
| 4282 * @warning Initial try at using MpegEncContext stuff | |
| 4283 */ | |
|
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6481
diff
changeset
|
4284 static av_cold int vc1_decode_end(AVCodecContext *avctx) |
| 3359 | 4285 { |
| 4286 VC1Context *v = avctx->priv_data; | |
| 4287 | |
| 4288 av_freep(&v->hrd_rate); | |
| 4289 av_freep(&v->hrd_buffer); | |
| 4290 MPV_common_end(&v->s); | |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
4291 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
|
4292 av_freep(&v->direct_mb_plane); |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4293 av_freep(&v->acpred_plane); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4294 av_freep(&v->over_flags_plane); |
| 3396 | 4295 av_freep(&v->mb_type_base); |
| 7355 | 4296 av_freep(&v->cbp_base); |
|
6176
1d735690e172
Correctly clean up IntraX8Context upon codec close.
andoma
parents:
6150
diff
changeset
|
4297 ff_intrax8_common_end(&v->x8); |
| 3359 | 4298 return 0; |
| 4299 } | |
| 4300 | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4301 |
| 3359 | 4302 AVCodec vc1_decoder = { |
| 4303 "vc1", | |
| 4304 CODEC_TYPE_VIDEO, | |
| 4305 CODEC_ID_VC1, | |
| 4306 sizeof(VC1Context), | |
| 4307 vc1_decode_init, | |
| 4308 NULL, | |
| 4309 vc1_decode_end, | |
| 4310 vc1_decode_frame, | |
| 4311 CODEC_CAP_DELAY, | |
| 6712 | 4312 NULL, |
|
7040
e943e1409077
Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents:
6903
diff
changeset
|
4313 .long_name = NULL_IF_CONFIG_SMALL("SMPTE VC-1"), |
| 3359 | 4314 }; |
| 4315 | |
| 4316 AVCodec wmv3_decoder = { | |
| 4317 "wmv3", | |
| 4318 CODEC_TYPE_VIDEO, | |
| 4319 CODEC_ID_WMV3, | |
| 4320 sizeof(VC1Context), | |
| 4321 vc1_decode_init, | |
| 4322 NULL, | |
| 4323 vc1_decode_end, | |
| 4324 vc1_decode_frame, | |
| 4325 CODEC_CAP_DELAY, | |
| 6712 | 4326 NULL, |
|
7040
e943e1409077
Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents:
6903
diff
changeset
|
4327 .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9"), |
| 3359 | 4328 }; |
