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