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