Mercurial > libavcodec.hg
annotate vc1.c @ 4834:300b60dee58c libavcodec
Set C predictor to zero if unavailable (should fix B-frame border artifacts)
| author | kostya |
|---|---|
| date | Tue, 10 Apr 2007 05:31:22 +0000 |
| parents | 7738ad31b6e2 |
| children | bc40c297ea15 |
| rev | line source |
|---|---|
| 3359 | 1 /* |
| 2 * VC-1 and WMV3 decoder | |
| 4605 | 3 * Copyright (c) 2006-2007 Konstantin Shishkov |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4 * Partly based on vc9.c (c) 2005 Anonymous, Alex Beregszaszi, Michael Niedermayer |
| 3359 | 5 * |
|
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3920
diff
changeset
|
6 * This file is part of FFmpeg. |
|
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3920
diff
changeset
|
7 * |
|
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3920
diff
changeset
|
8 * FFmpeg is free software; you can redistribute it and/or |
| 3359 | 9 * modify it under the terms of the GNU Lesser General Public |
| 10 * License as published by the Free Software Foundation; either | |
|
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3920
diff
changeset
|
11 * version 2.1 of the License, or (at your option) any later version. |
| 3359 | 12 * |
|
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3920
diff
changeset
|
13 * FFmpeg is distributed in the hope that it will be useful, |
| 3359 | 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 16 * Lesser General Public License for more details. | |
| 17 * | |
| 18 * You should have received a copy of the GNU Lesser General Public | |
|
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3920
diff
changeset
|
19 * License along with FFmpeg; if not, write to the Free Software |
| 3359 | 20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 21 * | |
| 22 */ | |
| 23 | |
| 24 /** | |
| 25 * @file vc1.c | |
| 26 * VC-1 and WMV3 decoder | |
| 27 * | |
| 28 */ | |
| 29 #include "common.h" | |
| 30 #include "dsputil.h" | |
| 31 #include "avcodec.h" | |
| 32 #include "mpegvideo.h" | |
| 33 #include "vc1data.h" | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
34 #include "vc1acdata.h" |
| 3359 | 35 |
| 36 #undef NDEBUG | |
| 37 #include <assert.h> | |
| 38 | |
| 39 extern const uint32_t ff_table0_dc_lum[120][2], ff_table1_dc_lum[120][2]; | |
| 40 extern const uint32_t ff_table0_dc_chroma[120][2], ff_table1_dc_chroma[120][2]; | |
| 41 extern VLC ff_msmp4_dc_luma_vlc[2], ff_msmp4_dc_chroma_vlc[2]; | |
| 42 #define MB_INTRA_VLC_BITS 9 | |
| 43 extern VLC ff_msmp4_mb_i_vlc; | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
44 extern const uint16_t ff_msmp4_mb_i_table[64][2]; |
| 3359 | 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 | |
| 4462 | 49 /** Markers used if VC-1 AP frame data */ |
| 50 //@{ | |
| 51 enum VC1Code{ | |
| 52 VC1_CODE_RES0 = 0x00000100, | |
| 53 VC1_CODE_ENDOFSEQ = 0x0000010A, | |
| 54 VC1_CODE_SLICE, | |
| 55 VC1_CODE_FIELD, | |
| 56 VC1_CODE_FRAME, | |
| 57 VC1_CODE_ENTRYPOINT, | |
| 58 VC1_CODE_SEQHDR, | |
| 59 }; | |
| 60 //@} | |
| 3359 | 61 |
| 62 /** Available Profiles */ | |
| 63 //@{ | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
64 enum Profile { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
65 PROFILE_SIMPLE, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
66 PROFILE_MAIN, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
67 PROFILE_COMPLEX, ///< TODO: WMV9 specific |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
68 PROFILE_ADVANCED |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
69 }; |
| 3359 | 70 //@} |
| 71 | |
| 72 /** Sequence quantizer mode */ | |
| 73 //@{ | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
74 enum QuantMode { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
75 QUANT_FRAME_IMPLICIT, ///< Implicitly specified at frame level |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
76 QUANT_FRAME_EXPLICIT, ///< Explicitly specified at frame level |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
77 QUANT_NON_UNIFORM, ///< Non-uniform quant used for all frames |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
78 QUANT_UNIFORM ///< Uniform quant used for all frames |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
79 }; |
| 3359 | 80 //@} |
| 81 | |
| 82 /** Where quant can be changed */ | |
| 83 //@{ | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
84 enum DQProfile { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
85 DQPROFILE_FOUR_EDGES, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
86 DQPROFILE_DOUBLE_EDGES, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
87 DQPROFILE_SINGLE_EDGE, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
88 DQPROFILE_ALL_MBS |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
89 }; |
| 3359 | 90 //@} |
| 91 | |
| 92 /** @name Where quant can be changed | |
| 93 */ | |
| 94 //@{ | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
95 enum DQSingleEdge { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
96 DQSINGLE_BEDGE_LEFT, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
97 DQSINGLE_BEDGE_TOP, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
98 DQSINGLE_BEDGE_RIGHT, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
99 DQSINGLE_BEDGE_BOTTOM |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
100 }; |
| 3359 | 101 //@} |
| 102 | |
| 103 /** Which pair of edges is quantized with ALTPQUANT */ | |
| 104 //@{ | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
105 enum DQDoubleEdge { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
106 DQDOUBLE_BEDGE_TOPLEFT, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
107 DQDOUBLE_BEDGE_TOPRIGHT, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
108 DQDOUBLE_BEDGE_BOTTOMRIGHT, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
109 DQDOUBLE_BEDGE_BOTTOMLEFT |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
110 }; |
| 3359 | 111 //@} |
| 112 | |
| 113 /** MV modes for P frames */ | |
| 114 //@{ | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
115 enum MVModes { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
116 MV_PMODE_1MV_HPEL_BILIN, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
117 MV_PMODE_1MV, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
118 MV_PMODE_1MV_HPEL, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
119 MV_PMODE_MIXED_MV, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
120 MV_PMODE_INTENSITY_COMP |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
121 }; |
| 3359 | 122 //@} |
| 123 | |
| 124 /** @name MV types for B frames */ | |
| 125 //@{ | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
126 enum BMVTypes { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
127 BMV_TYPE_BACKWARD, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
128 BMV_TYPE_FORWARD, |
|
3553
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
129 BMV_TYPE_INTERPOLATED |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
130 }; |
| 3359 | 131 //@} |
| 132 | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
133 /** @name Block types for P/B frames */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
134 //@{ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
135 enum TransformTypes { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
136 TT_8X8, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
137 TT_8X4_BOTTOM, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
138 TT_8X4_TOP, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
139 TT_8X4, //Both halves |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
140 TT_4X8_RIGHT, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
141 TT_4X8_LEFT, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
142 TT_4X8, //Both halves |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
143 TT_4X4 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
144 }; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
145 //@} |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
146 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
147 /** Table for conversion between TTBLK and TTMB */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
148 static const int ttblk_to_tt[3][8] = { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
149 { TT_8X4, TT_4X8, TT_8X8, TT_4X4, TT_8X4_TOP, TT_8X4_BOTTOM, TT_4X8_RIGHT, TT_4X8_LEFT }, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
150 { TT_8X8, TT_4X8_RIGHT, TT_4X8_LEFT, TT_4X4, TT_8X4, TT_4X8, TT_8X4_BOTTOM, TT_8X4_TOP }, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
151 { TT_8X8, TT_4X8, TT_4X4, TT_8X4_BOTTOM, TT_4X8_RIGHT, TT_4X8_LEFT, TT_8X4, TT_8X4_TOP } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
152 }; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
153 |
|
3405
58c4fd135462
Correctly choose global transform mode, MV mode and fix bitplane decoding
kostya
parents:
3404
diff
changeset
|
154 static const int ttfrm_to_tt[4] = { TT_8X8, TT_8X4, TT_4X8, TT_4X4 }; |
|
58c4fd135462
Correctly choose global transform mode, MV mode and fix bitplane decoding
kostya
parents:
3404
diff
changeset
|
155 |
| 3359 | 156 /** MV P mode - the 5th element is only used for mode 1 */ |
| 157 static const uint8_t mv_pmode_table[2][5] = { | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
158 { MV_PMODE_1MV_HPEL_BILIN, MV_PMODE_1MV, MV_PMODE_1MV_HPEL, MV_PMODE_INTENSITY_COMP, MV_PMODE_MIXED_MV }, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
159 { MV_PMODE_1MV, MV_PMODE_MIXED_MV, MV_PMODE_1MV_HPEL, MV_PMODE_INTENSITY_COMP, MV_PMODE_1MV_HPEL_BILIN } |
| 3359 | 160 }; |
|
3405
58c4fd135462
Correctly choose global transform mode, MV mode and fix bitplane decoding
kostya
parents:
3404
diff
changeset
|
161 static const uint8_t mv_pmode_table2[2][4] = { |
|
58c4fd135462
Correctly choose global transform mode, MV mode and fix bitplane decoding
kostya
parents:
3404
diff
changeset
|
162 { MV_PMODE_1MV_HPEL_BILIN, MV_PMODE_1MV, MV_PMODE_1MV_HPEL, MV_PMODE_MIXED_MV }, |
|
58c4fd135462
Correctly choose global transform mode, MV mode and fix bitplane decoding
kostya
parents:
3404
diff
changeset
|
163 { MV_PMODE_1MV, MV_PMODE_MIXED_MV, MV_PMODE_1MV_HPEL, MV_PMODE_1MV_HPEL_BILIN } |
|
58c4fd135462
Correctly choose global transform mode, MV mode and fix bitplane decoding
kostya
parents:
3404
diff
changeset
|
164 }; |
| 3359 | 165 |
| 166 /** One more frame type */ | |
| 167 #define BI_TYPE 7 | |
| 168 | |
| 169 static const int fps_nr[5] = { 24, 25, 30, 50, 60 }, | |
| 170 fps_dr[2] = { 1000, 1001 }; | |
| 171 static const uint8_t pquant_table[3][32] = { | |
| 172 { /* Implicit quantizer */ | |
| 173 0, 1, 2, 3, 4, 5, 6, 7, 8, 6, 7, 8, 9, 10, 11, 12, | |
| 174 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 27, 29, 31 | |
| 175 }, | |
| 176 { /* Explicit quantizer, pquantizer uniform */ | |
| 177 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, | |
| 178 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31 | |
| 179 }, | |
| 180 { /* Explicit quantizer, pquantizer non-uniform */ | |
| 181 0, 1, 1, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, | |
| 182 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 29, 31 | |
| 183 } | |
| 184 }; | |
| 185 | |
| 186 /** @name VC-1 VLC tables and defines | |
| 187 * @todo TODO move this into the context | |
| 188 */ | |
| 189 //@{ | |
| 190 #define VC1_BFRACTION_VLC_BITS 7 | |
| 191 static VLC vc1_bfraction_vlc; | |
| 192 #define VC1_IMODE_VLC_BITS 4 | |
| 193 static VLC vc1_imode_vlc; | |
| 194 #define VC1_NORM2_VLC_BITS 3 | |
| 195 static VLC vc1_norm2_vlc; | |
| 196 #define VC1_NORM6_VLC_BITS 9 | |
| 197 static VLC vc1_norm6_vlc; | |
| 198 /* Could be optimized, one table only needs 8 bits */ | |
| 199 #define VC1_TTMB_VLC_BITS 9 //12 | |
| 200 static VLC vc1_ttmb_vlc[3]; | |
| 201 #define VC1_MV_DIFF_VLC_BITS 9 //15 | |
| 202 static VLC vc1_mv_diff_vlc[4]; | |
| 203 #define VC1_CBPCY_P_VLC_BITS 9 //14 | |
| 204 static VLC vc1_cbpcy_p_vlc[4]; | |
| 205 #define VC1_4MV_BLOCK_PATTERN_VLC_BITS 6 | |
| 206 static VLC vc1_4mv_block_pattern_vlc[4]; | |
| 207 #define VC1_TTBLK_VLC_BITS 5 | |
| 208 static VLC vc1_ttblk_vlc[3]; | |
| 209 #define VC1_SUBBLKPAT_VLC_BITS 6 | |
| 210 static VLC vc1_subblkpat_vlc[3]; | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
211 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
212 static VLC vc1_ac_coeff_table[8]; |
| 3359 | 213 //@} |
| 214 | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
215 enum CodingSet { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
216 CS_HIGH_MOT_INTRA = 0, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
217 CS_HIGH_MOT_INTER, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
218 CS_LOW_MOT_INTRA, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
219 CS_LOW_MOT_INTER, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
220 CS_MID_RATE_INTRA, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
221 CS_MID_RATE_INTER, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
222 CS_HIGH_RATE_INTRA, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
223 CS_HIGH_RATE_INTER |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
224 }; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
225 |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
226 /** @name Overlap conditions for Advanced Profile */ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
227 //@{ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
228 enum COTypes { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
229 CONDOVER_NONE = 0, |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
230 CONDOVER_ALL, |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
231 CONDOVER_SELECT |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
232 }; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
233 //@} |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
234 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
235 |
| 3359 | 236 /** The VC1 Context |
| 237 * @fixme Change size wherever another size is more efficient | |
| 238 * Many members are only used for Advanced Profile | |
| 239 */ | |
| 240 typedef struct VC1Context{ | |
| 241 MpegEncContext s; | |
| 242 | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
243 int bits; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
244 |
| 3359 | 245 /** Simple/Main Profile sequence header */ |
| 246 //@{ | |
| 247 int res_sm; ///< reserved, 2b | |
| 248 int res_x8; ///< reserved | |
| 249 int multires; ///< frame-level RESPIC syntax element present | |
| 250 int res_fasttx; ///< reserved, always 1 | |
| 251 int res_transtab; ///< reserved, always 0 | |
| 252 int rangered; ///< RANGEREDFRM (range reduction) syntax element present | |
| 253 ///< at frame level | |
| 254 int res_rtm_flag; ///< reserved, set to 1 | |
| 255 int reserved; ///< reserved | |
| 256 //@} | |
| 257 | |
| 258 /** Advanced Profile */ | |
| 259 //@{ | |
| 260 int level; ///< 3bits, for Advanced/Simple Profile, provided by TS layer | |
| 261 int chromaformat; ///< 2bits, 2=4:2:0, only defined | |
| 262 int postprocflag; ///< Per-frame processing suggestion flag present | |
| 263 int broadcast; ///< TFF/RFF present | |
| 264 int interlace; ///< Progressive/interlaced (RPTFTM syntax element) | |
| 265 int tfcntrflag; ///< TFCNTR present | |
| 266 int panscanflag; ///< NUMPANSCANWIN, TOPLEFT{X,Y}, BOTRIGHT{X,Y} present | |
| 267 int extended_dmv; ///< Additional extended dmv range at P/B frame-level | |
| 268 int color_prim; ///< 8bits, chroma coordinates of the color primaries | |
| 269 int transfer_char; ///< 8bits, Opto-electronic transfer characteristics | |
| 270 int matrix_coef; ///< 8bits, Color primaries->YCbCr transform matrix | |
| 271 int hrd_param_flag; ///< Presence of Hypothetical Reference | |
| 272 ///< Decoder parameters | |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
273 int psf; ///< Progressive Segmented Frame |
| 3359 | 274 //@} |
| 275 | |
| 276 /** Sequence header data for all Profiles | |
| 277 * TODO: choose between ints, uint8_ts and monobit flags | |
| 278 */ | |
| 279 //@{ | |
| 280 int profile; ///< 2bits, Profile | |
| 281 int frmrtq_postproc; ///< 3bits, | |
| 282 int bitrtq_postproc; ///< 5bits, quantized framerate-based postprocessing strength | |
| 283 int fastuvmc; ///< Rounding of qpel vector to hpel ? (not in Simple) | |
| 284 int extended_mv; ///< Ext MV in P/B (not in Simple) | |
| 285 int dquant; ///< How qscale varies with MBs, 2bits (not in Simple) | |
| 286 int vstransform; ///< variable-size [48]x[48] transform type + info | |
| 287 int overlap; ///< overlapped transforms in use | |
| 288 int quantizer_mode; ///< 2bits, quantizer mode used for sequence, see QUANT_* | |
| 289 int finterpflag; ///< INTERPFRM present | |
| 290 //@} | |
| 291 | |
| 292 /** Frame decoding info for all profiles */ | |
| 293 //@{ | |
| 294 uint8_t mv_mode; ///< MV coding monde | |
| 295 uint8_t mv_mode2; ///< Secondary MV coding mode (B frames) | |
| 296 int k_x; ///< Number of bits for MVs (depends on MV range) | |
| 297 int k_y; ///< Number of bits for MVs (depends on MV range) | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
298 int range_x, range_y; ///< MV range |
| 3359 | 299 uint8_t pq, altpq; ///< Current/alternate frame quantizer scale |
| 300 /** pquant parameters */ | |
| 301 //@{ | |
| 302 uint8_t dquantfrm; | |
| 303 uint8_t dqprofile; | |
| 304 uint8_t dqsbedge; | |
| 305 uint8_t dqbilevel; | |
| 306 //@} | |
| 307 /** AC coding set indexes | |
| 308 * @see 8.1.1.10, p(1)10 | |
| 309 */ | |
| 310 //@{ | |
| 311 int c_ac_table_index; ///< Chroma index from ACFRM element | |
| 312 int y_ac_table_index; ///< Luma index from AC2FRM element | |
| 313 //@} | |
| 314 int ttfrm; ///< Transform type info present at frame level | |
| 315 uint8_t ttmbf; ///< Transform type flag | |
| 316 uint8_t ttblk4x4; ///< Value of ttblk which indicates a 4x4 transform | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
317 int codingset; ///< index of current table set from 11.8 to use for luma block decoding |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
318 int codingset2; ///< index of current table set from 11.8 to use for chroma block decoding |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
319 int pqindex; ///< raw pqindex used in coding set selection |
|
3364
59c10b66fbbc
Added loop filtering as ersatz for overlap filter (improves picture quality for coarse quantization).
kostya
parents:
3363
diff
changeset
|
320 int a_avail, c_avail; |
| 3396 | 321 uint8_t *mb_type_base, *mb_type[3]; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
322 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
323 |
| 3359 | 324 /** Luma compensation parameters */ |
| 325 //@{ | |
| 326 uint8_t lumscale; | |
| 327 uint8_t lumshift; | |
| 328 //@} | |
| 329 int16_t bfraction; ///< Relative position % anchors=> how to scale MVs | |
| 330 uint8_t halfpq; ///< Uniform quant over image and qp+.5 | |
| 331 uint8_t respic; ///< Frame-level flag for resized images | |
| 332 int buffer_fullness; ///< HRD info | |
| 333 /** Ranges: | |
| 334 * -# 0 -> [-64n 63.f] x [-32, 31.f] | |
| 335 * -# 1 -> [-128, 127.f] x [-64, 63.f] | |
| 336 * -# 2 -> [-512, 511.f] x [-128, 127.f] | |
| 337 * -# 3 -> [-1024, 1023.f] x [-256, 255.f] | |
| 338 */ | |
| 339 uint8_t mvrange; | |
| 340 uint8_t pquantizer; ///< Uniform (over sequence) quantizer in use | |
| 341 VLC *cbpcy_vlc; ///< CBPCY VLC table | |
| 342 int tt_index; ///< Index for Transform Type tables | |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
343 uint8_t* mv_type_mb_plane; ///< bitplane for mv_type == (4MV) |
|
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
344 uint8_t* direct_mb_plane; ///< bitplane for "direct" MBs |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
345 int mv_type_is_raw; ///< mv type mb plane is not coded |
|
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
346 int dmb_is_raw; ///< direct mb plane is raw |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
347 int skip_is_raw; ///< skip mb plane is not coded |
| 3406 | 348 uint8_t luty[256], lutuv[256]; // lookup tables used for intensity compensation |
|
3744
805aee1f7cce
For B-frames if the second reference frame signals intensity compensation
kostya
parents:
3743
diff
changeset
|
349 int use_ic; ///< use intensity compensation in B-frames |
| 3474 | 350 int rnd; ///< rounding control |
| 3359 | 351 |
| 352 /** Frame decoding info for S/M profiles only */ | |
| 353 //@{ | |
| 354 uint8_t rangeredfrm; ///< out_sample = CLIP((in_sample-128)*2+128) | |
| 355 uint8_t interpfrm; | |
| 356 //@} | |
| 357 | |
| 358 /** Frame decoding info for Advanced profile */ | |
| 359 //@{ | |
| 360 uint8_t fcm; ///< 0->Progressive, 2->Frame-Interlace, 3->Field-Interlace | |
| 361 uint8_t numpanscanwin; | |
| 362 uint8_t tfcntr; | |
| 363 uint8_t rptfrm, tff, rff; | |
| 364 uint16_t topleftx; | |
| 365 uint16_t toplefty; | |
| 366 uint16_t bottomrightx; | |
| 367 uint16_t bottomrighty; | |
| 368 uint8_t uvsamp; | |
| 369 uint8_t postproc; | |
| 370 int hrd_num_leaky_buckets; | |
| 371 uint8_t bit_rate_exponent; | |
| 372 uint8_t buffer_size_exponent; | |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
373 uint8_t* acpred_plane; ///< AC prediction flags bitplane |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
374 int acpred_is_raw; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
375 uint8_t* over_flags_plane; ///< Overflags bitplane |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
376 int overflg_is_raw; |
| 3359 | 377 uint8_t condover; |
| 378 uint16_t *hrd_rate, *hrd_buffer; | |
| 379 uint8_t *hrd_fullness; | |
| 380 uint8_t range_mapy_flag; | |
| 381 uint8_t range_mapuv_flag; | |
| 382 uint8_t range_mapy; | |
| 383 uint8_t range_mapuv; | |
| 384 //@} | |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
385 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
386 int p_frame_skipped; |
| 3689 | 387 int bi_type; |
| 3359 | 388 } VC1Context; |
| 389 | |
| 390 /** | |
| 391 * Get unary code of limited length | |
| 392 * @fixme FIXME Slow and ugly | |
| 393 * @param gb GetBitContext | |
| 394 * @param[in] stop The bitstop value (unary code of 1's or 0's) | |
| 395 * @param[in] len Maximum length | |
| 396 * @return Unary length/index | |
| 397 */ | |
| 398 static int get_prefix(GetBitContext *gb, int stop, int len) | |
| 399 { | |
| 400 #if 1 | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
401 int i; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
402 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
403 for(i = 0; i < len && get_bits1(gb) != stop; i++); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
404 return i; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
405 /* int i = 0, tmp = !stop; |
| 3359 | 406 |
| 407 while (i != len && tmp != stop) | |
| 408 { | |
| 409 tmp = get_bits(gb, 1); | |
| 410 i++; | |
| 411 } | |
| 412 if (i == len && tmp != stop) return len+1; | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
413 return i;*/ |
| 3359 | 414 #else |
| 415 unsigned int buf; | |
| 416 int log; | |
| 417 | |
| 418 OPEN_READER(re, gb); | |
| 419 UPDATE_CACHE(re, gb); | |
| 420 buf=GET_CACHE(re, gb); //Still not sure | |
| 421 if (stop) buf = ~buf; | |
| 422 | |
| 423 log= av_log2(-buf); //FIXME: -? | |
| 424 if (log < limit){ | |
| 425 LAST_SKIP_BITS(re, gb, log+1); | |
| 426 CLOSE_READER(re, gb); | |
| 427 return log; | |
| 428 } | |
| 429 | |
| 430 LAST_SKIP_BITS(re, gb, limit); | |
| 431 CLOSE_READER(re, gb); | |
| 432 return limit; | |
| 433 #endif | |
| 434 } | |
| 435 | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
436 static inline int decode210(GetBitContext *gb){ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
437 int n; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
438 n = get_bits1(gb); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
439 if (n == 1) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
440 return 0; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
441 else |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
442 return 2 - get_bits1(gb); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
443 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
444 |
| 3359 | 445 /** |
| 446 * Init VC-1 specific tables and VC1Context members | |
| 447 * @param v The VC1Context to initialize | |
| 448 * @return Status | |
| 449 */ | |
| 450 static int vc1_init_common(VC1Context *v) | |
| 451 { | |
| 452 static int done = 0; | |
| 453 int i = 0; | |
| 454 | |
| 455 v->hrd_rate = v->hrd_buffer = NULL; | |
| 456 | |
| 457 /* VLC tables */ | |
| 458 if(!done) | |
| 459 { | |
| 460 done = 1; | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
461 init_vlc(&vc1_bfraction_vlc, VC1_BFRACTION_VLC_BITS, 23, |
| 3359 | 462 vc1_bfraction_bits, 1, 1, |
| 463 vc1_bfraction_codes, 1, 1, 1); | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
464 init_vlc(&vc1_norm2_vlc, VC1_NORM2_VLC_BITS, 4, |
| 3359 | 465 vc1_norm2_bits, 1, 1, |
| 466 vc1_norm2_codes, 1, 1, 1); | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
467 init_vlc(&vc1_norm6_vlc, VC1_NORM6_VLC_BITS, 64, |
| 3359 | 468 vc1_norm6_bits, 1, 1, |
| 469 vc1_norm6_codes, 2, 2, 1); | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
470 init_vlc(&vc1_imode_vlc, VC1_IMODE_VLC_BITS, 7, |
| 3359 | 471 vc1_imode_bits, 1, 1, |
| 472 vc1_imode_codes, 1, 1, 1); | |
| 473 for (i=0; i<3; i++) | |
| 474 { | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
475 init_vlc(&vc1_ttmb_vlc[i], VC1_TTMB_VLC_BITS, 16, |
| 3359 | 476 vc1_ttmb_bits[i], 1, 1, |
| 477 vc1_ttmb_codes[i], 2, 2, 1); | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
478 init_vlc(&vc1_ttblk_vlc[i], VC1_TTBLK_VLC_BITS, 8, |
| 3359 | 479 vc1_ttblk_bits[i], 1, 1, |
| 480 vc1_ttblk_codes[i], 1, 1, 1); | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
481 init_vlc(&vc1_subblkpat_vlc[i], VC1_SUBBLKPAT_VLC_BITS, 15, |
| 3359 | 482 vc1_subblkpat_bits[i], 1, 1, |
| 483 vc1_subblkpat_codes[i], 1, 1, 1); | |
| 484 } | |
| 485 for(i=0; i<4; i++) | |
| 486 { | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
487 init_vlc(&vc1_4mv_block_pattern_vlc[i], VC1_4MV_BLOCK_PATTERN_VLC_BITS, 16, |
| 3359 | 488 vc1_4mv_block_pattern_bits[i], 1, 1, |
| 489 vc1_4mv_block_pattern_codes[i], 1, 1, 1); | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
490 init_vlc(&vc1_cbpcy_p_vlc[i], VC1_CBPCY_P_VLC_BITS, 64, |
| 3359 | 491 vc1_cbpcy_p_bits[i], 1, 1, |
| 492 vc1_cbpcy_p_codes[i], 2, 2, 1); | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
493 init_vlc(&vc1_mv_diff_vlc[i], VC1_MV_DIFF_VLC_BITS, 73, |
| 3359 | 494 vc1_mv_diff_bits[i], 1, 1, |
| 495 vc1_mv_diff_codes[i], 2, 2, 1); | |
| 496 } | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
497 for(i=0; i<8; i++) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
498 init_vlc(&vc1_ac_coeff_table[i], AC_VLC_BITS, vc1_ac_sizes[i], |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
499 &vc1_ac_tables[i][0][1], 8, 4, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
500 &vc1_ac_tables[i][0][0], 8, 4, 1); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
501 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
|
502 &ff_msmp4_mb_i_table[0][1], 4, 2, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
503 &ff_msmp4_mb_i_table[0][0], 4, 2, 1); |
| 3359 | 504 } |
| 505 | |
| 506 /* Other defaults */ | |
| 507 v->pq = -1; | |
| 508 v->mvrange = 0; /* 7.1.1.18, p80 */ | |
| 509 | |
| 510 return 0; | |
| 511 } | |
| 512 | |
| 513 /***********************************************************************/ | |
| 514 /** | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
515 * @defgroup bitplane VC9 Bitplane decoding |
| 3359 | 516 * @see 8.7, p56 |
| 517 * @{ | |
| 518 */ | |
| 519 | |
| 520 /** @addtogroup bitplane | |
| 521 * Imode types | |
| 522 * @{ | |
| 523 */ | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
524 enum Imode { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
525 IMODE_RAW, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
526 IMODE_NORM2, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
527 IMODE_DIFF2, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
528 IMODE_NORM6, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
529 IMODE_DIFF6, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
530 IMODE_ROWSKIP, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
531 IMODE_COLSKIP |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
532 }; |
| 3359 | 533 /** @} */ //imode defines |
| 534 | |
| 535 /** Decode rows by checking if they are skipped | |
| 536 * @param plane Buffer to store decoded bits | |
| 537 * @param[in] width Width of this buffer | |
| 538 * @param[in] height Height of this buffer | |
| 539 * @param[in] stride of this buffer | |
| 540 */ | |
| 541 static void decode_rowskip(uint8_t* plane, int width, int height, int stride, GetBitContext *gb){ | |
| 542 int x, y; | |
| 543 | |
| 544 for (y=0; y<height; y++){ | |
| 545 if (!get_bits(gb, 1)) //rowskip | |
| 546 memset(plane, 0, width); | |
| 547 else | |
| 548 for (x=0; x<width; x++) | |
| 549 plane[x] = get_bits(gb, 1); | |
| 550 plane += stride; | |
| 551 } | |
| 552 } | |
| 553 | |
| 554 /** Decode columns by checking if they are skipped | |
| 555 * @param plane Buffer to store decoded bits | |
| 556 * @param[in] width Width of this buffer | |
| 557 * @param[in] height Height of this buffer | |
| 558 * @param[in] stride of this buffer | |
| 559 * @fixme FIXME: Optimize | |
| 560 */ | |
| 561 static void decode_colskip(uint8_t* plane, int width, int height, int stride, GetBitContext *gb){ | |
| 562 int x, y; | |
| 563 | |
| 564 for (x=0; x<width; x++){ | |
| 565 if (!get_bits(gb, 1)) //colskip | |
| 566 for (y=0; y<height; y++) | |
| 567 plane[y*stride] = 0; | |
| 568 else | |
| 569 for (y=0; y<height; y++) | |
| 570 plane[y*stride] = get_bits(gb, 1); | |
| 571 plane ++; | |
| 572 } | |
| 573 } | |
| 574 | |
| 575 /** Decode a bitplane's bits | |
| 576 * @param bp Bitplane where to store the decode bits | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
577 * @param v VC-1 context for bit reading and logging |
| 3359 | 578 * @return Status |
| 579 * @fixme FIXME: Optimize | |
| 580 */ | |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
581 static int bitplane_decoding(uint8_t* data, int *raw_flag, VC1Context *v) |
| 3359 | 582 { |
| 583 GetBitContext *gb = &v->s.gb; | |
| 584 | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
585 int imode, x, y, code, offset; |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
586 uint8_t invert, *planep = data; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
587 int width, height, stride; |
| 3359 | 588 |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
589 width = v->s.mb_width; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
590 height = v->s.mb_height; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
591 stride = v->s.mb_stride; |
| 3359 | 592 invert = get_bits(gb, 1); |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
593 imode = get_vlc2(gb, vc1_imode_vlc.table, VC1_IMODE_VLC_BITS, 1); |
| 3359 | 594 |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
595 *raw_flag = 0; |
| 3359 | 596 switch (imode) |
| 597 { | |
| 598 case IMODE_RAW: | |
| 599 //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
|
600 *raw_flag = 1; //invert ignored |
| 3359 | 601 return invert; |
| 602 case IMODE_DIFF2: | |
| 603 case IMODE_NORM2: | |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
604 if ((height * width) & 1) |
| 3359 | 605 { |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
606 *planep++ = get_bits(gb, 1); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
607 offset = 1; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
608 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
609 else offset = 0; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
610 // decode bitplane as one long line |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
611 for (y = offset; y < height * width; y += 2) { |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
612 code = get_vlc2(gb, vc1_norm2_vlc.table, VC1_NORM2_VLC_BITS, 1); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
613 *planep++ = code & 1; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
614 offset++; |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
615 if(offset == width) { |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
616 offset = 0; |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
617 planep += stride - width; |
| 3359 | 618 } |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
619 *planep++ = code >> 1; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
620 offset++; |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
621 if(offset == width) { |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
622 offset = 0; |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
623 planep += stride - width; |
| 3359 | 624 } |
| 625 } | |
| 626 break; | |
| 627 case IMODE_DIFF6: | |
| 628 case IMODE_NORM6: | |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
629 if(!(height % 3) && (width % 3)) { // use 2x3 decoding |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
630 for(y = 0; y < height; y+= 3) { |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
631 for(x = width & 1; x < width; x += 2) { |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
632 code = get_vlc2(gb, vc1_norm6_vlc.table, VC1_NORM6_VLC_BITS, 2); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
633 if(code < 0){ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
634 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
|
635 return -1; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
636 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
637 planep[x + 0] = (code >> 0) & 1; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
638 planep[x + 1] = (code >> 1) & 1; |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
639 planep[x + 0 + stride] = (code >> 2) & 1; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
640 planep[x + 1 + stride] = (code >> 3) & 1; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
641 planep[x + 0 + stride * 2] = (code >> 4) & 1; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
642 planep[x + 1 + stride * 2] = (code >> 5) & 1; |
| 3359 | 643 } |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
644 planep += stride * 3; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
645 } |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
646 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
|
647 } else { // 3x2 |
|
3405
58c4fd135462
Correctly choose global transform mode, MV mode and fix bitplane decoding
kostya
parents:
3404
diff
changeset
|
648 planep += (height & 1) * stride; |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
649 for(y = height & 1; y < height; y += 2) { |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
650 for(x = width % 3; x < width; x += 3) { |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
651 code = get_vlc2(gb, vc1_norm6_vlc.table, VC1_NORM6_VLC_BITS, 2); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
652 if(code < 0){ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
653 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
|
654 return -1; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
655 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
656 planep[x + 0] = (code >> 0) & 1; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
657 planep[x + 1] = (code >> 1) & 1; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
658 planep[x + 2] = (code >> 2) & 1; |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
659 planep[x + 0 + stride] = (code >> 3) & 1; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
660 planep[x + 1 + stride] = (code >> 4) & 1; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
661 planep[x + 2 + stride] = (code >> 5) & 1; |
| 3359 | 662 } |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
663 planep += stride * 2; |
| 3359 | 664 } |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
665 x = width % 3; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
666 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
|
667 if(height & 1) decode_rowskip(data+x, width - x, 1, stride, &v->s.gb); |
| 3359 | 668 } |
| 669 break; | |
| 670 case IMODE_ROWSKIP: | |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
671 decode_rowskip(data, width, height, stride, &v->s.gb); |
| 3359 | 672 break; |
| 673 case IMODE_COLSKIP: | |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
674 decode_colskip(data, width, height, stride, &v->s.gb); |
| 3359 | 675 break; |
| 676 default: break; | |
| 677 } | |
| 678 | |
| 679 /* Applying diff operator */ | |
| 680 if (imode == IMODE_DIFF2 || imode == IMODE_DIFF6) | |
| 681 { | |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
682 planep = data; |
| 3359 | 683 planep[0] ^= invert; |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
684 for (x=1; x<width; x++) |
| 3359 | 685 planep[x] ^= planep[x-1]; |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
686 for (y=1; y<height; y++) |
| 3359 | 687 { |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
688 planep += stride; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
689 planep[0] ^= planep[-stride]; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
690 for (x=1; x<width; x++) |
| 3359 | 691 { |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
692 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
|
693 else planep[x] ^= planep[x-1]; |
| 3359 | 694 } |
| 695 } | |
| 696 } | |
| 697 else if (invert) | |
| 698 { | |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
699 planep = data; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
700 for (x=0; x<stride*height; x++) planep[x] = !planep[x]; //FIXME stride |
| 3359 | 701 } |
| 702 return (imode<<1) + invert; | |
| 703 } | |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
704 |
| 3359 | 705 /** @} */ //Bitplane group |
| 706 | |
| 707 /***********************************************************************/ | |
| 708 /** VOP Dquant decoding | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
709 * @param v VC-1 Context |
| 3359 | 710 */ |
| 711 static int vop_dquant_decoding(VC1Context *v) | |
| 712 { | |
| 713 GetBitContext *gb = &v->s.gb; | |
| 714 int pqdiff; | |
| 715 | |
| 716 //variable size | |
| 717 if (v->dquant == 2) | |
| 718 { | |
| 719 pqdiff = get_bits(gb, 3); | |
| 720 if (pqdiff == 7) v->altpq = get_bits(gb, 5); | |
| 721 else v->altpq = v->pq + pqdiff + 1; | |
| 722 } | |
| 723 else | |
| 724 { | |
| 725 v->dquantfrm = get_bits(gb, 1); | |
| 726 if ( v->dquantfrm ) | |
| 727 { | |
| 728 v->dqprofile = get_bits(gb, 2); | |
| 729 switch (v->dqprofile) | |
| 730 { | |
| 731 case DQPROFILE_SINGLE_EDGE: | |
| 732 case DQPROFILE_DOUBLE_EDGES: | |
| 733 v->dqsbedge = get_bits(gb, 2); | |
| 734 break; | |
| 735 case DQPROFILE_ALL_MBS: | |
| 736 v->dqbilevel = get_bits(gb, 1); | |
| 737 default: break; //Forbidden ? | |
| 738 } | |
| 3451 | 739 if (v->dqbilevel || v->dqprofile != DQPROFILE_ALL_MBS) |
| 3359 | 740 { |
| 741 pqdiff = get_bits(gb, 3); | |
| 742 if (pqdiff == 7) v->altpq = get_bits(gb, 5); | |
| 743 else v->altpq = v->pq + pqdiff + 1; | |
| 744 } | |
| 745 } | |
| 746 } | |
| 747 return 0; | |
| 748 } | |
| 749 | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
750 /** Put block onto picture |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
751 */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
752 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
|
753 { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
754 uint8_t *Y; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
755 int ys, us, vs; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
756 DSPContext *dsp = &v->s.dsp; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
757 |
| 3522 | 758 if(v->rangeredfrm) { |
| 759 int i, j, k; | |
| 760 for(k = 0; k < 6; k++) | |
| 761 for(j = 0; j < 8; j++) | |
| 762 for(i = 0; i < 8; i++) | |
| 763 block[k][i + j*8] = ((block[k][i + j*8] - 128) << 1) + 128; | |
| 764 | |
| 765 } | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
766 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
|
767 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
|
768 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
|
769 Y = v->s.dest[0]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
770 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
771 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
|
772 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
|
773 Y += ys * 8; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
774 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
|
775 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
|
776 |
| 3521 | 777 if(!(v->s.flags & CODEC_FLAG_GRAY)) { |
| 778 dsp->put_pixels_clamped(block[4], v->s.dest[1], us); | |
| 779 dsp->put_pixels_clamped(block[5], v->s.dest[2], vs); | |
| 780 } | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
781 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
782 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
783 /** Do motion compensation over 1 macroblock |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
784 * 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
|
785 */ |
|
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
786 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
|
787 { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
788 MpegEncContext *s = &v->s; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
789 DSPContext *dsp = &v->s.dsp; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
790 uint8_t *srcY, *srcU, *srcV; |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
791 int dxy, uvdxy, mx, my, uvmx, uvmy, src_x, src_y, uvsrc_x, uvsrc_y; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
792 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
793 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
|
794 |
| 3689 | 795 mx = s->mv[dir][0][0]; |
| 796 my = s->mv[dir][0][1]; | |
| 797 | |
| 798 // store motion vectors for further use in B frames | |
| 799 if(s->pict_type == P_TYPE) { | |
| 800 s->current_picture.motion_val[1][s->block_index[0]][0] = mx; | |
| 801 s->current_picture.motion_val[1][s->block_index[0]][1] = my; | |
| 802 } | |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
803 uvmx = (mx + ((mx & 3) == 3)) >> 1; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
804 uvmy = (my + ((my & 3) == 3)) >> 1; |
|
4258
4d2f162506e3
10e6l FastUVMC was done right but in the wrong place
kostya
parents:
4247
diff
changeset
|
805 if(v->fastuvmc) { |
|
4d2f162506e3
10e6l FastUVMC was done right but in the wrong place
kostya
parents:
4247
diff
changeset
|
806 uvmx = uvmx + ((uvmx<0)?(uvmx&1):-(uvmx&1)); |
|
4d2f162506e3
10e6l FastUVMC was done right but in the wrong place
kostya
parents:
4247
diff
changeset
|
807 uvmy = uvmy + ((uvmy<0)?(uvmy&1):-(uvmy&1)); |
|
4d2f162506e3
10e6l FastUVMC was done right but in the wrong place
kostya
parents:
4247
diff
changeset
|
808 } |
|
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
809 if(!dir) { |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
810 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
|
811 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
|
812 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
|
813 } else { |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
814 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
|
815 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
|
816 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
|
817 } |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
818 |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
819 src_x = s->mb_x * 16 + (mx >> 2); |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
820 src_y = s->mb_y * 16 + (my >> 2); |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
821 uvsrc_x = s->mb_x * 8 + (uvmx >> 2); |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
822 uvsrc_y = s->mb_y * 8 + (uvmy >> 2); |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
823 |
| 4681 | 824 if(v->profile != PROFILE_ADVANCED){ |
| 825 src_x = av_clip( src_x, -16, s->mb_width * 16); | |
| 826 src_y = av_clip( src_y, -16, s->mb_height * 16); | |
| 827 uvsrc_x = av_clip(uvsrc_x, -8, s->mb_width * 8); | |
| 828 uvsrc_y = av_clip(uvsrc_y, -8, s->mb_height * 8); | |
| 829 }else{ | |
| 830 src_x = av_clip( src_x, -17, s->avctx->coded_width); | |
| 831 src_y = av_clip( src_y, -18, s->avctx->coded_height + 1); | |
| 832 uvsrc_x = av_clip(uvsrc_x, -8, s->avctx->coded_width >> 1); | |
| 833 uvsrc_y = av_clip(uvsrc_y, -8, s->avctx->coded_height >> 1); | |
| 834 } | |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
835 |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
836 srcY += src_y * s->linesize + src_x; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
837 srcU += uvsrc_y * s->uvlinesize + uvsrc_x; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
838 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
|
839 |
| 3521 | 840 /* for grayscale we should not try to read from unknown area */ |
| 841 if(s->flags & CODEC_FLAG_GRAY) { | |
| 842 srcU = s->edge_emu_buffer + 18 * s->linesize; | |
| 843 srcV = s->edge_emu_buffer + 18 * s->linesize; | |
| 844 } | |
| 845 | |
| 3522 | 846 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
|
847 || (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
|
848 || (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
|
849 uint8_t *uvbuf= s->edge_emu_buffer + 19 * s->linesize; |
| 3359 | 850 |
|
3528
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
851 srcY -= s->mspel * (1 + s->linesize); |
|
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
852 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
|
853 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
|
854 srcY = s->edge_emu_buffer; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
855 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
|
856 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
|
857 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
|
858 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
|
859 srcU = uvbuf; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
860 srcV = uvbuf + 16; |
| 3522 | 861 /* if we deal with range reduction we need to scale source blocks */ |
| 862 if(v->rangeredfrm) { | |
| 863 int i, j; | |
| 864 uint8_t *src, *src2; | |
| 865 | |
| 866 src = srcY; | |
|
3528
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
867 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
|
868 for(i = 0; i < 17 + s->mspel*2; i++) src[i] = ((src[i] - 128) >> 1) + 128; |
| 3522 | 869 src += s->linesize; |
| 870 } | |
| 871 src = srcU; src2 = srcV; | |
| 872 for(j = 0; j < 9; j++) { | |
| 873 for(i = 0; i < 9; i++) { | |
| 874 src[i] = ((src[i] - 128) >> 1) + 128; | |
| 875 src2[i] = ((src2[i] - 128) >> 1) + 128; | |
| 876 } | |
| 877 src += s->uvlinesize; | |
| 878 src2 += s->uvlinesize; | |
| 879 } | |
| 880 } | |
| 3406 | 881 /* if we deal with intensity compensation we need to scale source blocks */ |
| 882 if(v->mv_mode == MV_PMODE_INTENSITY_COMP) { | |
| 883 int i, j; | |
| 884 uint8_t *src, *src2; | |
| 885 | |
| 886 src = srcY; | |
|
3528
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
887 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
|
888 for(i = 0; i < 17 + s->mspel*2; i++) src[i] = v->luty[src[i]]; |
| 3406 | 889 src += s->linesize; |
| 890 } | |
| 891 src = srcU; src2 = srcV; | |
| 892 for(j = 0; j < 9; j++) { | |
| 893 for(i = 0; i < 9; i++) { | |
| 894 src[i] = v->lutuv[src[i]]; | |
| 895 src2[i] = v->lutuv[src2[i]]; | |
| 896 } | |
| 897 src += s->uvlinesize; | |
| 898 src2 += s->uvlinesize; | |
| 899 } | |
| 900 } | |
|
3528
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
901 srcY += s->mspel * (1 + s->linesize); |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
902 } |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
903 |
|
3528
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
904 if(s->mspel) { |
|
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
905 dxy = ((my & 3) << 2) | (mx & 3); |
|
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
906 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
|
907 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
|
908 srcY += s->linesize * 8; |
|
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
909 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
|
910 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
|
911 } else { // hpel mc - always used for luma |
|
565d9ddd8eb3
Motion compensation for luma always use halfpel precision.
kostya
parents:
3573
diff
changeset
|
912 dxy = (my & 2) | ((mx & 2) >> 1); |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
913 |
| 3474 | 914 if(!v->rnd) |
| 915 dsp->put_pixels_tab[0][dxy](s->dest[0], srcY, s->linesize, 16); | |
| 916 else | |
| 917 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
|
918 } |
| 3521 | 919 |
| 920 if(s->flags & CODEC_FLAG_GRAY) return; | |
| 3655 | 921 /* Chroma MC always uses qpel bilinear */ |
| 3474 | 922 uvdxy = ((uvmy & 3) << 2) | (uvmx & 3); |
|
3664
de842f000384
Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents:
3656
diff
changeset
|
923 uvmx = (uvmx&3)<<1; |
|
de842f000384
Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents:
3656
diff
changeset
|
924 uvmy = (uvmy&3)<<1; |
|
de842f000384
Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents:
3656
diff
changeset
|
925 if(!v->rnd){ |
|
de842f000384
Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents:
3656
diff
changeset
|
926 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
|
927 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
|
928 }else{ |
|
de842f000384
Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents:
3656
diff
changeset
|
929 dsp->put_no_rnd_h264_chroma_pixels_tab[0](s->dest[1], srcU, s->uvlinesize, 8, uvmx, uvmy); |
|
de842f000384
Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents:
3656
diff
changeset
|
930 dsp->put_no_rnd_h264_chroma_pixels_tab[0](s->dest[2], srcV, s->uvlinesize, 8, uvmx, uvmy); |
|
de842f000384
Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents:
3656
diff
changeset
|
931 } |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
932 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
933 |
| 3396 | 934 /** Do motion compensation for 4-MV macroblock - luminance block |
| 935 */ | |
| 936 static void vc1_mc_4mv_luma(VC1Context *v, int n) | |
| 937 { | |
| 938 MpegEncContext *s = &v->s; | |
| 939 DSPContext *dsp = &v->s.dsp; | |
| 940 uint8_t *srcY; | |
| 941 int dxy, mx, my, src_x, src_y; | |
| 942 int off; | |
| 943 | |
| 944 if(!v->s.last_picture.data[0])return; | |
| 945 mx = s->mv[0][n][0]; | |
| 946 my = s->mv[0][n][1]; | |
| 947 srcY = s->last_picture.data[0]; | |
| 948 | |
| 949 off = s->linesize * 4 * (n&2) + (n&1) * 8; | |
| 950 | |
| 951 src_x = s->mb_x * 16 + (n&1) * 8 + (mx >> 2); | |
| 952 src_y = s->mb_y * 16 + (n&2) * 4 + (my >> 2); | |
| 953 | |
| 4681 | 954 if(v->profile != PROFILE_ADVANCED){ |
| 955 src_x = av_clip( src_x, -16, s->mb_width * 16); | |
| 956 src_y = av_clip( src_y, -16, s->mb_height * 16); | |
| 957 }else{ | |
| 958 src_x = av_clip( src_x, -17, s->avctx->coded_width); | |
| 959 src_y = av_clip( src_y, -18, s->avctx->coded_height + 1); | |
| 960 } | |
| 3396 | 961 |
| 962 srcY += src_y * s->linesize + src_x; | |
| 963 | |
|
3548
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
964 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
|
965 || (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
|
966 || (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
|
967 srcY -= s->mspel * (1 + s->linesize); |
|
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
968 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
|
969 src_x - s->mspel, src_y - s->mspel, s->h_edge_pos, s->v_edge_pos); |
| 3396 | 970 srcY = s->edge_emu_buffer; |
| 3522 | 971 /* if we deal with range reduction we need to scale source blocks */ |
| 972 if(v->rangeredfrm) { | |
| 973 int i, j; | |
| 974 uint8_t *src; | |
| 975 | |
| 976 src = srcY; | |
|
3528
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
977 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
|
978 for(i = 0; i < 9 + s->mspel*2; i++) src[i] = ((src[i] - 128) >> 1) + 128; |
| 3522 | 979 src += s->linesize; |
| 980 } | |
| 981 } | |
|
3548
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
982 /* 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
|
983 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
|
984 int i, j; |
|
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
985 uint8_t *src; |
|
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
986 |
|
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
987 src = srcY; |
|
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
988 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
|
989 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
|
990 src += s->linesize; |
|
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
991 } |
|
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
992 } |
|
3528
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
993 srcY += s->mspel * (1 + s->linesize); |
| 3396 | 994 } |
| 995 | |
|
3528
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
996 if(s->mspel) { |
|
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
997 dxy = ((my & 3) << 2) | (mx & 3); |
|
79ad5cd43686
Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents:
3527
diff
changeset
|
998 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
|
999 } else { // hpel mc - always used for luma |
|
565d9ddd8eb3
Motion compensation for luma always use halfpel precision.
kostya
parents:
3573
diff
changeset
|
1000 dxy = (my & 2) | ((mx & 2) >> 1); |
| 3474 | 1001 if(!v->rnd) |
| 1002 dsp->put_pixels_tab[1][dxy](s->dest[0] + off, srcY, s->linesize, 8); | |
| 1003 else | |
| 1004 dsp->put_no_rnd_pixels_tab[1][dxy](s->dest[0] + off, srcY, s->linesize, 8); | |
| 3396 | 1005 } |
| 1006 } | |
| 1007 | |
| 1008 static inline int median4(int a, int b, int c, int d) | |
| 1009 { | |
| 3404 | 1010 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
|
1011 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
|
1012 else return (FFMIN(b, c) + FFMAX(a, d)) / 2; |
| 3404 | 1013 } 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
|
1014 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
|
1015 else return (FFMIN(a, c) + FFMAX(b, d)) / 2; |
| 3404 | 1016 } |
| 3396 | 1017 } |
| 1018 | |
| 1019 | |
| 1020 /** Do motion compensation for 4-MV macroblock - both chroma blocks | |
| 1021 */ | |
| 1022 static void vc1_mc_4mv_chroma(VC1Context *v) | |
| 1023 { | |
| 1024 MpegEncContext *s = &v->s; | |
| 1025 DSPContext *dsp = &v->s.dsp; | |
| 1026 uint8_t *srcU, *srcV; | |
| 1027 int uvdxy, uvmx, uvmy, uvsrc_x, uvsrc_y; | |
| 1028 int i, idx, tx = 0, ty = 0; | |
| 1029 int mvx[4], mvy[4], intra[4]; | |
| 1030 static const int count[16] = { 0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4}; | |
| 1031 | |
| 1032 if(!v->s.last_picture.data[0])return; | |
| 3521 | 1033 if(s->flags & CODEC_FLAG_GRAY) return; |
| 3396 | 1034 |
| 1035 for(i = 0; i < 4; i++) { | |
| 1036 mvx[i] = s->mv[0][i][0]; | |
| 1037 mvy[i] = s->mv[0][i][1]; | |
| 1038 intra[i] = v->mb_type[0][s->block_index[i]]; | |
| 1039 } | |
| 1040 | |
| 1041 /* calculate chroma MV vector from four luma MVs */ | |
| 3419 | 1042 idx = (intra[3] << 3) | (intra[2] << 2) | (intra[1] << 1) | intra[0]; |
| 3396 | 1043 if(!idx) { // all blocks are inter |
| 1044 tx = median4(mvx[0], mvx[1], mvx[2], mvx[3]); | |
| 1045 ty = median4(mvy[0], mvy[1], mvy[2], mvy[3]); | |
| 1046 } else if(count[idx] == 1) { // 3 inter blocks | |
| 1047 switch(idx) { | |
| 1048 case 0x1: | |
| 1049 tx = mid_pred(mvx[1], mvx[2], mvx[3]); | |
| 3419 | 1050 ty = mid_pred(mvy[1], mvy[2], mvy[3]); |
| 3396 | 1051 break; |
| 1052 case 0x2: | |
| 1053 tx = mid_pred(mvx[0], mvx[2], mvx[3]); | |
| 3419 | 1054 ty = mid_pred(mvy[0], mvy[2], mvy[3]); |
| 3396 | 1055 break; |
| 1056 case 0x4: | |
| 1057 tx = mid_pred(mvx[0], mvx[1], mvx[3]); | |
| 3419 | 1058 ty = mid_pred(mvy[0], mvy[1], mvy[3]); |
| 3396 | 1059 break; |
| 1060 case 0x8: | |
| 1061 tx = mid_pred(mvx[0], mvx[1], mvx[2]); | |
| 3419 | 1062 ty = mid_pred(mvy[0], mvy[1], mvy[2]); |
| 3396 | 1063 break; |
| 1064 } | |
| 1065 } else if(count[idx] == 2) { | |
| 1066 int t1 = 0, t2 = 0; | |
| 1067 for(i=0; i<3;i++) if(!intra[i]) {t1 = i; break;} | |
| 1068 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
|
1069 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
|
1070 ty = (mvy[t1] + mvy[t2]) / 2; |
| 4683 | 1071 } else { |
| 1072 s->current_picture.motion_val[1][s->block_index[0]][0] = 0; | |
| 1073 s->current_picture.motion_val[1][s->block_index[0]][1] = 0; | |
| 3396 | 1074 return; //no need to do MC for inter blocks |
| 4683 | 1075 } |
| 3396 | 1076 |
| 3689 | 1077 s->current_picture.motion_val[1][s->block_index[0]][0] = tx; |
| 1078 s->current_picture.motion_val[1][s->block_index[0]][1] = ty; | |
| 3396 | 1079 uvmx = (tx + ((tx&3) == 3)) >> 1; |
| 1080 uvmy = (ty + ((ty&3) == 3)) >> 1; | |
|
4258
4d2f162506e3
10e6l FastUVMC was done right but in the wrong place
kostya
parents:
4247
diff
changeset
|
1081 if(v->fastuvmc) { |
|
4d2f162506e3
10e6l FastUVMC was done right but in the wrong place
kostya
parents:
4247
diff
changeset
|
1082 uvmx = uvmx + ((uvmx<0)?(uvmx&1):-(uvmx&1)); |
|
4d2f162506e3
10e6l FastUVMC was done right but in the wrong place
kostya
parents:
4247
diff
changeset
|
1083 uvmy = uvmy + ((uvmy<0)?(uvmy&1):-(uvmy&1)); |
|
4d2f162506e3
10e6l FastUVMC was done right but in the wrong place
kostya
parents:
4247
diff
changeset
|
1084 } |
| 3396 | 1085 |
| 1086 uvsrc_x = s->mb_x * 8 + (uvmx >> 2); | |
| 1087 uvsrc_y = s->mb_y * 8 + (uvmy >> 2); | |
| 1088 | |
| 4681 | 1089 if(v->profile != PROFILE_ADVANCED){ |
| 1090 uvsrc_x = av_clip(uvsrc_x, -8, s->mb_width * 8); | |
| 1091 uvsrc_y = av_clip(uvsrc_y, -8, s->mb_height * 8); | |
| 1092 }else{ | |
| 1093 uvsrc_x = av_clip(uvsrc_x, -8, s->avctx->coded_width >> 1); | |
| 1094 uvsrc_y = av_clip(uvsrc_y, -8, s->avctx->coded_height >> 1); | |
| 1095 } | |
| 4680 | 1096 |
| 3396 | 1097 srcU = s->last_picture.data[1] + uvsrc_y * s->uvlinesize + uvsrc_x; |
| 1098 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
|
1099 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
|
1100 || (unsigned)uvsrc_x > (s->h_edge_pos >> 1) - 9 |
| 3511 | 1101 || (unsigned)uvsrc_y > (s->v_edge_pos >> 1) - 9){ |
| 3396 | 1102 ff_emulated_edge_mc(s->edge_emu_buffer , srcU, s->uvlinesize, 8+1, 8+1, |
| 1103 uvsrc_x, uvsrc_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1); | |
| 1104 ff_emulated_edge_mc(s->edge_emu_buffer + 16, srcV, s->uvlinesize, 8+1, 8+1, | |
| 1105 uvsrc_x, uvsrc_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1); | |
| 1106 srcU = s->edge_emu_buffer; | |
| 1107 srcV = s->edge_emu_buffer + 16; | |
| 3522 | 1108 |
| 1109 /* if we deal with range reduction we need to scale source blocks */ | |
| 1110 if(v->rangeredfrm) { | |
| 1111 int i, j; | |
| 1112 uint8_t *src, *src2; | |
| 1113 | |
| 1114 src = srcU; src2 = srcV; | |
| 1115 for(j = 0; j < 9; j++) { | |
| 1116 for(i = 0; i < 9; i++) { | |
| 1117 src[i] = ((src[i] - 128) >> 1) + 128; | |
| 1118 src2[i] = ((src2[i] - 128) >> 1) + 128; | |
| 1119 } | |
| 1120 src += s->uvlinesize; | |
| 1121 src2 += s->uvlinesize; | |
| 1122 } | |
| 1123 } | |
|
3548
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
1124 /* 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
|
1125 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
|
1126 int i, j; |
|
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
1127 uint8_t *src, *src2; |
|
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
1128 |
|
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
1129 src = srcU; src2 = srcV; |
|
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
1130 for(j = 0; j < 9; j++) { |
|
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
1131 for(i = 0; i < 9; i++) { |
|
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
1132 src[i] = v->lutuv[src[i]]; |
|
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
1133 src2[i] = v->lutuv[src2[i]]; |
|
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
1134 } |
|
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
1135 src += s->uvlinesize; |
|
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
1136 src2 += s->uvlinesize; |
|
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
1137 } |
|
f7b09917c680
100l: intensity compensation must be also done in 4-MV mode
kostya
parents:
3538
diff
changeset
|
1138 } |
| 3396 | 1139 } |
| 1140 | |
| 3655 | 1141 /* Chroma MC always uses qpel bilinear */ |
| 3474 | 1142 uvdxy = ((uvmy & 3) << 2) | (uvmx & 3); |
|
3664
de842f000384
Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents:
3656
diff
changeset
|
1143 uvmx = (uvmx&3)<<1; |
|
de842f000384
Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents:
3656
diff
changeset
|
1144 uvmy = (uvmy&3)<<1; |
|
de842f000384
Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents:
3656
diff
changeset
|
1145 if(!v->rnd){ |
|
de842f000384
Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents:
3656
diff
changeset
|
1146 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
|
1147 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
|
1148 }else{ |
|
de842f000384
Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents:
3656
diff
changeset
|
1149 dsp->put_no_rnd_h264_chroma_pixels_tab[0](s->dest[1], srcU, s->uvlinesize, 8, uvmx, uvmy); |
|
de842f000384
Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents:
3656
diff
changeset
|
1150 dsp->put_no_rnd_h264_chroma_pixels_tab[0](s->dest[2], srcV, s->uvlinesize, 8, uvmx, uvmy); |
|
de842f000384
Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents:
3656
diff
changeset
|
1151 } |
| 3396 | 1152 } |
| 1153 | |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1154 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
|
1155 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1156 /** |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1157 * Decode Simple/Main Profiles sequence header |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1158 * @see Figure 7-8, p16-17 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1159 * @param avctx Codec context |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1160 * @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
|
1161 * @return Status |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1162 */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1163 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
|
1164 { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1165 VC1Context *v = avctx->priv_data; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1166 |
| 3692 | 1167 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
|
1168 v->profile = get_bits(gb, 2); |
| 4604 | 1169 if (v->profile == PROFILE_COMPLEX) |
| 3359 | 1170 { |
| 4604 | 1171 av_log(avctx, AV_LOG_ERROR, "WMV3 Complex Profile is not fully supported\n"); |
| 3359 | 1172 } |
| 1173 | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1174 if (v->profile == PROFILE_ADVANCED) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1175 { |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1176 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
|
1177 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1178 else |
| 3359 | 1179 { |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1180 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
|
1181 if (v->res_sm) |
| 3359 | 1182 { |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1183 av_log(avctx, AV_LOG_ERROR, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1184 "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
|
1185 return -1; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1186 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1187 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1188 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1189 // (fps-2)/4 (->30) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1190 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
|
1191 // (bitrate-32kbps)/64kbps |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1192 v->bitrtq_postproc = get_bits(gb, 5); //common |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1193 v->s.loop_filter = get_bits(gb, 1); //common |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1194 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
|
1195 { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1196 av_log(avctx, AV_LOG_ERROR, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1197 "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
|
1198 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1199 |
|
3691
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
1200 v->res_x8 = get_bits(gb, 1); //reserved |
|
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
1201 if (v->res_x8) |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1202 { |
|
3691
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
1203 av_log(avctx, AV_LOG_ERROR, |
|
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
1204 "1 for reserved RES_X8 is forbidden\n"); |
|
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
1205 //return -1; |
|
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
1206 } |
|
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
1207 v->multires = get_bits(gb, 1); |
|
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
1208 v->res_fasttx = get_bits(gb, 1); |
|
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
1209 if (!v->res_fasttx) |
|
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
1210 { |
|
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
1211 av_log(avctx, AV_LOG_ERROR, |
|
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
1212 "0 for reserved RES_FASTTX is forbidden\n"); |
|
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
1213 //return -1; |
| 3359 | 1214 } |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1215 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1216 v->fastuvmc = get_bits(gb, 1); //common |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1217 if (!v->profile && !v->fastuvmc) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1218 { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1219 av_log(avctx, AV_LOG_ERROR, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1220 "FASTUVMC unavailable in Simple Profile\n"); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1221 return -1; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1222 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1223 v->extended_mv = get_bits(gb, 1); //common |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1224 if (!v->profile && v->extended_mv) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1225 { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1226 av_log(avctx, AV_LOG_ERROR, |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1227 "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
|
1228 return -1; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1229 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1230 v->dquant = get_bits(gb, 2); //common |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1231 v->vstransform = get_bits(gb, 1); //common |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1232 |
|
3691
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
1233 v->res_transtab = get_bits(gb, 1); |
|
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
1234 if (v->res_transtab) |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1235 { |
|
3691
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
1236 av_log(avctx, AV_LOG_ERROR, |
|
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
1237 "1 for reserved RES_TRANSTAB is forbidden\n"); |
|
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
1238 return -1; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1239 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1240 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1241 v->overlap = get_bits(gb, 1); //common |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1242 |
|
3691
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
1243 v->s.resync_marker = get_bits(gb, 1); |
|
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
1244 v->rangered = get_bits(gb, 1); |
|
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
1245 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
|
1246 { |
|
3691
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
1247 av_log(avctx, AV_LOG_INFO, |
|
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
1248 "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
|
1249 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1250 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1251 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
|
1252 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
|
1253 |
|
3691
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
1254 v->finterpflag = get_bits(gb, 1); //common |
|
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
1255 v->res_rtm_flag = get_bits(gb, 1); //reserved |
|
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
1256 if (!v->res_rtm_flag) |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1257 { |
|
3538
f26bf13bbb69
Don't try to decode P-frames from old WMV3 variant until their format is figured
kostya
parents:
3528
diff
changeset
|
1258 // 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
|
1259 // "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
|
1260 av_log(avctx, AV_LOG_ERROR, |
|
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
1261 "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
|
1262 //return -1; |
|
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
1263 } |
| 4742 | 1264 //TODO: figure out what they mean (always 0x402F) |
| 1265 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
|
1266 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
|
1267 "Profile %i:\nfrmrtq_postproc=%i, bitrtq_postproc=%i\n" |
| 3457 | 1268 "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
|
1269 "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
|
1270 "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
|
1271 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
|
1272 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
|
1273 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
|
1274 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
|
1275 ); |
|
3691
ff18ceefe3d8
[Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents:
3690
diff
changeset
|
1276 return 0; |
| 3359 | 1277 } |
| 1278 | |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1279 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
|
1280 { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1281 v->res_rtm_flag = 1; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1282 v->level = get_bits(gb, 3); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1283 if(v->level >= 5) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1284 { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1285 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
|
1286 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1287 v->chromaformat = get_bits(gb, 2); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1288 if (v->chromaformat != 1) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1289 { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1290 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
|
1291 "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
|
1292 return -1; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1293 } |
|
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 // (fps-2)/4 (->30) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1296 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
|
1297 // (bitrate-32kbps)/64kbps |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1298 v->bitrtq_postproc = get_bits(gb, 5); //common |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1299 v->postprocflag = get_bits(gb, 1); //common |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1300 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1301 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
|
1302 v->s.avctx->coded_height = (get_bits(gb, 12) + 1) << 1; |
| 4474 | 1303 v->s.avctx->width = v->s.avctx->coded_width; |
| 1304 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
|
1305 v->broadcast = get_bits1(gb); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1306 v->interlace = get_bits1(gb); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1307 v->tfcntrflag = get_bits1(gb); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1308 v->finterpflag = get_bits1(gb); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1309 get_bits1(gb); // reserved |
| 4402 | 1310 |
| 4680 | 1311 v->s.h_edge_pos = v->s.avctx->coded_width; |
| 1312 v->s.v_edge_pos = v->s.avctx->coded_height; | |
| 1313 | |
| 4402 | 1314 av_log(v->s.avctx, AV_LOG_DEBUG, |
| 1315 "Advanced Profile level %i:\nfrmrtq_postproc=%i, bitrtq_postproc=%i\n" | |
| 1316 "LoopFilter=%i, ChromaFormat=%i, Pulldown=%i, Interlace: %i\n" | |
| 1317 "TFCTRflag=%i, FINTERPflag=%i\n", | |
| 1318 v->level, v->frmrtq_postproc, v->bitrtq_postproc, | |
| 1319 v->s.loop_filter, v->chromaformat, v->broadcast, v->interlace, | |
| 1320 v->tfcntrflag, v->finterpflag | |
| 1321 ); | |
| 1322 | |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1323 v->psf = get_bits1(gb); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1324 if(v->psf) { //PsF, 6.1.13 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1325 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
|
1326 return -1; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1327 } |
|
4486
1d2320afa864
B-frames could not be determined from broken_link/closed_entry, use fixed value
kostya
parents:
4485
diff
changeset
|
1328 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
|
1329 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
|
1330 int w, h, ar = 0; |
| 4467 | 1331 av_log(v->s.avctx, AV_LOG_DEBUG, "Display extended info:\n"); |
| 4466 | 1332 v->s.avctx->width = v->s.width = w = get_bits(gb, 14) + 1; |
| 1333 v->s.avctx->height = v->s.height = h = get_bits(gb, 14) + 1; | |
| 4467 | 1334 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
|
1335 if(get_bits1(gb)) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1336 ar = get_bits(gb, 4); |
| 4414 | 1337 if(ar && ar < 14){ |
| 1338 v->s.avctx->sample_aspect_ratio = vc1_pixel_aspect[ar]; | |
| 1339 }else if(ar == 15){ | |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1340 w = get_bits(gb, 8); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1341 h = get_bits(gb, 8); |
| 4414 | 1342 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
|
1343 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1344 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1345 if(get_bits1(gb)){ //framerate stuff |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1346 if(get_bits1(gb)) { |
| 4470 | 1347 v->s.avctx->time_base.num = 32; |
| 1348 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
|
1349 } else { |
| 4470 | 1350 int nr, dr; |
| 1351 nr = get_bits(gb, 8); | |
| 1352 dr = get_bits(gb, 4); | |
| 1353 if(nr && nr < 8 && dr && dr < 3){ | |
| 1354 v->s.avctx->time_base.num = fps_dr[dr - 1]; | |
| 1355 v->s.avctx->time_base.den = fps_nr[nr - 1] * 1000; | |
| 1356 } | |
|
3672
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 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1360 if(get_bits1(gb)){ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1361 v->color_prim = get_bits(gb, 8); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1362 v->transfer_char = get_bits(gb, 8); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1363 v->matrix_coef = get_bits(gb, 8); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1364 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1365 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1366 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1367 v->hrd_param_flag = get_bits1(gb); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1368 if(v->hrd_param_flag) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1369 int i; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1370 v->hrd_num_leaky_buckets = get_bits(gb, 5); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1371 get_bits(gb, 4); //bitrate exponent |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1372 get_bits(gb, 4); //buffer size exponent |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1373 for(i = 0; i < v->hrd_num_leaky_buckets; i++) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1374 get_bits(gb, 16); //hrd_rate[n] |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1375 get_bits(gb, 16); //hrd_buffer[n] |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1376 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1377 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1378 return 0; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1379 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1380 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1381 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
|
1382 { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1383 VC1Context *v = avctx->priv_data; |
|
4486
1d2320afa864
B-frames could not be determined from broken_link/closed_entry, use fixed value
kostya
parents:
4485
diff
changeset
|
1384 int i, blink, clentry, refdist; |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1385 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1386 av_log(avctx, AV_LOG_DEBUG, "Entry point: %08X\n", show_bits_long(gb, 32)); |
| 4402 | 1387 blink = get_bits1(gb); // broken link |
|
4486
1d2320afa864
B-frames could not be determined from broken_link/closed_entry, use fixed value
kostya
parents:
4485
diff
changeset
|
1388 clentry = get_bits1(gb); // closed entry |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1389 v->panscanflag = get_bits1(gb); |
| 4402 | 1390 refdist = get_bits1(gb); // refdist flag |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1391 v->s.loop_filter = get_bits1(gb); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1392 v->fastuvmc = get_bits1(gb); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1393 v->extended_mv = get_bits1(gb); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1394 v->dquant = get_bits(gb, 2); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1395 v->vstransform = get_bits1(gb); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1396 v->overlap = get_bits1(gb); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1397 v->quantizer_mode = get_bits(gb, 2); |
|
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->hrd_param_flag){ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1400 for(i = 0; i < v->hrd_num_leaky_buckets; i++) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1401 get_bits(gb, 8); //hrd_full[n] |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1402 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1403 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1404 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1405 if(get_bits1(gb)){ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1406 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
|
1407 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
|
1408 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1409 if(v->extended_mv) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1410 v->extended_dmv = get_bits1(gb); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1411 if(get_bits1(gb)) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1412 av_log(avctx, AV_LOG_ERROR, "Luma scaling is not supported, expect wrong picture\n"); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1413 skip_bits(gb, 3); // Y range, ignored for now |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1414 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1415 if(get_bits1(gb)) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1416 av_log(avctx, AV_LOG_ERROR, "Chroma scaling is not supported, expect wrong picture\n"); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1417 skip_bits(gb, 3); // UV range, ignored for now |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1418 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1419 |
| 4402 | 1420 av_log(avctx, AV_LOG_DEBUG, "Entry point info:\n" |
| 1421 "BrokenLink=%i, ClosedEntry=%i, PanscanFlag=%i\n" | |
| 1422 "RefDist=%i, Postproc=%i, FastUVMC=%i, ExtMV=%i\n" | |
| 1423 "DQuant=%i, VSTransform=%i, Overlap=%i, Qmode=%i\n", | |
|
4486
1d2320afa864
B-frames could not be determined from broken_link/closed_entry, use fixed value
kostya
parents:
4485
diff
changeset
|
1424 blink, clentry, v->panscanflag, refdist, v->s.loop_filter, |
| 4402 | 1425 v->fastuvmc, v->extended_mv, v->dquant, v->vstransform, v->overlap, v->quantizer_mode); |
| 1426 | |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1427 return 0; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1428 } |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1429 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1430 static int vc1_parse_frame_header(VC1Context *v, GetBitContext* gb) |
| 3359 | 1431 { |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1432 int pqindex, lowquant, status; |
| 3359 | 1433 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1434 if(v->finterpflag) v->interpfrm = get_bits(gb, 1); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1435 skip_bits(gb, 2); //framecnt unused |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1436 v->rangeredfrm = 0; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1437 if (v->rangered) v->rangeredfrm = get_bits(gb, 1); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1438 v->s.pict_type = get_bits(gb, 1); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1439 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
|
1440 if (!v->s.pict_type) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1441 if (get_bits(gb, 1)) v->s.pict_type = I_TYPE; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1442 else v->s.pict_type = B_TYPE; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1443 } else v->s.pict_type = P_TYPE; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1444 } else v->s.pict_type = v->s.pict_type ? P_TYPE : I_TYPE; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1445 |
| 3689 | 1446 v->bi_type = 0; |
|
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1447 if(v->s.pict_type == B_TYPE) { |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1448 v->bfraction = get_vlc2(gb, vc1_bfraction_vlc.table, VC1_BFRACTION_VLC_BITS, 1); |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1449 v->bfraction = vc1_bfraction_lut[v->bfraction]; |
| 3689 | 1450 if(v->bfraction == 0) { |
|
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1451 v->s.pict_type = BI_TYPE; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1452 } |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1453 } |
| 3689 | 1454 if(v->s.pict_type == I_TYPE || v->s.pict_type == BI_TYPE) |
| 1455 get_bits(gb, 7); // skip buffer fullness | |
| 3359 | 1456 |
| 3474 | 1457 /* calculate RND */ |
| 3689 | 1458 if(v->s.pict_type == I_TYPE || v->s.pict_type == BI_TYPE) |
| 3474 | 1459 v->rnd = 1; |
| 1460 if(v->s.pict_type == P_TYPE) | |
| 1461 v->rnd ^= 1; | |
| 1462 | |
| 3359 | 1463 /* Quantizer stuff */ |
| 1464 pqindex = get_bits(gb, 5); | |
| 1465 if (v->quantizer_mode == QUANT_FRAME_IMPLICIT) | |
| 1466 v->pq = pquant_table[0][pqindex]; | |
| 1467 else | |
|
3506
e0996476198b
Set correctly quantizer and transform mode when parsing frame header.
kostya
parents:
3476
diff
changeset
|
1468 v->pq = pquant_table[1][pqindex]; |
| 3359 | 1469 |
| 3475 | 1470 v->pquantizer = 1; |
| 3359 | 1471 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
|
1472 v->pquantizer = pqindex < 9; |
| 3475 | 1473 if (v->quantizer_mode == QUANT_NON_UNIFORM) |
| 1474 v->pquantizer = 0; | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1475 v->pqindex = pqindex; |
| 3359 | 1476 if (pqindex < 9) v->halfpq = get_bits(gb, 1); |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1477 else v->halfpq = 0; |
| 3359 | 1478 if (v->quantizer_mode == QUANT_FRAME_EXPLICIT) |
| 1479 v->pquantizer = get_bits(gb, 1); | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1480 v->dquantfrm = 0; |
|
3452
f024ca7c768b
MVRANGE may occur in all frames and RESPIC in all but B-frames
kostya
parents:
3451
diff
changeset
|
1481 if (v->extended_mv == 1) v->mvrange = get_prefix(gb, 0, 3); |
|
f024ca7c768b
MVRANGE may occur in all frames and RESPIC in all but B-frames
kostya
parents:
3451
diff
changeset
|
1482 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
|
1483 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
|
1484 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
|
1485 v->range_y = 1 << (v->k_y - 1); |
|
f024ca7c768b
MVRANGE may occur in all frames and RESPIC in all but B-frames
kostya
parents:
3451
diff
changeset
|
1486 if (v->profile == PROFILE_ADVANCED) |
|
f024ca7c768b
MVRANGE may occur in all frames and RESPIC in all but B-frames
kostya
parents:
3451
diff
changeset
|
1487 { |
|
f024ca7c768b
MVRANGE may occur in all frames and RESPIC in all but B-frames
kostya
parents:
3451
diff
changeset
|
1488 if (v->postprocflag) v->postproc = get_bits(gb, 1); |
|
f024ca7c768b
MVRANGE may occur in all frames and RESPIC in all but B-frames
kostya
parents:
3451
diff
changeset
|
1489 } |
|
f024ca7c768b
MVRANGE may occur in all frames and RESPIC in all but B-frames
kostya
parents:
3451
diff
changeset
|
1490 else |
|
f024ca7c768b
MVRANGE may occur in all frames and RESPIC in all but B-frames
kostya
parents:
3451
diff
changeset
|
1491 if (v->multires && v->s.pict_type != B_TYPE) v->respic = get_bits(gb, 2); |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1492 |
| 4604 | 1493 if(v->res_x8 && (v->s.pict_type == I_TYPE || v->s.pict_type == BI_TYPE)){ |
| 1494 if(get_bits1(gb))return -1; | |
| 1495 } | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1496 //av_log(v->s.avctx, AV_LOG_INFO, "%c Frame: QP=[%i]%i (+%i/2) %i\n", |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1497 // (v->s.pict_type == P_TYPE) ? 'P' : ((v->s.pict_type == I_TYPE) ? 'I' : 'B'), pqindex, v->pq, v->halfpq, v->rangeredfrm); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1498 |
|
3744
805aee1f7cce
For B-frames if the second reference frame signals intensity compensation
kostya
parents:
3743
diff
changeset
|
1499 if(v->s.pict_type == I_TYPE || v->s.pict_type == P_TYPE) v->use_ic = 0; |
|
805aee1f7cce
For B-frames if the second reference frame signals intensity compensation
kostya
parents:
3743
diff
changeset
|
1500 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1501 switch(v->s.pict_type) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1502 case P_TYPE: |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1503 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
|
1504 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
|
1505 else v->tt_index = 2; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1506 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1507 lowquant = (v->pq > 12) ? 0 : 1; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1508 v->mv_mode = mv_pmode_table[lowquant][get_prefix(gb, 1, 4)]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1509 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
|
1510 { |
| 3406 | 1511 int scale, shift, i; |
| 1512 v->mv_mode2 = mv_pmode_table2[lowquant][get_prefix(gb, 1, 3)]; | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1513 v->lumscale = get_bits(gb, 6); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1514 v->lumshift = get_bits(gb, 6); |
|
3744
805aee1f7cce
For B-frames if the second reference frame signals intensity compensation
kostya
parents:
3743
diff
changeset
|
1515 v->use_ic = 1; |
| 3406 | 1516 /* fill lookup tables for intensity compensation */ |
| 1517 if(!v->lumscale) { | |
| 1518 scale = -64; | |
| 1519 shift = (255 - v->lumshift * 2) << 6; | |
| 1520 if(v->lumshift > 31) | |
| 1521 shift += 128 << 6; | |
| 1522 } else { | |
| 1523 scale = v->lumscale + 32; | |
| 1524 if(v->lumshift > 31) | |
| 1525 shift = (v->lumshift - 64) << 6; | |
| 1526 else | |
| 1527 shift = v->lumshift << 6; | |
| 1528 } | |
| 1529 for(i = 0; i < 256; i++) { | |
| 4594 | 1530 v->luty[i] = av_clip_uint8((scale * i + shift + 32) >> 6); |
| 1531 v->lutuv[i] = av_clip_uint8((scale * (i - 128) + 128*64 + 32) >> 6); | |
| 3406 | 1532 } |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1533 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1534 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
|
1535 v->s.quarter_sample = 0; |
| 3401 | 1536 else if(v->mv_mode == MV_PMODE_INTENSITY_COMP) { |
| 1537 if(v->mv_mode2 == MV_PMODE_1MV_HPEL || v->mv_mode2 == MV_PMODE_1MV_HPEL_BILIN) | |
| 1538 v->s.quarter_sample = 0; | |
| 1539 else | |
| 1540 v->s.quarter_sample = 1; | |
| 1541 } else | |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
1542 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
|
1543 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 | 1544 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1545 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
|
1546 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
|
1547 || 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
|
1548 { |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
1549 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
|
1550 if (status < 0) return -1; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1551 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
|
1552 "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
|
1553 } else { |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
1554 v->mv_type_is_raw = 0; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
1555 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
|
1556 } |
|
3375
a1c2e1603be9
Use MpegEncContext->mbskip_table instead of custom bitplane.
kostya
parents:
3371
diff
changeset
|
1557 status = bitplane_decoding(v->s.mbskip_table, &v->skip_is_raw, v); |
| 3359 | 1558 if (status < 0) return -1; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1559 av_log(v->s.avctx, AV_LOG_DEBUG, "MB Skip plane encoding: " |
| 3359 | 1560 "Imode: %i, Invert: %i\n", status>>1, status&1); |
| 1561 | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1562 /* Hopefully this is correct for P frames */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1563 v->s.mv_table_index = get_bits(gb, 2); //but using vc1_ tables |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1564 v->cbpcy_vlc = &vc1_cbpcy_p_vlc[get_bits(gb, 2)]; |
| 3359 | 1565 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1566 if (v->dquant) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1567 { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1568 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
|
1569 vop_dquant_decoding(v); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1570 } |
| 3359 | 1571 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1572 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
|
1573 if (v->vstransform) |
| 3359 | 1574 { |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1575 v->ttmbf = get_bits(gb, 1); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1576 if (v->ttmbf) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1577 { |
|
3405
58c4fd135462
Correctly choose global transform mode, MV mode and fix bitplane decoding
kostya
parents:
3404
diff
changeset
|
1578 v->ttfrm = ttfrm_to_tt[get_bits(gb, 2)]; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1579 } |
|
3506
e0996476198b
Set correctly quantizer and transform mode when parsing frame header.
kostya
parents:
3476
diff
changeset
|
1580 } else { |
|
e0996476198b
Set correctly quantizer and transform mode when parsing frame header.
kostya
parents:
3476
diff
changeset
|
1581 v->ttmbf = 1; |
|
e0996476198b
Set correctly quantizer and transform mode when parsing frame header.
kostya
parents:
3476
diff
changeset
|
1582 v->ttfrm = TT_8X8; |
| 3359 | 1583 } |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1584 break; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1585 case B_TYPE: |
|
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1586 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
|
1587 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
|
1588 else v->tt_index = 2; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1589 |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1590 lowquant = (v->pq > 12) ? 0 : 1; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1591 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
|
1592 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
|
1593 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
|
1594 |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1595 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
|
1596 if (status < 0) return -1; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1597 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
|
1598 "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
|
1599 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
|
1600 if (status < 0) return -1; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1601 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
|
1602 "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
|
1603 |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1604 v->s.mv_table_index = get_bits(gb, 2); |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1605 v->cbpcy_vlc = &vc1_cbpcy_p_vlc[get_bits(gb, 2)]; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1606 |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1607 if (v->dquant) |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1608 { |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1609 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
|
1610 vop_dquant_decoding(v); |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1611 } |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1612 |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1613 v->ttfrm = 0; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1614 if (v->vstransform) |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1615 { |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1616 v->ttmbf = get_bits(gb, 1); |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1617 if (v->ttmbf) |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1618 { |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1619 v->ttfrm = ttfrm_to_tt[get_bits(gb, 2)]; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1620 } |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1621 } else { |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1622 v->ttmbf = 1; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1623 v->ttfrm = TT_8X8; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
1624 } |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1625 break; |
| 3359 | 1626 } |
| 1627 | |
| 1628 /* AC Syntax */ | |
| 1629 v->c_ac_table_index = decode012(gb); | |
| 1630 if (v->s.pict_type == I_TYPE || v->s.pict_type == BI_TYPE) | |
| 1631 { | |
| 1632 v->y_ac_table_index = decode012(gb); | |
| 1633 } | |
| 1634 /* DC Syntax */ | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1635 v->s.dc_table_index = get_bits(gb, 1); |
| 3359 | 1636 |
| 3689 | 1637 if(v->s.pict_type == BI_TYPE) { |
| 1638 v->s.pict_type = B_TYPE; | |
| 1639 v->bi_type = 1; | |
| 1640 } | |
| 3359 | 1641 return 0; |
| 1642 } | |
| 1643 | |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1644 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
|
1645 { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1646 int pqindex, lowquant; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1647 int status; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1648 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1649 v->p_frame_skipped = 0; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1650 |
|
4487
0a0a9f0c9c2d
Progressive frames disguised as interlaced are supported
kostya
parents:
4486
diff
changeset
|
1651 if(v->interlace){ |
| 4471 | 1652 v->fcm = decode012(gb); |
|
4487
0a0a9f0c9c2d
Progressive frames disguised as interlaced are supported
kostya
parents:
4486
diff
changeset
|
1653 if(v->fcm) return -1; // interlaced frames/fields are not implemented |
|
0a0a9f0c9c2d
Progressive frames disguised as interlaced are supported
kostya
parents:
4486
diff
changeset
|
1654 } |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1655 switch(get_prefix(gb, 0, 4)) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1656 case 0: |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1657 v->s.pict_type = P_TYPE; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1658 break; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1659 case 1: |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1660 v->s.pict_type = B_TYPE; |
| 4238 | 1661 break; |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1662 case 2: |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1663 v->s.pict_type = I_TYPE; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1664 break; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1665 case 3: |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1666 v->s.pict_type = BI_TYPE; |
| 3693 | 1667 break; |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1668 case 4: |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1669 v->s.pict_type = P_TYPE; // skipped pic |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1670 v->p_frame_skipped = 1; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1671 return 0; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1672 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1673 if(v->tfcntrflag) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1674 get_bits(gb, 8); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1675 if(v->broadcast) { |
| 4485 | 1676 if(!v->interlace || v->psf) { |
| 4471 | 1677 v->rptfrm = get_bits(gb, 2); |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1678 } else { |
| 4471 | 1679 v->tff = get_bits1(gb); |
| 1680 v->rptfrm = get_bits1(gb); | |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1681 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1682 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1683 if(v->panscanflag) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1684 //... |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1685 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1686 v->rnd = get_bits1(gb); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1687 if(v->interlace) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1688 v->uvsamp = get_bits1(gb); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1689 if(v->finterpflag) v->interpfrm = get_bits(gb, 1); |
| 4238 | 1690 if(v->s.pict_type == B_TYPE) { |
| 1691 v->bfraction = get_vlc2(gb, vc1_bfraction_vlc.table, VC1_BFRACTION_VLC_BITS, 1); | |
| 1692 v->bfraction = vc1_bfraction_lut[v->bfraction]; | |
| 1693 if(v->bfraction == 0) { | |
| 1694 v->s.pict_type = BI_TYPE; /* XXX: should not happen here */ | |
| 1695 } | |
| 1696 } | |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1697 pqindex = get_bits(gb, 5); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1698 v->pqindex = pqindex; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1699 if (v->quantizer_mode == QUANT_FRAME_IMPLICIT) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1700 v->pq = pquant_table[0][pqindex]; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1701 else |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1702 v->pq = pquant_table[1][pqindex]; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1703 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1704 v->pquantizer = 1; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1705 if (v->quantizer_mode == QUANT_FRAME_IMPLICIT) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1706 v->pquantizer = pqindex < 9; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1707 if (v->quantizer_mode == QUANT_NON_UNIFORM) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1708 v->pquantizer = 0; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1709 v->pqindex = pqindex; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1710 if (pqindex < 9) v->halfpq = get_bits(gb, 1); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1711 else v->halfpq = 0; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1712 if (v->quantizer_mode == QUANT_FRAME_EXPLICIT) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1713 v->pquantizer = get_bits(gb, 1); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1714 |
|
4518
e3c43b4aa9ac
Intensity compensation for B-frames in AP was missing
kostya
parents:
4487
diff
changeset
|
1715 if(v->s.pict_type == I_TYPE || v->s.pict_type == P_TYPE) v->use_ic = 0; |
|
e3c43b4aa9ac
Intensity compensation for B-frames in AP was missing
kostya
parents:
4487
diff
changeset
|
1716 |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1717 switch(v->s.pict_type) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1718 case I_TYPE: |
| 3693 | 1719 case BI_TYPE: |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1720 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
|
1721 if (status < 0) return -1; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1722 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
|
1723 "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
|
1724 v->condover = CONDOVER_NONE; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1725 if(v->overlap && v->pq <= 8) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1726 v->condover = decode012(gb); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1727 if(v->condover == CONDOVER_SELECT) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1728 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
|
1729 if (status < 0) return -1; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1730 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
|
1731 "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
|
1732 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1733 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1734 break; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1735 case P_TYPE: |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1736 if(v->postprocflag) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1737 v->postproc = get_bits1(gb); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1738 if (v->extended_mv) v->mvrange = get_prefix(gb, 0, 3); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1739 else v->mvrange = 0; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1740 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
|
1741 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
|
1742 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
|
1743 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
|
1744 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1745 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
|
1746 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
|
1747 else v->tt_index = 2; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1748 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1749 lowquant = (v->pq > 12) ? 0 : 1; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1750 v->mv_mode = mv_pmode_table[lowquant][get_prefix(gb, 1, 4)]; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1751 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
|
1752 { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1753 int scale, shift, i; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1754 v->mv_mode2 = mv_pmode_table2[lowquant][get_prefix(gb, 1, 3)]; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1755 v->lumscale = get_bits(gb, 6); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1756 v->lumshift = get_bits(gb, 6); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1757 /* fill lookup tables for intensity compensation */ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1758 if(!v->lumscale) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1759 scale = -64; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1760 shift = (255 - v->lumshift * 2) << 6; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1761 if(v->lumshift > 31) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1762 shift += 128 << 6; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1763 } else { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1764 scale = v->lumscale + 32; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1765 if(v->lumshift > 31) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1766 shift = (v->lumshift - 64) << 6; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1767 else |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1768 shift = v->lumshift << 6; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1769 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1770 for(i = 0; i < 256; i++) { |
| 4594 | 1771 v->luty[i] = av_clip_uint8((scale * i + shift + 32) >> 6); |
| 1772 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
|
1773 } |
|
4518
e3c43b4aa9ac
Intensity compensation for B-frames in AP was missing
kostya
parents:
4487
diff
changeset
|
1774 v->use_ic = 1; |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1775 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1776 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
|
1777 v->s.quarter_sample = 0; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1778 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
|
1779 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
|
1780 v->s.quarter_sample = 0; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1781 else |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1782 v->s.quarter_sample = 1; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1783 } else |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1784 v->s.quarter_sample = 1; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1785 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
|
1786 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1787 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
|
1788 v->mv_mode2 == MV_PMODE_MIXED_MV) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1789 || v->mv_mode == MV_PMODE_MIXED_MV) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1790 { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1791 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
|
1792 if (status < 0) return -1; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1793 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
|
1794 "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
|
1795 } else { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1796 v->mv_type_is_raw = 0; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1797 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
|
1798 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1799 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
|
1800 if (status < 0) return -1; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1801 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
|
1802 "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
|
1803 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1804 /* Hopefully this is correct for P frames */ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1805 v->s.mv_table_index = get_bits(gb, 2); //but using vc1_ tables |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1806 v->cbpcy_vlc = &vc1_cbpcy_p_vlc[get_bits(gb, 2)]; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1807 if (v->dquant) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1808 { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1809 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
|
1810 vop_dquant_decoding(v); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1811 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1812 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1813 v->ttfrm = 0; //FIXME Is that so ? |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1814 if (v->vstransform) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1815 { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1816 v->ttmbf = get_bits(gb, 1); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1817 if (v->ttmbf) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1818 { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1819 v->ttfrm = ttfrm_to_tt[get_bits(gb, 2)]; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1820 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1821 } else { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1822 v->ttmbf = 1; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1823 v->ttfrm = TT_8X8; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1824 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1825 break; |
| 4238 | 1826 case B_TYPE: |
| 1827 if(v->postprocflag) | |
| 1828 v->postproc = get_bits1(gb); | |
| 1829 if (v->extended_mv) v->mvrange = get_prefix(gb, 0, 3); | |
| 1830 else v->mvrange = 0; | |
| 1831 v->k_x = v->mvrange + 9 + (v->mvrange >> 1); //k_x can be 9 10 12 13 | |
| 1832 v->k_y = v->mvrange + 8; //k_y can be 8 9 10 11 | |
| 1833 v->range_x = 1 << (v->k_x - 1); | |
| 1834 v->range_y = 1 << (v->k_y - 1); | |
| 1835 | |
| 1836 if (v->pq < 5) v->tt_index = 0; | |
| 1837 else if(v->pq < 13) v->tt_index = 1; | |
| 1838 else v->tt_index = 2; | |
| 1839 | |
| 1840 lowquant = (v->pq > 12) ? 0 : 1; | |
| 1841 v->mv_mode = get_bits1(gb) ? MV_PMODE_1MV : MV_PMODE_1MV_HPEL_BILIN; | |
| 1842 v->s.quarter_sample = (v->mv_mode == MV_PMODE_1MV); | |
| 1843 v->s.mspel = v->s.quarter_sample; | |
| 1844 | |
| 1845 status = bitplane_decoding(v->direct_mb_plane, &v->dmb_is_raw, v); | |
| 1846 if (status < 0) return -1; | |
| 1847 av_log(v->s.avctx, AV_LOG_DEBUG, "MB Direct Type plane encoding: " | |
| 1848 "Imode: %i, Invert: %i\n", status>>1, status&1); | |
| 1849 status = bitplane_decoding(v->s.mbskip_table, &v->skip_is_raw, v); | |
| 1850 if (status < 0) return -1; | |
| 1851 av_log(v->s.avctx, AV_LOG_DEBUG, "MB Skip plane encoding: " | |
| 1852 "Imode: %i, Invert: %i\n", status>>1, status&1); | |
| 1853 | |
| 1854 v->s.mv_table_index = get_bits(gb, 2); | |
| 1855 v->cbpcy_vlc = &vc1_cbpcy_p_vlc[get_bits(gb, 2)]; | |
| 1856 | |
| 1857 if (v->dquant) | |
| 1858 { | |
| 1859 av_log(v->s.avctx, AV_LOG_DEBUG, "VOP DQuant info\n"); | |
| 1860 vop_dquant_decoding(v); | |
| 1861 } | |
| 1862 | |
| 1863 v->ttfrm = 0; | |
| 1864 if (v->vstransform) | |
| 1865 { | |
| 1866 v->ttmbf = get_bits(gb, 1); | |
| 1867 if (v->ttmbf) | |
| 1868 { | |
| 1869 v->ttfrm = ttfrm_to_tt[get_bits(gb, 2)]; | |
| 1870 } | |
| 1871 } else { | |
| 1872 v->ttmbf = 1; | |
| 1873 v->ttfrm = TT_8X8; | |
| 1874 } | |
| 1875 break; | |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1876 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1877 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1878 /* AC Syntax */ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1879 v->c_ac_table_index = decode012(gb); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1880 if (v->s.pict_type == I_TYPE || v->s.pict_type == BI_TYPE) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1881 { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1882 v->y_ac_table_index = decode012(gb); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1883 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1884 /* DC Syntax */ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1885 v->s.dc_table_index = get_bits(gb, 1); |
| 4433 | 1886 if ((v->s.pict_type == I_TYPE || v->s.pict_type == BI_TYPE) && v->dquant) { |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1887 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
|
1888 vop_dquant_decoding(v); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1889 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1890 |
| 3693 | 1891 v->bi_type = 0; |
| 1892 if(v->s.pict_type == BI_TYPE) { | |
| 1893 v->s.pict_type = B_TYPE; | |
| 1894 v->bi_type = 1; | |
| 1895 } | |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1896 return 0; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1897 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
1898 |
| 3359 | 1899 /***********************************************************************/ |
| 1900 /** | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1901 * @defgroup block VC-1 Block-level functions |
| 3359 | 1902 * @see 7.1.4, p91 and 8.1.1.7, p(1)04 |
| 1903 * @{ | |
| 1904 */ | |
| 1905 | |
| 1906 /** | |
| 1907 * @def GET_MQUANT | |
| 1908 * @brief Get macroblock-level quantizer scale | |
| 1909 */ | |
| 1910 #define GET_MQUANT() \ | |
| 1911 if (v->dquantfrm) \ | |
| 1912 { \ | |
| 3404 | 1913 int edges = 0; \ |
| 3359 | 1914 if (v->dqprofile == DQPROFILE_ALL_MBS) \ |
| 1915 { \ | |
| 1916 if (v->dqbilevel) \ | |
| 1917 { \ | |
| 3451 | 1918 mquant = (get_bits(gb, 1)) ? v->altpq : v->pq; \ |
| 3359 | 1919 } \ |
| 1920 else \ | |
| 1921 { \ | |
| 1922 mqdiff = get_bits(gb, 3); \ | |
| 1923 if (mqdiff != 7) mquant = v->pq + mqdiff; \ | |
| 1924 else mquant = get_bits(gb, 5); \ | |
| 1925 } \ | |
| 1926 } \ | |
| 3404 | 1927 if(v->dqprofile == DQPROFILE_SINGLE_EDGE) \ |
| 1928 edges = 1 << v->dqsbedge; \ | |
| 3396 | 1929 else if(v->dqprofile == DQPROFILE_DOUBLE_EDGES) \ |
| 3404 | 1930 edges = (3 << v->dqsbedge) % 15; \ |
| 3396 | 1931 else if(v->dqprofile == DQPROFILE_FOUR_EDGES) \ |
| 3404 | 1932 edges = 15; \ |
| 1933 if((edges&1) && !s->mb_x) \ | |
| 1934 mquant = v->altpq; \ | |
| 3451 | 1935 if((edges&2) && s->first_slice_line) \ |
| 3404 | 1936 mquant = v->altpq; \ |
| 1937 if((edges&4) && s->mb_x == (s->mb_width - 1)) \ | |
| 1938 mquant = v->altpq; \ | |
| 1939 if((edges&8) && s->mb_y == (s->mb_height - 1)) \ | |
| 1940 mquant = v->altpq; \ | |
| 3359 | 1941 } |
| 1942 | |
| 1943 /** | |
| 1944 * @def GET_MVDATA(_dmv_x, _dmv_y) | |
| 1945 * @brief Get MV differentials | |
| 1946 * @see MVDATA decoding from 8.3.5.2, p(1)20 | |
| 1947 * @param _dmv_x Horizontal differential for decoded MV | |
| 1948 * @param _dmv_y Vertical differential for decoded MV | |
| 1949 */ | |
| 1950 #define GET_MVDATA(_dmv_x, _dmv_y) \ | |
| 1951 index = 1 + get_vlc2(gb, vc1_mv_diff_vlc[s->mv_table_index].table,\ | |
| 1952 VC1_MV_DIFF_VLC_BITS, 2); \ | |
| 1953 if (index > 36) \ | |
| 1954 { \ | |
| 1955 mb_has_coeffs = 1; \ | |
| 1956 index -= 37; \ | |
| 1957 } \ | |
| 1958 else mb_has_coeffs = 0; \ | |
| 1959 s->mb_intra = 0; \ | |
| 1960 if (!index) { _dmv_x = _dmv_y = 0; } \ | |
| 1961 else if (index == 35) \ | |
| 1962 { \ | |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
1963 _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
|
1964 _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
|
1965 } \ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1966 else if (index == 36) \ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1967 { \ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1968 _dmv_x = 0; \ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1969 _dmv_y = 0; \ |
| 3359 | 1970 s->mb_intra = 1; \ |
| 1971 } \ | |
| 1972 else \ | |
| 1973 { \ | |
| 1974 index1 = index%6; \ | |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
1975 if (!s->quarter_sample && index1 == 5) val = 1; \ |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
1976 else val = 0; \ |
|
3366
c59aa4cdf042
This should make P-frames decoding work on x86 (by avoiding get_bits(0))
kostya
parents:
3364
diff
changeset
|
1977 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
|
1978 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
|
1979 else val = 0; \ |
| 3359 | 1980 sign = 0 - (val&1); \ |
| 1981 _dmv_x = (sign ^ ((val>>1) + offset_table[index1])) - sign; \ | |
| 1982 \ | |
| 1983 index1 = index/6; \ | |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
1984 if (!s->quarter_sample && index1 == 5) val = 1; \ |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
1985 else val = 0; \ |
|
3366
c59aa4cdf042
This should make P-frames decoding work on x86 (by avoiding get_bits(0))
kostya
parents:
3364
diff
changeset
|
1986 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
|
1987 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
|
1988 else val = 0; \ |
| 3359 | 1989 sign = 0 - (val&1); \ |
| 1990 _dmv_y = (sign ^ ((val>>1) + offset_table[index1])) - sign; \ | |
| 1991 } | |
| 1992 | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1993 /** Predict and set motion vector |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1994 */ |
| 3396 | 1995 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
|
1996 { |
| 3396 | 1997 int xy, wrap, off = 0; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1998 int16_t *A, *B, *C; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
1999 int px, py; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2000 int sum; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2001 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2002 /* scale MV difference to be quad-pel */ |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
2003 dmv_x <<= 1 - s->quarter_sample; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
2004 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
|
2005 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2006 wrap = s->b8_stride; |
| 3396 | 2007 xy = s->block_index[n]; |
| 2008 | |
| 2009 if(s->mb_intra){ | |
| 2010 s->mv[0][n][0] = s->current_picture.motion_val[0][xy][0] = 0; | |
| 2011 s->mv[0][n][1] = s->current_picture.motion_val[0][xy][1] = 0; | |
| 4683 | 2012 s->current_picture.motion_val[1][xy][0] = 0; |
| 2013 s->current_picture.motion_val[1][xy][1] = 0; | |
| 3396 | 2014 if(mv1) { /* duplicate motion data for 1-MV block */ |
| 2015 s->current_picture.motion_val[0][xy + 1][0] = 0; | |
| 2016 s->current_picture.motion_val[0][xy + 1][1] = 0; | |
| 2017 s->current_picture.motion_val[0][xy + wrap][0] = 0; | |
| 2018 s->current_picture.motion_val[0][xy + wrap][1] = 0; | |
| 2019 s->current_picture.motion_val[0][xy + wrap + 1][0] = 0; | |
| 2020 s->current_picture.motion_val[0][xy + wrap + 1][1] = 0; | |
| 4683 | 2021 s->current_picture.motion_val[1][xy + 1][0] = 0; |
| 2022 s->current_picture.motion_val[1][xy + 1][1] = 0; | |
| 2023 s->current_picture.motion_val[1][xy + wrap][0] = 0; | |
| 2024 s->current_picture.motion_val[1][xy + wrap][1] = 0; | |
| 2025 s->current_picture.motion_val[1][xy + wrap + 1][0] = 0; | |
| 2026 s->current_picture.motion_val[1][xy + wrap + 1][1] = 0; | |
| 3396 | 2027 } |
| 2028 return; | |
| 2029 } | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2030 |
| 3396 | 2031 C = s->current_picture.motion_val[0][xy - 1]; |
| 2032 A = s->current_picture.motion_val[0][xy - wrap]; | |
| 2033 if(mv1) | |
| 2034 off = (s->mb_x == (s->mb_width - 1)) ? -1 : 2; | |
| 2035 else { | |
| 2036 //in 4-MV mode different blocks have different B predictor position | |
| 2037 switch(n){ | |
| 2038 case 0: | |
| 2039 off = (s->mb_x > 0) ? -1 : 1; | |
| 2040 break; | |
| 2041 case 1: | |
| 2042 off = (s->mb_x == (s->mb_width - 1)) ? -1 : 1; | |
| 2043 break; | |
| 2044 case 2: | |
| 2045 off = 1; | |
| 2046 break; | |
| 2047 case 3: | |
| 2048 off = -1; | |
| 2049 } | |
| 2050 } | |
| 2051 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
|
2052 |
| 3396 | 2053 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
|
2054 if(s->mb_width == 1) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2055 px = A[0]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2056 py = A[1]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2057 } else { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2058 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
|
2059 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
|
2060 } |
| 3396 | 2061 } 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
|
2062 px = C[0]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2063 py = C[1]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2064 } else { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2065 px = py = 0; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2066 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2067 /* 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
|
2068 { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2069 int qx, qy, X, Y; |
|
3400
84de54d536bd
4-MV mode final fixes (now it works for non-exotic modes)
kostya
parents:
3399
diff
changeset
|
2070 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
|
2071 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
|
2072 X = (s->mb_width << 6) - 4; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2073 Y = (s->mb_height << 6) - 4; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2074 if(mv1) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2075 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
|
2076 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
|
2077 } else { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2078 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
|
2079 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
|
2080 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2081 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
|
2082 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
|
2083 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2084 /* Calculate hybrid prediction as specified in 8.3.5.3.5 */ |
| 3396 | 2085 if((!s->first_slice_line || (n==2 || n==3)) && (s->mb_x || (n==1 || n==3))) { |
| 2086 if(is_intra[xy - wrap]) | |
| 4001 | 2087 sum = FFABS(px) + FFABS(py); |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2088 else |
| 4001 | 2089 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
|
2090 if(sum > 32) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2091 if(get_bits1(&s->gb)) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2092 px = A[0]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2093 py = A[1]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2094 } else { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2095 px = C[0]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2096 py = C[1]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2097 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2098 } else { |
| 3396 | 2099 if(is_intra[xy - 1]) |
| 4001 | 2100 sum = FFABS(px) + FFABS(py); |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2101 else |
| 4001 | 2102 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
|
2103 if(sum > 32) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2104 if(get_bits1(&s->gb)) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2105 px = A[0]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2106 py = A[1]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2107 } else { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2108 px = C[0]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2109 py = C[1]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2110 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2111 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2112 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2113 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2114 /* store MV using signed modulus of MV range defined in 4.11 */ |
| 3396 | 2115 s->mv[0][n][0] = s->current_picture.motion_val[0][xy][0] = ((px + dmv_x + r_x) & ((r_x << 1) - 1)) - r_x; |
| 2116 s->mv[0][n][1] = s->current_picture.motion_val[0][xy][1] = ((py + dmv_y + r_y) & ((r_y << 1) - 1)) - r_y; | |
| 2117 if(mv1) { /* duplicate motion data for 1-MV block */ | |
| 2118 s->current_picture.motion_val[0][xy + 1][0] = s->current_picture.motion_val[0][xy][0]; | |
| 2119 s->current_picture.motion_val[0][xy + 1][1] = s->current_picture.motion_val[0][xy][1]; | |
| 2120 s->current_picture.motion_val[0][xy + wrap][0] = s->current_picture.motion_val[0][xy][0]; | |
| 2121 s->current_picture.motion_val[0][xy + wrap][1] = s->current_picture.motion_val[0][xy][1]; | |
| 2122 s->current_picture.motion_val[0][xy + wrap + 1][0] = s->current_picture.motion_val[0][xy][0]; | |
| 2123 s->current_picture.motion_val[0][xy + wrap + 1][1] = s->current_picture.motion_val[0][xy][1]; | |
| 2124 } | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2125 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2126 |
|
3553
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2127 /** 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
|
2128 */ |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2129 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
|
2130 { |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2131 MpegEncContext *s = &v->s; |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2132 DSPContext *dsp = &v->s.dsp; |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2133 uint8_t *srcY, *srcU, *srcV; |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2134 int dxy, uvdxy, mx, my, uvmx, uvmy, src_x, src_y, uvsrc_x, uvsrc_y; |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2135 |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2136 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
|
2137 |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2138 mx = s->mv[1][0][0]; |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2139 my = s->mv[1][0][1]; |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2140 uvmx = (mx + ((mx & 3) == 3)) >> 1; |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2141 uvmy = (my + ((my & 3) == 3)) >> 1; |
|
4258
4d2f162506e3
10e6l FastUVMC was done right but in the wrong place
kostya
parents:
4247
diff
changeset
|
2142 if(v->fastuvmc) { |
|
4d2f162506e3
10e6l FastUVMC was done right but in the wrong place
kostya
parents:
4247
diff
changeset
|
2143 uvmx = uvmx + ((uvmx<0)?-(uvmx&1):(uvmx&1)); |
|
4d2f162506e3
10e6l FastUVMC was done right but in the wrong place
kostya
parents:
4247
diff
changeset
|
2144 uvmy = uvmy + ((uvmy<0)?-(uvmy&1):(uvmy&1)); |
|
4d2f162506e3
10e6l FastUVMC was done right but in the wrong place
kostya
parents:
4247
diff
changeset
|
2145 } |
|
3553
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2146 srcY = s->next_picture.data[0]; |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2147 srcU = s->next_picture.data[1]; |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2148 srcV = s->next_picture.data[2]; |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2149 |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2150 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
|
2151 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
|
2152 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
|
2153 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
|
2154 |
| 4681 | 2155 if(v->profile != PROFILE_ADVANCED){ |
| 2156 src_x = av_clip( src_x, -16, s->mb_width * 16); | |
| 2157 src_y = av_clip( src_y, -16, s->mb_height * 16); | |
| 2158 uvsrc_x = av_clip(uvsrc_x, -8, s->mb_width * 8); | |
| 2159 uvsrc_y = av_clip(uvsrc_y, -8, s->mb_height * 8); | |
| 2160 }else{ | |
| 2161 src_x = av_clip( src_x, -17, s->avctx->coded_width); | |
| 2162 src_y = av_clip( src_y, -18, s->avctx->coded_height + 1); | |
| 2163 uvsrc_x = av_clip(uvsrc_x, -8, s->avctx->coded_width >> 1); | |
| 2164 uvsrc_y = av_clip(uvsrc_y, -8, s->avctx->coded_height >> 1); | |
| 2165 } | |
|
3553
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2166 |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2167 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
|
2168 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
|
2169 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
|
2170 |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2171 /* 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
|
2172 if(s->flags & CODEC_FLAG_GRAY) { |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2173 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
|
2174 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
|
2175 } |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2176 |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2177 if(v->rangeredfrm |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2178 || (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
|
2179 || (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
|
2180 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
|
2181 |
| 3708 | 2182 srcY -= s->mspel * (1 + s->linesize); |
| 2183 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
|
2184 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
|
2185 srcY = s->edge_emu_buffer; |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2186 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
|
2187 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
|
2188 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
|
2189 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
|
2190 srcU = uvbuf; |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2191 srcV = uvbuf + 16; |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2192 /* 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
|
2193 if(v->rangeredfrm) { |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2194 int i, j; |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2195 uint8_t *src, *src2; |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2196 |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2197 src = srcY; |
| 3708 | 2198 for(j = 0; j < 17 + s->mspel*2; j++) { |
| 2199 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
|
2200 src += s->linesize; |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2201 } |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2202 src = srcU; src2 = srcV; |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2203 for(j = 0; j < 9; j++) { |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2204 for(i = 0; i < 9; i++) { |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2205 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
|
2206 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
|
2207 } |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2208 src += s->uvlinesize; |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2209 src2 += s->uvlinesize; |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2210 } |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2211 } |
| 3708 | 2212 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
|
2213 } |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2214 |
|
3654
565d9ddd8eb3
Motion compensation for luma always use halfpel precision.
kostya
parents:
3573
diff
changeset
|
2215 mx >>= 1; |
|
565d9ddd8eb3
Motion compensation for luma always use halfpel precision.
kostya
parents:
3573
diff
changeset
|
2216 my >>= 1; |
|
565d9ddd8eb3
Motion compensation for luma always use halfpel precision.
kostya
parents:
3573
diff
changeset
|
2217 dxy = ((my & 1) << 1) | (mx & 1); |
|
565d9ddd8eb3
Motion compensation for luma always use halfpel precision.
kostya
parents:
3573
diff
changeset
|
2218 |
|
565d9ddd8eb3
Motion compensation for luma always use halfpel precision.
kostya
parents:
3573
diff
changeset
|
2219 dsp->avg_pixels_tab[0][dxy](s->dest[0], srcY, s->linesize, 16); |
|
3553
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2220 |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2221 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
|
2222 /* Chroma MC always uses qpel blilinear */ |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2223 uvdxy = ((uvmy & 3) << 2) | (uvmx & 3); |
| 3709 | 2224 uvmx = (uvmx&3)<<1; |
| 2225 uvmy = (uvmy&3)<<1; | |
| 2226 dsp->avg_h264_chroma_pixels_tab[0](s->dest[1], srcU, s->uvlinesize, 8, uvmx, uvmy); | |
| 2227 dsp->avg_h264_chroma_pixels_tab[0](s->dest[2], srcV, s->uvlinesize, 8, uvmx, uvmy); | |
|
3553
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2228 } |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2229 |
|
4283
d6f83e2f8804
rename always_inline to av_always_inline and move to common.h
mru
parents:
4258
diff
changeset
|
2230 static av_always_inline int scale_mv(int value, int bfrac, int inv, int qs) |
| 3689 | 2231 { |
| 2232 int n = bfrac; | |
| 2233 | |
| 2234 #if B_FRACTION_DEN==256 | |
| 2235 if(inv) | |
| 2236 n -= 256; | |
| 2237 if(!qs) | |
| 2238 return 2 * ((value * n + 255) >> 9); | |
| 2239 return (value * n + 128) >> 8; | |
| 2240 #else | |
| 2241 if(inv) | |
| 2242 n -= B_FRACTION_DEN; | |
| 2243 if(!qs) | |
| 2244 return 2 * ((value * n + B_FRACTION_DEN - 1) / (2 * B_FRACTION_DEN)); | |
| 2245 return (value * n + B_FRACTION_DEN/2) / B_FRACTION_DEN; | |
| 2246 #endif | |
| 2247 } | |
| 2248 | |
|
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
2249 /** 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
|
2250 */ |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
2251 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
|
2252 { |
|
3744
805aee1f7cce
For B-frames if the second reference frame signals intensity compensation
kostya
parents:
3743
diff
changeset
|
2253 if(v->use_ic) { |
|
805aee1f7cce
For B-frames if the second reference frame signals intensity compensation
kostya
parents:
3743
diff
changeset
|
2254 v->mv_mode2 = v->mv_mode; |
|
805aee1f7cce
For B-frames if the second reference frame signals intensity compensation
kostya
parents:
3743
diff
changeset
|
2255 v->mv_mode = MV_PMODE_INTENSITY_COMP; |
|
805aee1f7cce
For B-frames if the second reference frame signals intensity compensation
kostya
parents:
3743
diff
changeset
|
2256 } |
| 3689 | 2257 if(direct) { |
| 2258 vc1_mc_1mv(v, 0); | |
| 2259 vc1_interp_mc(v); | |
|
3744
805aee1f7cce
For B-frames if the second reference frame signals intensity compensation
kostya
parents:
3743
diff
changeset
|
2260 if(v->use_ic) v->mv_mode = v->mv_mode2; |
| 3689 | 2261 return; |
| 2262 } | |
| 2263 if(mode == BMV_TYPE_INTERPOLATED) { | |
| 2264 vc1_mc_1mv(v, 0); | |
| 2265 vc1_interp_mc(v); | |
|
3744
805aee1f7cce
For B-frames if the second reference frame signals intensity compensation
kostya
parents:
3743
diff
changeset
|
2266 if(v->use_ic) v->mv_mode = v->mv_mode2; |
| 3689 | 2267 return; |
| 2268 } | |
| 2269 | |
|
3744
805aee1f7cce
For B-frames if the second reference frame signals intensity compensation
kostya
parents:
3743
diff
changeset
|
2270 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
|
2271 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
|
2272 if(v->use_ic) v->mv_mode = v->mv_mode2; |
| 3689 | 2273 } |
| 2274 | |
| 2275 static inline void vc1_pred_b_mv(VC1Context *v, int dmv_x[2], int dmv_y[2], int direct, int mvtype) | |
| 2276 { | |
|
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
2277 MpegEncContext *s = &v->s; |
| 3689 | 2278 int xy, wrap, off = 0; |
| 2279 int16_t *A, *B, *C; | |
| 2280 int px, py; | |
| 2281 int sum; | |
| 2282 int r_x, r_y; | |
| 2283 const uint8_t *is_intra = v->mb_type[0]; | |
| 2284 | |
| 2285 r_x = v->range_x; | |
| 2286 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
|
2287 /* 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
|
2288 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
|
2289 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
|
2290 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
|
2291 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
|
2292 |
| 3689 | 2293 wrap = s->b8_stride; |
| 2294 xy = s->block_index[0]; | |
| 2295 | |
| 2296 if(s->mb_intra) { | |
| 2297 s->current_picture.motion_val[0][xy][0] = | |
| 2298 s->current_picture.motion_val[0][xy][1] = | |
| 2299 s->current_picture.motion_val[1][xy][0] = | |
| 2300 s->current_picture.motion_val[1][xy][1] = 0; | |
| 2301 return; | |
| 2302 } | |
|
3743
fc613a610303
Reorder MV order in B-frames so no swapping in vc1_b_mc() is needed
kostya
parents:
3711
diff
changeset
|
2303 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
|
2304 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
|
2305 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
|
2306 s->mv[1][0][1] = scale_mv(s->next_picture.motion_val[1][xy][1], v->bfraction, 1, s->quarter_sample); |
|
3553
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2307 if(direct) { |
| 3689 | 2308 s->current_picture.motion_val[0][xy][0] = s->mv[0][0][0]; |
| 2309 s->current_picture.motion_val[0][xy][1] = s->mv[0][0][1]; | |
| 2310 s->current_picture.motion_val[1][xy][0] = s->mv[1][0][0]; | |
| 2311 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
|
2312 return; |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
2313 } |
| 3689 | 2314 |
|
3743
fc613a610303
Reorder MV order in B-frames so no swapping in vc1_b_mc() is needed
kostya
parents:
3711
diff
changeset
|
2315 if((mvtype == BMV_TYPE_FORWARD) || (mvtype == BMV_TYPE_INTERPOLATED)) { |
| 3689 | 2316 C = s->current_picture.motion_val[0][xy - 2]; |
| 2317 A = s->current_picture.motion_val[0][xy - wrap*2]; | |
| 2318 off = (s->mb_x == (s->mb_width - 1)) ? -2 : 2; | |
| 2319 B = s->current_picture.motion_val[0][xy - wrap*2 + off]; | |
| 2320 | |
|
4834
300b60dee58c
Set C predictor to zero if unavailable (should fix B-frame border artifacts)
kostya
parents:
4784
diff
changeset
|
2321 if(!s->mb_x) C[0] = C[1] = 0; |
| 3689 | 2322 if(!s->first_slice_line) { // predictor A is not out of bounds |
| 2323 if(s->mb_width == 1) { | |
| 2324 px = A[0]; | |
| 2325 py = A[1]; | |
| 2326 } else { | |
| 2327 px = mid_pred(A[0], B[0], C[0]); | |
| 2328 py = mid_pred(A[1], B[1], C[1]); | |
| 2329 } | |
| 2330 } else if(s->mb_x) { // predictor C is not out of bounds | |
| 2331 px = C[0]; | |
| 2332 py = C[1]; | |
| 2333 } else { | |
| 2334 px = py = 0; | |
| 2335 } | |
| 2336 /* Pullback MV as specified in 8.3.5.3.4 */ | |
| 2337 { | |
| 2338 int qx, qy, X, Y; | |
| 2339 if(v->profile < PROFILE_ADVANCED) { | |
| 2340 qx = (s->mb_x << 5); | |
| 2341 qy = (s->mb_y << 5); | |
| 2342 X = (s->mb_width << 5) - 4; | |
| 2343 Y = (s->mb_height << 5) - 4; | |
| 2344 if(qx + px < -28) px = -28 - qx; | |
| 2345 if(qy + py < -28) py = -28 - qy; | |
| 2346 if(qx + px > X) px = X - qx; | |
| 2347 if(qy + py > Y) py = Y - qy; | |
| 2348 } else { | |
| 2349 qx = (s->mb_x << 6); | |
| 2350 qy = (s->mb_y << 6); | |
| 2351 X = (s->mb_width << 6) - 4; | |
| 2352 Y = (s->mb_height << 6) - 4; | |
| 2353 if(qx + px < -60) px = -60 - qx; | |
| 2354 if(qy + py < -60) py = -60 - qy; | |
| 2355 if(qx + px > X) px = X - qx; | |
| 2356 if(qy + py > Y) py = Y - qy; | |
| 2357 } | |
| 2358 } | |
| 2359 /* Calculate hybrid prediction as specified in 8.3.5.3.5 */ | |
| 2360 if(0 && !s->first_slice_line && s->mb_x) { | |
| 2361 if(is_intra[xy - wrap]) | |
| 4001 | 2362 sum = FFABS(px) + FFABS(py); |
| 3689 | 2363 else |
| 4001 | 2364 sum = FFABS(px - A[0]) + FFABS(py - A[1]); |
| 3689 | 2365 if(sum > 32) { |
| 2366 if(get_bits1(&s->gb)) { | |
| 2367 px = A[0]; | |
| 2368 py = A[1]; | |
| 2369 } else { | |
| 2370 px = C[0]; | |
| 2371 py = C[1]; | |
| 2372 } | |
| 2373 } else { | |
| 2374 if(is_intra[xy - 2]) | |
| 4001 | 2375 sum = FFABS(px) + FFABS(py); |
| 3689 | 2376 else |
| 4001 | 2377 sum = FFABS(px - C[0]) + FFABS(py - C[1]); |
| 3689 | 2378 if(sum > 32) { |
| 2379 if(get_bits1(&s->gb)) { | |
| 2380 px = A[0]; | |
| 2381 py = A[1]; | |
| 2382 } else { | |
| 2383 px = C[0]; | |
| 2384 py = C[1]; | |
| 2385 } | |
| 2386 } | |
| 2387 } | |
|
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
2388 } |
| 3689 | 2389 /* store MV using signed modulus of MV range defined in 4.11 */ |
| 2390 s->mv[0][0][0] = ((px + dmv_x[0] + r_x) & ((r_x << 1) - 1)) - r_x; | |
| 2391 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
|
2392 } |
|
3743
fc613a610303
Reorder MV order in B-frames so no swapping in vc1_b_mc() is needed
kostya
parents:
3711
diff
changeset
|
2393 if((mvtype == BMV_TYPE_BACKWARD) || (mvtype == BMV_TYPE_INTERPOLATED)) { |
| 3689 | 2394 C = s->current_picture.motion_val[1][xy - 2]; |
| 2395 A = s->current_picture.motion_val[1][xy - wrap*2]; | |
| 2396 off = (s->mb_x == (s->mb_width - 1)) ? -2 : 2; | |
| 2397 B = s->current_picture.motion_val[1][xy - wrap*2 + off]; | |
| 2398 | |
|
4834
300b60dee58c
Set C predictor to zero if unavailable (should fix B-frame border artifacts)
kostya
parents:
4784
diff
changeset
|
2399 if(!s->mb_x) C[0] = C[1] = 0; |
| 3689 | 2400 if(!s->first_slice_line) { // predictor A is not out of bounds |
| 2401 if(s->mb_width == 1) { | |
| 2402 px = A[0]; | |
| 2403 py = A[1]; | |
| 2404 } else { | |
| 2405 px = mid_pred(A[0], B[0], C[0]); | |
| 2406 py = mid_pred(A[1], B[1], C[1]); | |
| 2407 } | |
| 2408 } else if(s->mb_x) { // predictor C is not out of bounds | |
| 2409 px = C[0]; | |
| 2410 py = C[1]; | |
| 2411 } else { | |
| 2412 px = py = 0; | |
| 2413 } | |
| 2414 /* Pullback MV as specified in 8.3.5.3.4 */ | |
| 2415 { | |
| 2416 int qx, qy, X, Y; | |
| 2417 if(v->profile < PROFILE_ADVANCED) { | |
| 2418 qx = (s->mb_x << 5); | |
| 2419 qy = (s->mb_y << 5); | |
| 2420 X = (s->mb_width << 5) - 4; | |
| 2421 Y = (s->mb_height << 5) - 4; | |
| 2422 if(qx + px < -28) px = -28 - qx; | |
| 2423 if(qy + py < -28) py = -28 - qy; | |
| 2424 if(qx + px > X) px = X - qx; | |
| 2425 if(qy + py > Y) py = Y - qy; | |
| 2426 } else { | |
| 2427 qx = (s->mb_x << 6); | |
| 2428 qy = (s->mb_y << 6); | |
| 2429 X = (s->mb_width << 6) - 4; | |
| 2430 Y = (s->mb_height << 6) - 4; | |
| 2431 if(qx + px < -60) px = -60 - qx; | |
| 2432 if(qy + py < -60) py = -60 - qy; | |
| 2433 if(qx + px > X) px = X - qx; | |
| 2434 if(qy + py > Y) py = Y - qy; | |
| 2435 } | |
| 2436 } | |
| 2437 /* Calculate hybrid prediction as specified in 8.3.5.3.5 */ | |
| 2438 if(0 && !s->first_slice_line && s->mb_x) { | |
| 2439 if(is_intra[xy - wrap]) | |
| 4001 | 2440 sum = FFABS(px) + FFABS(py); |
| 3689 | 2441 else |
| 4001 | 2442 sum = FFABS(px - A[0]) + FFABS(py - A[1]); |
| 3689 | 2443 if(sum > 32) { |
| 2444 if(get_bits1(&s->gb)) { | |
| 2445 px = A[0]; | |
| 2446 py = A[1]; | |
| 2447 } else { | |
| 2448 px = C[0]; | |
| 2449 py = C[1]; | |
| 2450 } | |
| 2451 } else { | |
| 2452 if(is_intra[xy - 2]) | |
| 4001 | 2453 sum = FFABS(px) + FFABS(py); |
| 3689 | 2454 else |
| 4001 | 2455 sum = FFABS(px - C[0]) + FFABS(py - C[1]); |
| 3689 | 2456 if(sum > 32) { |
| 2457 if(get_bits1(&s->gb)) { | |
| 2458 px = A[0]; | |
| 2459 py = A[1]; | |
| 2460 } else { | |
| 2461 px = C[0]; | |
| 2462 py = C[1]; | |
| 2463 } | |
| 2464 } | |
| 2465 } | |
| 2466 } | |
| 2467 /* store MV using signed modulus of MV range defined in 4.11 */ | |
| 2468 | |
| 2469 s->mv[1][0][0] = ((px + dmv_x[1] + r_x) & ((r_x << 1) - 1)) - r_x; | |
| 2470 s->mv[1][0][1] = ((py + dmv_y[1] + r_y) & ((r_y << 1) - 1)) - r_y; | |
| 2471 } | |
| 2472 s->current_picture.motion_val[0][xy][0] = s->mv[0][0][0]; | |
| 2473 s->current_picture.motion_val[0][xy][1] = s->mv[0][0][1]; | |
| 2474 s->current_picture.motion_val[1][xy][0] = s->mv[1][0][0]; | |
| 2475 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
|
2476 } |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
2477 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2478 /** Get predicted DC value for I-frames only |
| 3359 | 2479 * prediction dir: left=0, top=1 |
| 2480 * @param s MpegEncContext | |
| 2481 * @param[in] n block index in the current MB | |
| 2482 * @param dc_val_ptr Pointer to DC predictor | |
| 2483 * @param dir_ptr Prediction direction for use in AC prediction | |
| 2484 */ | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2485 static inline int vc1_i_pred_dc(MpegEncContext *s, int overlap, int pq, int n, |
| 3781 | 2486 int16_t **dc_val_ptr, int *dir_ptr) |
| 3359 | 2487 { |
| 2488 int a, b, c, wrap, pred, scale; | |
| 3781 | 2489 int16_t *dc_val; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2490 static const uint16_t dcpred[32] = { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2491 -1, 1024, 512, 341, 256, 205, 171, 146, 128, |
| 3359 | 2492 114, 102, 93, 85, 79, 73, 68, 64, |
| 2493 60, 57, 54, 51, 49, 47, 45, 43, | |
| 2494 41, 39, 38, 37, 35, 34, 33 | |
| 2495 }; | |
| 2496 | |
| 2497 /* find prediction - wmv3_dc_scale always used here in fact */ | |
| 2498 if (n < 4) scale = s->y_dc_scale; | |
| 2499 else scale = s->c_dc_scale; | |
| 2500 | |
| 2501 wrap = s->block_wrap[n]; | |
| 2502 dc_val= s->dc_val[0] + s->block_index[n]; | |
| 2503 | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2504 /* B A |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2505 * C X |
| 3359 | 2506 */ |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2507 c = dc_val[ - 1]; |
| 3359 | 2508 b = dc_val[ - 1 - wrap]; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2509 a = dc_val[ - wrap]; |
| 3359 | 2510 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2511 if (pq < 9 || !overlap) |
| 3359 | 2512 { |
| 2513 /* Set outer values */ | |
|
3449
ec6096b1ab04
Use s->first_slice_line in checks instead of s->mb_y
kostya
parents:
3430
diff
changeset
|
2514 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
|
2515 if (s->mb_x == 0 && (n!=1 && n!=3)) b=c=dcpred[scale]; |
| 3359 | 2516 } |
| 2517 else | |
| 2518 { | |
| 2519 /* Set outer values */ | |
|
3449
ec6096b1ab04
Use s->first_slice_line in checks instead of s->mb_y
kostya
parents:
3430
diff
changeset
|
2520 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
|
2521 if (s->mb_x == 0 && (n!=1 && n!=3)) b=c=0; |
| 3359 | 2522 } |
| 2523 | |
| 2524 if (abs(a - b) <= abs(b - c)) { | |
| 2525 pred = c; | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2526 *dir_ptr = 1;//left |
| 3359 | 2527 } else { |
| 2528 pred = a; | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2529 *dir_ptr = 0;//top |
| 3359 | 2530 } |
| 2531 | |
| 2532 /* update predictor */ | |
| 2533 *dc_val_ptr = &dc_val[0]; | |
| 2534 return pred; | |
| 2535 } | |
| 2536 | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2537 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2538 /** Get predicted DC value |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2539 * prediction dir: left=0, top=1 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2540 * @param s MpegEncContext |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2541 * @param[in] n block index in the current MB |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2542 * @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
|
2543 * @param dir_ptr Prediction direction for use in AC prediction |
| 3359 | 2544 */ |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2545 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
|
2546 int a_avail, int c_avail, |
| 3781 | 2547 int16_t **dc_val_ptr, int *dir_ptr) |
| 3359 | 2548 { |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2549 int a, b, c, wrap, pred, scale; |
| 3781 | 2550 int16_t *dc_val; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2551 int mb_pos = s->mb_x + s->mb_y * s->mb_stride; |
| 3429 | 2552 int q1, q2 = 0; |
| 3359 | 2553 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2554 /* find prediction - wmv3_dc_scale always used here in fact */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2555 if (n < 4) scale = s->y_dc_scale; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2556 else scale = s->c_dc_scale; |
| 3359 | 2557 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2558 wrap = s->block_wrap[n]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2559 dc_val= s->dc_val[0] + s->block_index[n]; |
| 3359 | 2560 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2561 /* B A |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2562 * C X |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2563 */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2564 c = dc_val[ - 1]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2565 b = dc_val[ - 1 - wrap]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2566 a = dc_val[ - wrap]; |
|
3508
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2567 /* scale predictors if needed */ |
|
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2568 q1 = s->current_picture.qscale_table[mb_pos]; |
|
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2569 if(c_avail && (n!= 1 && n!=3)) { |
|
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2570 q2 = s->current_picture.qscale_table[mb_pos - 1]; |
|
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2571 if(q2 && q2 != q1) |
|
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2572 c = (c * s->y_dc_scale_table[q2] * vc1_dqscale[s->y_dc_scale_table[q1] - 1] + 0x20000) >> 18; |
|
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2573 } |
|
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2574 if(a_avail && (n!= 2 && n!=3)) { |
|
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2575 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
|
2576 if(q2 && q2 != q1) |
|
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2577 a = (a * s->y_dc_scale_table[q2] * vc1_dqscale[s->y_dc_scale_table[q1] - 1] + 0x20000) >> 18; |
|
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2578 } |
|
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2579 if(a_avail && c_avail && (n!=3)) { |
|
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2580 int off = mb_pos; |
|
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2581 if(n != 1) off--; |
|
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2582 if(n != 2) off -= s->mb_stride; |
|
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2583 q2 = s->current_picture.qscale_table[off]; |
|
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2584 if(q2 && q2 != q1) |
|
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2585 b = (b * s->y_dc_scale_table[q2] * vc1_dqscale[s->y_dc_scale_table[q1] - 1] + 0x20000) >> 18; |
|
3d6e4ef3170d
1000l: scale DC predictors instead of predicted value.
kostya
parents:
3507
diff
changeset
|
2586 } |
| 3359 | 2587 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2588 if(a_avail && c_avail) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2589 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
|
2590 pred = c; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2591 *dir_ptr = 1;//left |
| 3359 | 2592 } else { |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2593 pred = a; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2594 *dir_ptr = 0;//top |
| 3359 | 2595 } |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2596 } else if(a_avail) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2597 pred = a; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2598 *dir_ptr = 0;//top |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2599 } else if(c_avail) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2600 pred = c; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2601 *dir_ptr = 1;//left |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2602 } else { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2603 pred = 0; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2604 *dir_ptr = 1;//left |
| 3359 | 2605 } |
| 2606 | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2607 /* update predictor */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2608 *dc_val_ptr = &dc_val[0]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2609 return pred; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2610 } |
| 3359 | 2611 |
| 2612 | |
| 2613 /** | |
| 2614 * @defgroup std_mb VC1 Macroblock-level functions in Simple/Main Profiles | |
| 2615 * @see 7.1.4, p91 and 8.1.1.7, p(1)04 | |
| 2616 * @{ | |
| 2617 */ | |
| 2618 | |
| 2619 static inline int vc1_coded_block_pred(MpegEncContext * s, int n, uint8_t **coded_block_ptr) | |
| 2620 { | |
| 2621 int xy, wrap, pred, a, b, c; | |
| 2622 | |
| 2623 xy = s->block_index[n]; | |
| 2624 wrap = s->b8_stride; | |
| 2625 | |
| 2626 /* B C | |
| 2627 * A X | |
| 2628 */ | |
| 2629 a = s->coded_block[xy - 1 ]; | |
| 2630 b = s->coded_block[xy - 1 - wrap]; | |
| 2631 c = s->coded_block[xy - wrap]; | |
| 2632 | |
| 2633 if (b == c) { | |
| 2634 pred = a; | |
| 2635 } else { | |
| 2636 pred = c; | |
| 2637 } | |
| 2638 | |
| 2639 /* store value */ | |
| 2640 *coded_block_ptr = &s->coded_block[xy]; | |
| 2641 | |
| 2642 return pred; | |
| 2643 } | |
| 2644 | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2645 /** |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2646 * Decode one AC coefficient |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2647 * @param v The VC1 context |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2648 * @param last Last coefficient |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2649 * @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
|
2650 * @param value Decoded AC coefficient value |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2651 * @see 8.1.3.4 |
| 3359 | 2652 */ |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2653 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
|
2654 { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2655 GetBitContext *gb = &v->s.gb; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2656 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
|
2657 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2658 index = get_vlc2(gb, vc1_ac_coeff_table[codingset].table, AC_VLC_BITS, 3); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2659 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
|
2660 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
|
2661 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
|
2662 lst = index >= vc1_last_decode_table[codingset]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2663 if(get_bits(gb, 1)) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2664 level = -level; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2665 } else { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2666 escape = decode210(gb); |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
2667 if (escape != 2) { |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2668 index = get_vlc2(gb, vc1_ac_coeff_table[codingset].table, AC_VLC_BITS, 3); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2669 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
|
2670 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
|
2671 lst = index >= vc1_last_decode_table[codingset]; |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
2672 if(escape == 0) { |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
2673 if(lst) |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
2674 level += vc1_last_delta_level_table[codingset][run]; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
2675 else |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
2676 level += vc1_delta_level_table[codingset][run]; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
2677 } else { |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
2678 if(lst) |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
2679 run += vc1_last_delta_run_table[codingset][level] + 1; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
2680 else |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
2681 run += vc1_delta_run_table[codingset][level] + 1; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
2682 } |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2683 if(get_bits(gb, 1)) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2684 level = -level; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2685 } else { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2686 int sign; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2687 lst = get_bits(gb, 1); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2688 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
|
2689 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
|
2690 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
|
2691 if(!v->s.esc3_level_length) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2692 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
|
2693 } else { //table 60 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2694 v->s.esc3_level_length = get_prefix(gb, 1, 6) + 2; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2695 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2696 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
|
2697 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2698 run = get_bits(gb, v->s.esc3_run_length); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2699 sign = get_bits(gb, 1); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2700 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
|
2701 if(sign) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2702 level = -level; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2703 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2704 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2705 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2706 *last = lst; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2707 *skip = run; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2708 *value = level; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2709 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2710 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2711 /** 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
|
2712 * @param v VC1Context |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2713 * @param block block to decode |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2714 * @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
|
2715 * @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
|
2716 */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2717 static int vc1_decode_i_block(VC1Context *v, DCTELEM block[64], int n, int coded, int codingset) |
| 3359 | 2718 { |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2719 GetBitContext *gb = &v->s.gb; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2720 MpegEncContext *s = &v->s; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2721 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
|
2722 int run_diff, i; |
| 3781 | 2723 int16_t *dc_val; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2724 int16_t *ac_val, *ac_val2; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2725 int dcdiff; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2726 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2727 /* Get DC differential */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2728 if (n < 4) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2729 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
|
2730 } else { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2731 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
|
2732 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2733 if (dcdiff < 0){ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2734 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
|
2735 return -1; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2736 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2737 if (dcdiff) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2738 { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2739 if (dcdiff == 119 /* ESC index value */) |
|
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 /* TODO: Optimize */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2742 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
|
2743 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
|
2744 else dcdiff = get_bits(gb, 8); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2745 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2746 else |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2747 { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2748 if (v->pq == 1) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2749 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
|
2750 else if (v->pq == 2) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2751 dcdiff = (dcdiff<<1) + get_bits(gb, 1) - 1; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2752 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2753 if (get_bits(gb, 1)) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2754 dcdiff = -dcdiff; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2755 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2756 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2757 /* Prediction */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2758 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
|
2759 *dc_val = dcdiff; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2760 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2761 /* 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
|
2762 if (n < 4) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2763 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
|
2764 } else { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2765 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
|
2766 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2767 /* Skip ? */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2768 run_diff = 0; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2769 i = 0; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2770 if (!coded) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2771 goto not_coded; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2772 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2773 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2774 //AC Decoding |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2775 i = 1; |
|
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 int last = 0, skip, value; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2779 const int8_t *zz_table; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2780 int scale; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2781 int k; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2782 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2783 scale = v->pq * 2 + v->halfpq; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2784 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2785 if(v->s.ac_pred) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2786 if(!dc_pred_dir) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2787 zz_table = vc1_horizontal_zz; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2788 else |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2789 zz_table = vc1_vertical_zz; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2790 } else |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2791 zz_table = vc1_normal_zz; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2792 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2793 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
|
2794 ac_val2 = ac_val; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2795 if(dc_pred_dir) //left |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2796 ac_val -= 16; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2797 else //top |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2798 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
|
2799 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2800 while (!last) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2801 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
|
2802 i += skip; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2803 if(i > 63) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2804 break; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2805 block[zz_table[i++]] = value; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2806 } |
| 3359 | 2807 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2808 /* apply AC prediction if needed */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2809 if(s->ac_pred) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2810 if(dc_pred_dir) { //left |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2811 for(k = 1; k < 8; k++) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2812 block[k << 3] += ac_val[k]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2813 } else { //top |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2814 for(k = 1; k < 8; k++) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2815 block[k] += ac_val[k + 8]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2816 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2817 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2818 /* save AC coeffs for further prediction */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2819 for(k = 1; k < 8; k++) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2820 ac_val2[k] = block[k << 3]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2821 ac_val2[k + 8] = block[k]; |
|
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 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2824 /* scale AC coeffs */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2825 for(k = 1; k < 64; k++) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2826 if(block[k]) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2827 block[k] *= scale; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2828 if(!v->pquantizer) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2829 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
|
2830 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2831 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2832 if(s->ac_pred) i = 63; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2833 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2834 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2835 not_coded: |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2836 if(!coded) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2837 int k, scale; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2838 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
|
2839 ac_val2 = ac_val; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2840 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2841 scale = v->pq * 2 + v->halfpq; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2842 memset(ac_val2, 0, 16 * 2); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2843 if(dc_pred_dir) {//left |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2844 ac_val -= 16; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2845 if(s->ac_pred) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2846 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
|
2847 } else {//top |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2848 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
|
2849 if(s->ac_pred) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2850 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
|
2851 } |
|
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 /* apply AC prediction if needed */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2854 if(s->ac_pred) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2855 if(dc_pred_dir) { //left |
|
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 block[k << 3] = ac_val[k] * scale; |
| 3509 | 2858 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
|
2859 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
|
2860 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2861 } else { //top |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2862 for(k = 1; k < 8; k++) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2863 block[k] = ac_val[k + 8] * scale; |
| 3509 | 2864 if(!v->pquantizer && block[k]) |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2865 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
|
2866 } |
|
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 i = 63; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2869 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2870 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2871 s->block_last_index[n] = i; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2872 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2873 return 0; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2874 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
2875 |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2876 /** 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
|
2877 * @param v VC1Context |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2878 * @param block block to decode |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2879 * @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
|
2880 * @param codingset set of VLC to decode data |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2881 */ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2882 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
|
2883 { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2884 GetBitContext *gb = &v->s.gb; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2885 MpegEncContext *s = &v->s; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2886 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
|
2887 int run_diff, i; |
| 3781 | 2888 int16_t *dc_val; |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2889 int16_t *ac_val, *ac_val2; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2890 int dcdiff; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2891 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
|
2892 int use_pred = s->ac_pred; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2893 int scale; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2894 int q1, q2 = 0; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2895 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
|
2896 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2897 /* Get DC differential */ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2898 if (n < 4) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2899 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
|
2900 } else { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2901 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
|
2902 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2903 if (dcdiff < 0){ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2904 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
|
2905 return -1; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2906 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2907 if (dcdiff) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2908 { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2909 if (dcdiff == 119 /* ESC index value */) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2910 { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2911 /* TODO: Optimize */ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2912 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
|
2913 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
|
2914 else dcdiff = get_bits(gb, 8); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2915 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2916 else |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2917 { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2918 if (mquant == 1) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2919 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
|
2920 else if (mquant == 2) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2921 dcdiff = (dcdiff<<1) + get_bits(gb, 1) - 1; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2922 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2923 if (get_bits(gb, 1)) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2924 dcdiff = -dcdiff; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2925 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2926 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2927 /* Prediction */ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2928 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
|
2929 *dc_val = dcdiff; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2930 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2931 /* 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
|
2932 if (n < 4) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2933 block[0] = dcdiff * s->y_dc_scale; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2934 } else { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2935 block[0] = dcdiff * s->c_dc_scale; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2936 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2937 /* Skip ? */ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2938 run_diff = 0; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2939 i = 0; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2940 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2941 //AC Decoding |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2942 i = 1; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2943 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2944 /* check if AC is needed at all and adjust direction if needed */ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2945 if(!a_avail) dc_pred_dir = 1; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2946 if(!c_avail) dc_pred_dir = 0; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2947 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
|
2948 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
|
2949 ac_val2 = ac_val; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2950 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2951 scale = mquant * 2 + v->halfpq; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2952 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2953 if(dc_pred_dir) //left |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2954 ac_val -= 16; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2955 else //top |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2956 ac_val -= 16 * s->block_wrap[n]; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2957 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2958 q1 = s->current_picture.qscale_table[mb_pos]; |
| 4456 | 2959 if(dc_pred_dir && c_avail && mb_pos) q2 = s->current_picture.qscale_table[mb_pos - 1]; |
| 2960 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
|
2961 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
|
2962 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
|
2963 if(n==3) q2 = q1; |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2964 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2965 if(coded) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2966 int last = 0, skip, value; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2967 const int8_t *zz_table; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2968 int k; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2969 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2970 if(v->s.ac_pred) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2971 if(!dc_pred_dir) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2972 zz_table = vc1_horizontal_zz; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2973 else |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2974 zz_table = vc1_vertical_zz; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2975 } else |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2976 zz_table = vc1_normal_zz; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2977 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2978 while (!last) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2979 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
|
2980 i += skip; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2981 if(i > 63) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2982 break; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2983 block[zz_table[i++]] = value; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2984 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2985 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2986 /* apply AC prediction if needed */ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2987 if(use_pred) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2988 /* scale predictors if needed*/ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2989 if(q2 && q1!=q2) { |
| 4236 | 2990 q1 = q1 * 2 + ((q1 == v->pq) ? v->halfpq : 0) - 1; |
| 2991 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
|
2992 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2993 if(dc_pred_dir) { //left |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2994 for(k = 1; k < 8; k++) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2995 block[k << 3] += (ac_val[k] * q2 * vc1_dqscale[q1 - 1] + 0x20000) >> 18; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2996 } else { //top |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2997 for(k = 1; k < 8; k++) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2998 block[k] += (ac_val[k + 8] * q2 * vc1_dqscale[q1 - 1] + 0x20000) >> 18; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
2999 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3000 } else { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3001 if(dc_pred_dir) { //left |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3002 for(k = 1; k < 8; k++) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3003 block[k << 3] += ac_val[k]; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3004 } else { //top |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3005 for(k = 1; k < 8; k++) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3006 block[k] += ac_val[k + 8]; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3007 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3008 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3009 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3010 /* save AC coeffs for further prediction */ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3011 for(k = 1; k < 8; k++) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3012 ac_val2[k] = block[k << 3]; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3013 ac_val2[k + 8] = block[k]; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3014 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3015 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3016 /* scale AC coeffs */ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3017 for(k = 1; k < 64; k++) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3018 if(block[k]) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3019 block[k] *= scale; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3020 if(!v->pquantizer) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3021 block[k] += (block[k] < 0) ? -mquant : mquant; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3022 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3023 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3024 if(use_pred) i = 63; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3025 } else { // no AC coeffs |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3026 int k; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3027 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3028 memset(ac_val2, 0, 16 * 2); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3029 if(dc_pred_dir) {//left |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3030 if(use_pred) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3031 memcpy(ac_val2, ac_val, 8 * 2); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3032 if(q2 && q1!=q2) { |
| 4236 | 3033 q1 = q1 * 2 + ((q1 == v->pq) ? v->halfpq : 0) - 1; |
| 3034 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
|
3035 for(k = 1; k < 8; k++) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3036 ac_val2[k] = (ac_val2[k] * q2 * vc1_dqscale[q1 - 1] + 0x20000) >> 18; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3037 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3038 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3039 } else {//top |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3040 if(use_pred) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3041 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
|
3042 if(q2 && q1!=q2) { |
| 4236 | 3043 q1 = q1 * 2 + ((q1 == v->pq) ? v->halfpq : 0) - 1; |
| 3044 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
|
3045 for(k = 1; k < 8; k++) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3046 ac_val2[k + 8] = (ac_val2[k + 8] * q2 * vc1_dqscale[q1 - 1] + 0x20000) >> 18; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3047 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3048 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3049 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3050 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3051 /* apply AC prediction if needed */ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3052 if(use_pred) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3053 if(dc_pred_dir) { //left |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3054 for(k = 1; k < 8; k++) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3055 block[k << 3] = ac_val2[k] * scale; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3056 if(!v->pquantizer && block[k << 3]) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3057 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
|
3058 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3059 } else { //top |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3060 for(k = 1; k < 8; k++) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3061 block[k] = ac_val2[k + 8] * scale; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3062 if(!v->pquantizer && block[k]) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3063 block[k] += (block[k] < 0) ? -mquant : mquant; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3064 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3065 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3066 i = 63; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3067 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3068 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3069 s->block_last_index[n] = i; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3070 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3071 return 0; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3072 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3073 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3074 /** 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
|
3075 * @param v VC1Context |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3076 * @param block block to decode |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3077 * @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
|
3078 * @param mquant block quantizer |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3079 * @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
|
3080 */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3081 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
|
3082 { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3083 GetBitContext *gb = &v->s.gb; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3084 MpegEncContext *s = &v->s; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3085 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
|
3086 int run_diff, i; |
| 3781 | 3087 int16_t *dc_val; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3088 int16_t *ac_val, *ac_val2; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3089 int dcdiff; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3090 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
|
3091 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
|
3092 int use_pred = s->ac_pred; |
|
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
3093 int scale; |
| 3429 | 3094 int q1, q2 = 0; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3095 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3096 /* 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
|
3097 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
|
3098 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3099 /* 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
|
3100 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
|
3101 s->c_dc_scale = s->c_dc_scale_table[mquant]; |
| 3359 | 3102 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3103 /* Get DC differential */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3104 if (n < 4) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3105 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
|
3106 } else { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3107 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
|
3108 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3109 if (dcdiff < 0){ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3110 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
|
3111 return -1; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3112 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3113 if (dcdiff) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3114 { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3115 if (dcdiff == 119 /* ESC index value */) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3116 { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3117 /* TODO: Optimize */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3118 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
|
3119 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
|
3120 else dcdiff = get_bits(gb, 8); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3121 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3122 else |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3123 { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3124 if (mquant == 1) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3125 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
|
3126 else if (mquant == 2) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3127 dcdiff = (dcdiff<<1) + get_bits(gb, 1) - 1; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3128 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3129 if (get_bits(gb, 1)) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3130 dcdiff = -dcdiff; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3131 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3132 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3133 /* Prediction */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3134 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
|
3135 *dc_val = dcdiff; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3136 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3137 /* 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
|
3138 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3139 if (n < 4) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3140 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
|
3141 } else { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3142 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
|
3143 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3144 /* Skip ? */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3145 run_diff = 0; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3146 i = 0; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3147 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3148 //AC Decoding |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3149 i = 1; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3150 |
|
3399
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
3151 /* 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
|
3152 if(!a_avail) dc_pred_dir = 1; |
|
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
3153 if(!c_avail) dc_pred_dir = 0; |
|
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
3154 if(!a_avail && !c_avail) use_pred = 0; |
|
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
3155 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
|
3156 ac_val2 = ac_val; |
|
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
3157 |
| 3475 | 3158 scale = mquant * 2 + v->halfpq; |
|
3399
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
3159 |
|
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
3160 if(dc_pred_dir) //left |
|
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
3161 ac_val -= 16; |
|
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
3162 else //top |
|
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
3163 ac_val -= 16 * s->block_wrap[n]; |
|
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
3164 |
| 3429 | 3165 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
|
3166 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
|
3167 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
|
3168 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
|
3169 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
|
3170 if(n==3) q2 = q1; |
| 3429 | 3171 |
|
3399
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
3172 if(coded) { |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3173 int last = 0, skip, value; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3174 const int8_t *zz_table; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3175 int k; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3176 |
|
3363
4c5227327416
VC1 Intra blocks in P-frames use different zigzag table than I-frames.
kostya
parents:
3360
diff
changeset
|
3177 zz_table = vc1_simple_progressive_8x8_zz; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3178 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3179 while (!last) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3180 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
|
3181 i += skip; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3182 if(i > 63) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3183 break; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3184 block[zz_table[i++]] = value; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3185 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3186 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3187 /* apply AC prediction if needed */ |
|
3378
d7dda9fd99c8
Adjust AC prediction if (some) predictors are not available.
kostya
parents:
3377
diff
changeset
|
3188 if(use_pred) { |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3189 /* scale predictors if needed*/ |
| 3429 | 3190 if(q2 && q1!=q2) { |
| 4236 | 3191 q1 = q1 * 2 + ((q1 == v->pq) ? v->halfpq : 0) - 1; |
| 3192 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
|
3193 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3194 if(dc_pred_dir) { //left |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3195 for(k = 1; k < 8; k++) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3196 block[k << 3] += (ac_val[k] * q2 * vc1_dqscale[q1 - 1] + 0x20000) >> 18; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3197 } else { //top |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3198 for(k = 1; k < 8; k++) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3199 block[k] += (ac_val[k + 8] * q2 * vc1_dqscale[q1 - 1] + 0x20000) >> 18; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3200 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3201 } else { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3202 if(dc_pred_dir) { //left |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3203 for(k = 1; k < 8; k++) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3204 block[k << 3] += ac_val[k]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3205 } else { //top |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3206 for(k = 1; k < 8; k++) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3207 block[k] += ac_val[k + 8]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3208 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3209 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3210 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3211 /* save AC coeffs for further prediction */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3212 for(k = 1; k < 8; k++) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3213 ac_val2[k] = block[k << 3]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3214 ac_val2[k + 8] = block[k]; |
| 3359 | 3215 } |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3216 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3217 /* scale AC coeffs */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3218 for(k = 1; k < 64; k++) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3219 if(block[k]) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3220 block[k] *= scale; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3221 if(!v->pquantizer) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3222 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
|
3223 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3224 |
|
3378
d7dda9fd99c8
Adjust AC prediction if (some) predictors are not available.
kostya
parents:
3377
diff
changeset
|
3225 if(use_pred) i = 63; |
|
3399
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
3226 } else { // no AC coeffs |
|
3c6f5d05560d
vc1_decode_intra_block() simplifications and corrections
kostya
parents:
3396
diff
changeset
|
3227 int k; |
|
3378
d7dda9fd99c8
Adjust AC prediction if (some) predictors are not available.
kostya
parents:
3377
diff
changeset
|
3228 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3229 memset(ac_val2, 0, 16 * 2); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3230 if(dc_pred_dir) {//left |
| 3396 | 3231 if(use_pred) { |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3232 memcpy(ac_val2, ac_val, 8 * 2); |
| 3429 | 3233 if(q2 && q1!=q2) { |
| 4236 | 3234 q1 = q1 * 2 + ((q1 == v->pq) ? v->halfpq : 0) - 1; |
| 3235 q2 = q2 * 2 + ((q2 == v->pq) ? v->halfpq : 0) - 1; | |
| 3396 | 3236 for(k = 1; k < 8; k++) |
| 3237 ac_val2[k] = (ac_val2[k] * q2 * vc1_dqscale[q1 - 1] + 0x20000) >> 18; | |
| 3238 } | |
| 3239 } | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3240 } else {//top |
| 3396 | 3241 if(use_pred) { |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3242 memcpy(ac_val2 + 8, ac_val + 8, 8 * 2); |
| 3429 | 3243 if(q2 && q1!=q2) { |
| 4236 | 3244 q1 = q1 * 2 + ((q1 == v->pq) ? v->halfpq : 0) - 1; |
| 3245 q2 = q2 * 2 + ((q2 == v->pq) ? v->halfpq : 0) - 1; | |
| 3396 | 3246 for(k = 1; k < 8; k++) |
| 3247 ac_val2[k + 8] = (ac_val2[k + 8] * q2 * vc1_dqscale[q1 - 1] + 0x20000) >> 18; | |
| 3248 } | |
| 3249 } | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3250 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3251 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3252 /* apply AC prediction if needed */ |
|
3378
d7dda9fd99c8
Adjust AC prediction if (some) predictors are not available.
kostya
parents:
3377
diff
changeset
|
3253 if(use_pred) { |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3254 if(dc_pred_dir) { //left |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3255 for(k = 1; k < 8; k++) { |
| 3396 | 3256 block[k << 3] = ac_val2[k] * scale; |
| 3509 | 3257 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
|
3258 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
|
3259 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3260 } else { //top |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3261 for(k = 1; k < 8; k++) { |
| 3396 | 3262 block[k] = ac_val2[k + 8] * scale; |
| 3509 | 3263 if(!v->pquantizer && block[k]) |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3264 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
|
3265 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3266 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3267 i = 63; |
| 3359 | 3268 } |
| 3269 } | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3270 s->block_last_index[n] = i; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3271 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3272 return 0; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3273 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3274 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3275 /** Decode P block |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3276 */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3277 static int vc1_decode_p_block(VC1Context *v, DCTELEM block[64], int n, int mquant, int ttmb, int first_block) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3278 { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3279 MpegEncContext *s = &v->s; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3280 GetBitContext *gb = &s->gb; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3281 int i, j; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3282 int subblkpat = 0; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3283 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
|
3284 int ttblk = ttmb & 7; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3285 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3286 if(ttmb == -1) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3287 ttblk = ttblk_to_tt[v->tt_index][get_vlc2(gb, vc1_ttblk_vlc[v->tt_index].table, VC1_TTBLK_VLC_BITS, 1)]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3288 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3289 if(ttblk == TT_4X4) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3290 subblkpat = ~(get_vlc2(gb, vc1_subblkpat_vlc[v->tt_index].table, VC1_SUBBLKPAT_VLC_BITS, 1) + 1); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3291 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3292 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
|
3293 subblkpat = decode012(gb); |
|
3364
59c10b66fbbc
Added loop filtering as ersatz for overlap filter (improves picture quality for coarse quantization).
kostya
parents:
3363
diff
changeset
|
3294 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
|
3295 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
|
3296 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
|
3297 } |
| 3475 | 3298 scale = 2 * mquant + v->halfpq; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3299 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3300 // 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
|
3301 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
|
3302 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
|
3303 ttblk = TT_8X4; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3304 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3305 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
|
3306 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
|
3307 ttblk = TT_4X8; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3308 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3309 switch(ttblk) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3310 case TT_8X8: |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3311 i = 0; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3312 last = 0; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3313 while (!last) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3314 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
|
3315 i += skip; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3316 if(i > 63) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3317 break; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3318 idx = vc1_simple_progressive_8x8_zz[i++]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3319 block[idx] = value * scale; |
| 3475 | 3320 if(!v->pquantizer) |
| 3321 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
|
3322 } |
| 3527 | 3323 s->dsp.vc1_inv_trans_8x8(block); |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3324 break; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3325 case TT_4X4: |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3326 for(j = 0; j < 4; j++) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3327 last = subblkpat & (1 << (3 - j)); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3328 i = 0; |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3329 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
|
3330 while (!last) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3331 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
|
3332 i += skip; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3333 if(i > 15) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3334 break; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3335 idx = vc1_simple_progressive_4x4_zz[i++]; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3336 block[idx + off] = value * scale; |
| 3475 | 3337 if(!v->pquantizer) |
| 3338 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
|
3339 } |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3340 if(!(subblkpat & (1 << (3 - j)))) |
| 3527 | 3341 s->dsp.vc1_inv_trans_4x4(block, j); |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3342 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3343 break; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3344 case TT_8X4: |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3345 for(j = 0; j < 2; j++) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3346 last = subblkpat & (1 << (1 - j)); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3347 i = 0; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3348 off = j * 32; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3349 while (!last) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3350 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
|
3351 i += skip; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3352 if(i > 31) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3353 break; |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3354 if(v->profile < PROFILE_ADVANCED) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3355 idx = vc1_simple_progressive_8x4_zz[i++]; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3356 else |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3357 idx = vc1_adv_progressive_8x4_zz[i++]; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3358 block[idx + off] = value * scale; |
| 3475 | 3359 if(!v->pquantizer) |
| 3360 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
|
3361 } |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3362 if(!(subblkpat & (1 << (1 - j)))) |
| 3527 | 3363 s->dsp.vc1_inv_trans_8x4(block, j); |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3364 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3365 break; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3366 case TT_4X8: |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3367 for(j = 0; j < 2; j++) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3368 last = subblkpat & (1 << (1 - j)); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3369 i = 0; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3370 off = j * 4; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3371 while (!last) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3372 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
|
3373 i += skip; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3374 if(i > 31) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3375 break; |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3376 if(v->profile < PROFILE_ADVANCED) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3377 idx = vc1_simple_progressive_4x8_zz[i++]; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3378 else |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3379 idx = vc1_adv_progressive_4x8_zz[i++]; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3380 block[idx + off] = value * scale; |
| 3475 | 3381 if(!v->pquantizer) |
| 3382 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
|
3383 } |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3384 if(!(subblkpat & (1 << (1 - j)))) |
| 3527 | 3385 s->dsp.vc1_inv_trans_4x8(block, j); |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3386 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3387 break; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3388 } |
| 3359 | 3389 return 0; |
| 3390 } | |
| 3391 | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3392 |
| 3359 | 3393 /** Decode one P-frame MB (in Simple/Main profile) |
| 3394 */ | |
|
3476
33a177588139
Don't pass block[6][64] parameter to decode_p_mb as we always use s->block
kostya
parents:
3475
diff
changeset
|
3395 static int vc1_decode_p_mb(VC1Context *v) |
| 3359 | 3396 { |
| 3397 MpegEncContext *s = &v->s; | |
| 3398 GetBitContext *gb = &s->gb; | |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3399 int i, j; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3400 int mb_pos = s->mb_x + s->mb_y * s->mb_stride; |
| 3359 | 3401 int cbp; /* cbp decoding stuff */ |
| 3402 int mqdiff, mquant; /* MB quantization */ | |
|
3405
58c4fd135462
Correctly choose global transform mode, MV mode and fix bitplane decoding
kostya
parents:
3404
diff
changeset
|
3403 int ttmb = v->ttfrm; /* MB Transform type */ |
| 3359 | 3404 int status; |
| 3405 | |
| 3406 static const int size_table[6] = { 0, 2, 3, 4, 5, 8 }, | |
| 3407 offset_table[6] = { 0, 1, 3, 7, 15, 31 }; | |
| 3408 int mb_has_coeffs = 1; /* last_flag */ | |
| 3409 int dmv_x, dmv_y; /* Differential MV components */ | |
| 3410 int index, index1; /* LUT indices */ | |
| 3411 int val, sign; /* temp values */ | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3412 int first_block = 1; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3413 int dst_idx, off; |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3414 int skipped, fourmv; |
| 3359 | 3415 |
| 3416 mquant = v->pq; /* Loosy initialization */ | |
| 3417 | |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3418 if (v->mv_type_is_raw) |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3419 fourmv = get_bits1(gb); |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3420 else |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3421 fourmv = v->mv_type_mb_plane[mb_pos]; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3422 if (v->skip_is_raw) |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3423 skipped = get_bits1(gb); |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3424 else |
|
3375
a1c2e1603be9
Use MpegEncContext->mbskip_table instead of custom bitplane.
kostya
parents:
3371
diff
changeset
|
3425 skipped = v->s.mbskip_table[mb_pos]; |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3426 |
| 3396 | 3427 s->dsp.clear_blocks(s->block[0]); |
| 3428 | |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3429 if (!fourmv) /* 1MV mode */ |
| 3359 | 3430 { |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3431 if (!skipped) |
| 3359 | 3432 { |
| 3433 GET_MVDATA(dmv_x, dmv_y); | |
| 3434 | |
| 3689 | 3435 if (s->mb_intra) { |
| 3436 s->current_picture.motion_val[1][s->block_index[0]][0] = 0; | |
| 3437 s->current_picture.motion_val[1][s->block_index[0]][1] = 0; | |
| 3438 } | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3439 s->current_picture.mb_type[mb_pos] = s->mb_intra ? MB_TYPE_INTRA : MB_TYPE_16x16; |
| 3396 | 3440 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
|
3441 |
| 3359 | 3442 /* FIXME Set DC val for inter block ? */ |
| 3443 if (s->mb_intra && !mb_has_coeffs) | |
| 3444 { | |
| 3445 GET_MQUANT(); | |
| 3446 s->ac_pred = get_bits(gb, 1); | |
| 3447 cbp = 0; | |
| 3448 } | |
| 3449 else if (mb_has_coeffs) | |
| 3450 { | |
| 3451 if (s->mb_intra) s->ac_pred = get_bits(gb, 1); | |
| 3452 cbp = get_vlc2(&v->s.gb, v->cbpcy_vlc->table, VC1_CBPCY_P_VLC_BITS, 2); | |
| 3453 GET_MQUANT(); | |
| 3454 } | |
| 3455 else | |
| 3456 { | |
| 3457 mquant = v->pq; | |
| 3458 cbp = 0; | |
| 3459 } | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3460 s->current_picture.qscale_table[mb_pos] = mquant; |
| 3359 | 3461 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3462 if (!v->ttmbf && !s->mb_intra && mb_has_coeffs) |
| 3359 | 3463 ttmb = get_vlc2(gb, vc1_ttmb_vlc[v->tt_index].table, |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3464 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
|
3465 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
|
3466 dst_idx = 0; |
| 3359 | 3467 for (i=0; i<6; i++) |
| 3468 { | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3469 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
|
3470 dst_idx += i >> 2; |
| 3359 | 3471 val = ((cbp >> (5 - i)) & 1); |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3472 off = (i & 4) ? 0 : ((i & 1) * 8 + (i & 2) * 4 * s->linesize); |
| 3396 | 3473 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
|
3474 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
|
3475 /* 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
|
3476 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
|
3477 if(i == 2 || i == 3 || !s->first_slice_line) |
| 3396 | 3478 v->a_avail = v->mb_type[0][s->block_index[i] - s->block_wrap[i]]; |
| 3479 if(i == 1 || i == 3 || s->mb_x) | |
| 3480 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
|
3481 |
|
3476
33a177588139
Don't pass block[6][64] parameter to decode_p_mb as we always use s->block
kostya
parents:
3475
diff
changeset
|
3482 vc1_decode_intra_block(v, s->block[i], i, val, mquant, (i&4)?v->codingset2:v->codingset); |
| 3521 | 3483 if((i>3) && (s->flags & CODEC_FLAG_GRAY)) continue; |
| 3527 | 3484 s->dsp.vc1_inv_trans_8x8(s->block[i]); |
| 3522 | 3485 if(v->rangeredfrm) for(j = 0; j < 64; j++) s->block[i][j] <<= 1; |
|
3476
33a177588139
Don't pass block[6][64] parameter to decode_p_mb as we always use s->block
kostya
parents:
3475
diff
changeset
|
3486 for(j = 0; j < 64; j++) s->block[i][j] += 128; |
| 4604 | 3487 if(!v->res_fasttx && v->res_x8) for(j = 0; j < 64; j++) s->block[i][j] += 16; |
|
3476
33a177588139
Don't pass block[6][64] parameter to decode_p_mb as we always use s->block
kostya
parents:
3475
diff
changeset
|
3488 s->dsp.put_pixels_clamped(s->block[i], s->dest[dst_idx] + off, s->linesize >> ((i & 4) >> 2)); |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3489 if(v->pq >= 9 && v->overlap) { |
| 4209 | 3490 if(v->c_avail) |
| 4239 | 3491 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
|
3492 if(v->a_avail) |
| 4239 | 3493 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
|
3494 } |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3495 } else if(val) { |
|
3476
33a177588139
Don't pass block[6][64] parameter to decode_p_mb as we always use s->block
kostya
parents:
3475
diff
changeset
|
3496 vc1_decode_p_block(v, s->block[i], i, mquant, ttmb, first_block); |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3497 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
|
3498 first_block = 0; |
| 3521 | 3499 if((i<4) || !(s->flags & CODEC_FLAG_GRAY)) |
| 3500 s->dsp.add_pixels_clamped(s->block[i], s->dest[dst_idx] + off, (i&4)?s->uvlinesize:s->linesize); | |
| 3359 | 3501 } |
| 3502 } | |
| 3503 } | |
| 3504 else //Skipped | |
| 3505 { | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3506 s->mb_intra = 0; |
|
3507
44e0a262d500
Set DC = 0 for skipped MB as it interferes DC prediction
kostya
parents:
3506
diff
changeset
|
3507 for(i = 0; i < 6; i++) { |
|
44e0a262d500
Set DC = 0 for skipped MB as it interferes DC prediction
kostya
parents:
3506
diff
changeset
|
3508 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
|
3509 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
|
3510 } |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3511 s->current_picture.mb_type[mb_pos] = MB_TYPE_SKIP; |
| 3396 | 3512 s->current_picture.qscale_table[mb_pos] = 0; |
| 3513 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
|
3514 vc1_mc_1mv(v, 0); |
| 3359 | 3515 return 0; |
| 3516 } | |
| 3517 } //1MV mode | |
| 3518 else //4MV mode | |
| 3396 | 3519 { |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
3520 if (!skipped /* unskipped MB */) |
| 3359 | 3521 { |
| 3396 | 3522 int intra_count = 0, coded_inter = 0; |
| 3523 int is_intra[6], is_coded[6]; | |
| 3359 | 3524 /* Get CBPCY */ |
| 3525 cbp = get_vlc2(&v->s.gb, v->cbpcy_vlc->table, VC1_CBPCY_P_VLC_BITS, 2); | |
| 3396 | 3526 for (i=0; i<6; i++) |
| 3359 | 3527 { |
| 3528 val = ((cbp >> (5 - i)) & 1); | |
| 3396 | 3529 s->dc_val[0][s->block_index[i]] = 0; |
| 3530 s->mb_intra = 0; | |
| 3531 if(i < 4) { | |
| 3532 dmv_x = dmv_y = 0; | |
| 3533 s->mb_intra = 0; | |
| 3534 mb_has_coeffs = 0; | |
| 3535 if(val) { | |
| 3536 GET_MVDATA(dmv_x, dmv_y); | |
| 3537 } | |
| 3538 vc1_pred_mv(s, i, dmv_x, dmv_y, 0, v->range_x, v->range_y, v->mb_type[0]); | |
| 3539 if(!s->mb_intra) vc1_mc_4mv_luma(v, i); | |
| 3540 intra_count += s->mb_intra; | |
| 3541 is_intra[i] = s->mb_intra; | |
| 3542 is_coded[i] = mb_has_coeffs; | |
| 3543 } | |
| 3544 if(i&4){ | |
| 3545 is_intra[i] = (intra_count >= 3); | |
| 3546 is_coded[i] = val; | |
| 3359 | 3547 } |
| 3396 | 3548 if(i == 4) vc1_mc_4mv_chroma(v); |
| 3549 v->mb_type[0][s->block_index[i]] = is_intra[i]; | |
| 3550 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
|
3551 } |
| 3453 | 3552 // if there are no coded blocks then don't do anything more |
| 3514 | 3553 if(!intra_count && !coded_inter) return 0; |
| 3396 | 3554 dst_idx = 0; |
| 3555 GET_MQUANT(); | |
| 3556 s->current_picture.qscale_table[mb_pos] = mquant; | |
| 3557 /* test if block is intra and has pred */ | |
| 3558 { | |
| 3559 int intrapred = 0; | |
| 3560 for(i=0; i<6; i++) | |
| 3561 if(is_intra[i]) { | |
|
3449
ec6096b1ab04
Use s->first_slice_line in checks instead of s->mb_y
kostya
parents:
3430
diff
changeset
|
3562 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
|
3563 || ((s->mb_x || (i==1 || i==3)) && v->mb_type[0][s->block_index[i] - 1])) { |
| 3396 | 3564 intrapred = 1; |
| 3565 break; | |
| 3566 } | |
| 3567 } | |
| 3568 if(intrapred)s->ac_pred = get_bits(gb, 1); | |
| 3569 else s->ac_pred = 0; | |
| 3570 } | |
| 3571 if (!v->ttmbf && coded_inter) | |
| 3514 | 3572 ttmb = get_vlc2(gb, vc1_ttmb_vlc[v->tt_index].table, VC1_TTMB_VLC_BITS, 2); |
| 3396 | 3573 for (i=0; i<6; i++) |
| 3574 { | |
| 3575 dst_idx += i >> 2; | |
| 3576 off = (i & 4) ? 0 : ((i & 1) * 8 + (i & 2) * 4 * s->linesize); | |
| 3577 s->mb_intra = is_intra[i]; | |
| 3578 if (is_intra[i]) { | |
| 3579 /* check if prediction blocks A and C are available */ | |
| 3580 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
|
3581 if(i == 2 || i == 3 || !s->first_slice_line) |
| 3396 | 3582 v->a_avail = v->mb_type[0][s->block_index[i] - s->block_wrap[i]]; |
| 3583 if(i == 1 || i == 3 || s->mb_x) | |
| 3584 v->c_avail = v->mb_type[0][s->block_index[i] - 1]; | |
| 3359 | 3585 |
| 3396 | 3586 vc1_decode_intra_block(v, s->block[i], i, is_coded[i], mquant, (i&4)?v->codingset2:v->codingset); |
| 3521 | 3587 if((i>3) && (s->flags & CODEC_FLAG_GRAY)) continue; |
| 3527 | 3588 s->dsp.vc1_inv_trans_8x8(s->block[i]); |
| 3522 | 3589 if(v->rangeredfrm) for(j = 0; j < 64; j++) s->block[i][j] <<= 1; |
|
3476
33a177588139
Don't pass block[6][64] parameter to decode_p_mb as we always use s->block
kostya
parents:
3475
diff
changeset
|
3590 for(j = 0; j < 64; j++) s->block[i][j] += 128; |
| 4604 | 3591 if(!v->res_fasttx && v->res_x8) for(j = 0; j < 64; j++) s->block[i][j] += 16; |
|
3400
84de54d536bd
4-MV mode final fixes (now it works for non-exotic modes)
kostya
parents:
3399
diff
changeset
|
3592 s->dsp.put_pixels_clamped(s->block[i], s->dest[dst_idx] + off, (i&4)?s->uvlinesize:s->linesize); |
| 3396 | 3593 if(v->pq >= 9 && v->overlap) { |
| 4209 | 3594 if(v->c_avail) |
| 4239 | 3595 s->dsp.vc1_h_overlap(s->dest[dst_idx] + off, s->linesize >> ((i & 4) >> 2)); |
| 3396 | 3596 if(v->a_avail) |
| 4239 | 3597 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
|
3598 } |
| 3396 | 3599 } else if(is_coded[i]) { |
| 3600 status = vc1_decode_p_block(v, s->block[i], i, mquant, ttmb, first_block); | |
| 3601 if(!v->ttmbf && ttmb < 8) ttmb = -1; | |
| 3602 first_block = 0; | |
| 3521 | 3603 if((i<4) || !(s->flags & CODEC_FLAG_GRAY)) |
| 3604 s->dsp.add_pixels_clamped(s->block[i], s->dest[dst_idx] + off, (i&4)?s->uvlinesize:s->linesize); | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3605 } |
| 3359 | 3606 } |
| 3607 return status; | |
| 3608 } | |
| 3609 else //Skipped MB | |
| 3610 { | |
|
3400
84de54d536bd
4-MV mode final fixes (now it works for non-exotic modes)
kostya
parents:
3399
diff
changeset
|
3611 s->mb_intra = 0; |
| 3514 | 3612 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
|
3613 for (i=0; i<6; i++) { |
|
44e0a262d500
Set DC = 0 for skipped MB as it interferes DC prediction
kostya
parents:
3506
diff
changeset
|
3614 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
|
3615 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
|
3616 } |
| 3359 | 3617 for (i=0; i<4; i++) |
| 3618 { | |
| 3396 | 3619 vc1_pred_mv(s, i, 0, 0, 0, v->range_x, v->range_y, v->mb_type[0]); |
| 3620 vc1_mc_4mv_luma(v, i); | |
| 3359 | 3621 } |
| 3396 | 3622 vc1_mc_4mv_chroma(v); |
| 3623 s->current_picture.qscale_table[mb_pos] = 0; | |
| 3359 | 3624 return 0; |
| 3625 } | |
| 3626 } | |
| 3627 | |
| 3628 /* Should never happen */ | |
| 3629 return -1; | |
| 3630 } | |
| 3631 | |
|
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3632 /** 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
|
3633 */ |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3634 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
|
3635 { |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3636 MpegEncContext *s = &v->s; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3637 GetBitContext *gb = &s->gb; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3638 int i, j; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3639 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
|
3640 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
|
3641 int mqdiff, mquant; /* MB quantization */ |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3642 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
|
3643 |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3644 static const int size_table[6] = { 0, 2, 3, 4, 5, 8 }, |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3645 offset_table[6] = { 0, 1, 3, 7, 15, 31 }; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3646 int mb_has_coeffs = 0; /* last_flag */ |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3647 int index, index1; /* LUT indices */ |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3648 int val, sign; /* temp values */ |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3649 int first_block = 1; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3650 int dst_idx, off; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3651 int skipped, direct; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3652 int dmv_x[2], dmv_y[2]; |
|
3690
35aae593db08
[Cosmetics] Remove some done TODOs/FIXMEs from comments
kostya
parents:
3689
diff
changeset
|
3653 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
|
3654 |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3655 mquant = v->pq; /* Loosy initialization */ |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3656 s->mb_intra = 0; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3657 |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3658 if (v->dmb_is_raw) |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3659 direct = get_bits1(gb); |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3660 else |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3661 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
|
3662 if (v->skip_is_raw) |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3663 skipped = get_bits1(gb); |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3664 else |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3665 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
|
3666 |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3667 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
|
3668 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
|
3669 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
|
3670 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
|
3671 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
|
3672 } |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3673 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
|
3674 |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3675 if (!direct) { |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3676 if (!skipped) { |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3677 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
|
3678 dmv_x[1] = dmv_x[0]; |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
3679 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
|
3680 } |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3681 if(skipped || !s->mb_intra) { |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3682 bmvtype = decode012(gb); |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3683 switch(bmvtype) { |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3684 case 0: |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3685 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
|
3686 break; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3687 case 1: |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3688 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
|
3689 break; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3690 case 2: |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3691 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
|
3692 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
|
3693 } |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3694 } |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3695 } |
| 3689 | 3696 for(i = 0; i < 6; i++) |
| 3697 v->mb_type[0][s->block_index[i]] = s->mb_intra; | |
| 3698 | |
|
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3699 if (skipped) { |
| 3689 | 3700 if(direct) bmvtype = BMV_TYPE_INTERPOLATED; |
| 3701 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
|
3702 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
|
3703 return; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3704 } |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3705 if (direct) { |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3706 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
|
3707 GET_MQUANT(); |
|
3553
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
3708 s->mb_intra = 0; |
|
a542b0325239
Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents:
3552
diff
changeset
|
3709 mb_has_coeffs = 0; |
|
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3710 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
|
3711 if(!v->ttmbf) |
|
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3712 ttmb = get_vlc2(gb, vc1_ttmb_vlc[v->tt_index].table, VC1_TTMB_VLC_BITS, 2); |
| 3689 | 3713 dmv_x[0] = dmv_y[0] = dmv_x[1] = dmv_y[1] = 0; |
| 3714 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
|
3715 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
|
3716 } else { |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3717 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
|
3718 /* no coded blocks - effectively skipped */ |
| 3689 | 3719 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
|
3720 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
|
3721 return; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3722 } |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3723 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
|
3724 GET_MQUANT(); |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3725 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
|
3726 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
|
3727 cbp = 0; |
| 3689 | 3728 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
|
3729 } else { |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3730 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
|
3731 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
|
3732 if(!mb_has_coeffs) { |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3733 /* interpolated skipped block */ |
| 3689 | 3734 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
|
3735 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
|
3736 return; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3737 } |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3738 } |
| 3689 | 3739 vc1_pred_b_mv(v, dmv_x, dmv_y, direct, bmvtype); |
| 3740 if(!s->mb_intra) { | |
|
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3741 vc1_b_mc(v, dmv_x, dmv_y, direct, bmvtype); |
| 3689 | 3742 } |
|
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3743 if(s->mb_intra) |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3744 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
|
3745 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
|
3746 GET_MQUANT(); |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3747 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
|
3748 if(!v->ttmbf && !s->mb_intra && mb_has_coeffs) |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3749 ttmb = get_vlc2(gb, vc1_ttmb_vlc[v->tt_index].table, VC1_TTMB_VLC_BITS, 2); |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3750 } |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3751 } |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3752 dst_idx = 0; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3753 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
|
3754 { |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3755 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
|
3756 dst_idx += i >> 2; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3757 val = ((cbp >> (5 - i)) & 1); |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3758 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
|
3759 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
|
3760 if(s->mb_intra) { |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3761 /* 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
|
3762 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
|
3763 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
|
3764 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
|
3765 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
|
3766 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
|
3767 |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3768 vc1_decode_intra_block(v, s->block[i], i, val, mquant, (i&4)?v->codingset2:v->codingset); |
| 3521 | 3769 if((i>3) && (s->flags & CODEC_FLAG_GRAY)) continue; |
| 3527 | 3770 s->dsp.vc1_inv_trans_8x8(s->block[i]); |
| 3522 | 3771 if(v->rangeredfrm) for(j = 0; j < 64; j++) s->block[i][j] <<= 1; |
|
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3772 for(j = 0; j < 64; j++) s->block[i][j] += 128; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3773 s->dsp.put_pixels_clamped(s->block[i], s->dest[dst_idx] + off, s->linesize >> ((i & 4) >> 2)); |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3774 } else if(val) { |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3775 vc1_decode_p_block(v, s->block[i], i, mquant, ttmb, first_block); |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3776 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
|
3777 first_block = 0; |
| 3521 | 3778 if((i<4) || !(s->flags & CODEC_FLAG_GRAY)) |
| 3779 s->dsp.add_pixels_clamped(s->block[i], s->dest[dst_idx] + off, (i&4)?s->uvlinesize:s->linesize); | |
|
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3780 } |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3781 } |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3782 } |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
3783 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3784 /** Decode blocks of I-frame |
| 3359 | 3785 */ |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3786 static void vc1_decode_i_blocks(VC1Context *v) |
| 3359 | 3787 { |
| 3450 | 3788 int k, j; |
| 3359 | 3789 MpegEncContext *s = &v->s; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3790 int cbp, val; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3791 uint8_t *coded_val; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3792 int mb_pos; |
| 3359 | 3793 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3794 /* select codingmode used for VLC tables selection */ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3795 switch(v->y_ac_table_index){ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3796 case 0: |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3797 v->codingset = (v->pqindex <= 8) ? CS_HIGH_RATE_INTRA : CS_LOW_MOT_INTRA; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3798 break; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3799 case 1: |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3800 v->codingset = CS_HIGH_MOT_INTRA; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3801 break; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3802 case 2: |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3803 v->codingset = CS_MID_RATE_INTRA; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3804 break; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3805 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3806 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3807 switch(v->c_ac_table_index){ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3808 case 0: |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3809 v->codingset2 = (v->pqindex <= 8) ? CS_HIGH_RATE_INTER : CS_LOW_MOT_INTER; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3810 break; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3811 case 1: |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3812 v->codingset2 = CS_HIGH_MOT_INTER; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3813 break; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3814 case 2: |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3815 v->codingset2 = CS_MID_RATE_INTER; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3816 break; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3817 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3818 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3819 /* 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
|
3820 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
|
3821 s->c_dc_scale = s->c_dc_scale_table[v->pq]; |
| 3359 | 3822 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3823 //do frame decode |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3824 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
|
3825 s->mb_intra = 1; |
|
3449
ec6096b1ab04
Use s->first_slice_line in checks instead of s->mb_y
kostya
parents:
3430
diff
changeset
|
3826 s->first_slice_line = 1; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3827 ff_er_add_slice(s, 0, 0, s->mb_width - 1, s->mb_height - 1, (AC_END|DC_END|MV_END)); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3828 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
|
3829 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
|
3830 ff_init_block_index(s); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3831 ff_update_block_index(s); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3832 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
|
3833 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
|
3834 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
|
3835 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
|
3836 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
|
3837 s->current_picture.motion_val[1][s->block_index[0]][1] = 0; |
| 3359 | 3838 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3839 // do actual MB decoding and displaying |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3840 cbp = get_vlc2(&v->s.gb, ff_msmp4_mb_i_vlc.table, MB_INTRA_VLC_BITS, 2); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3841 v->s.ac_pred = get_bits(&v->s.gb, 1); |
| 3359 | 3842 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3843 for(k = 0; k < 6; k++) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3844 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
|
3845 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3846 if (k < 4) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3847 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
|
3848 val = val ^ pred; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3849 *coded_val = val; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3850 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3851 cbp |= val << (5 - k); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3852 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3853 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
|
3854 |
| 3527 | 3855 s->dsp.vc1_inv_trans_8x8(s->block[k]); |
| 4741 | 3856 if(!v->res_fasttx && !v->res_x8) for(j = 0; j < 64; j++) s->block[k][j] -= 16; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3857 if(v->pq >= 9 && v->overlap) { |
| 3450 | 3858 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
|
3859 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3860 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3861 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3862 vc1_put_block(v, s->block); |
|
3690
35aae593db08
[Cosmetics] Remove some done TODOs/FIXMEs from comments
kostya
parents:
3689
diff
changeset
|
3863 if(v->pq >= 9 && v->overlap) { |
| 4209 | 3864 if(s->mb_x) { |
| 4239 | 3865 s->dsp.vc1_h_overlap(s->dest[0], s->linesize); |
| 3866 s->dsp.vc1_h_overlap(s->dest[0] + 8 * s->linesize, s->linesize); | |
| 4209 | 3867 if(!(s->flags & CODEC_FLAG_GRAY)) { |
| 4239 | 3868 s->dsp.vc1_h_overlap(s->dest[1], s->uvlinesize); |
| 3869 s->dsp.vc1_h_overlap(s->dest[2], s->uvlinesize); | |
| 4209 | 3870 } |
| 3871 } | |
| 4239 | 3872 s->dsp.vc1_h_overlap(s->dest[0] + 8, s->linesize); |
| 3873 s->dsp.vc1_h_overlap(s->dest[0] + 8 * s->linesize + 8, s->linesize); | |
| 3450 | 3874 if(!s->first_slice_line) { |
| 4239 | 3875 s->dsp.vc1_v_overlap(s->dest[0], s->linesize); |
| 3876 s->dsp.vc1_v_overlap(s->dest[0] + 8, s->linesize); | |
| 3521 | 3877 if(!(s->flags & CODEC_FLAG_GRAY)) { |
| 4239 | 3878 s->dsp.vc1_v_overlap(s->dest[1], s->uvlinesize); |
| 3879 s->dsp.vc1_v_overlap(s->dest[2], s->uvlinesize); | |
| 3521 | 3880 } |
|
3364
59c10b66fbbc
Added loop filtering as ersatz for overlap filter (improves picture quality for coarse quantization).
kostya
parents:
3363
diff
changeset
|
3881 } |
| 4239 | 3882 s->dsp.vc1_v_overlap(s->dest[0] + 8 * s->linesize, s->linesize); |
| 3883 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
|
3884 } |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3885 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3886 if(get_bits_count(&s->gb) > v->bits) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3887 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
|
3888 return; |
| 3359 | 3889 } |
| 3890 } | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
3891 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
|
3892 s->first_slice_line = 0; |
| 3359 | 3893 } |
| 3894 } | |
| 3895 | |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3896 /** 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
|
3897 */ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3898 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
|
3899 { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3900 int k, j; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3901 MpegEncContext *s = &v->s; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3902 int cbp, val; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3903 uint8_t *coded_val; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3904 int mb_pos; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3905 int mquant = v->pq; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3906 int mqdiff; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3907 int overlap; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3908 GetBitContext *gb = &s->gb; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3909 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3910 /* select codingmode used for VLC tables selection */ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3911 switch(v->y_ac_table_index){ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3912 case 0: |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3913 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
|
3914 break; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3915 case 1: |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3916 v->codingset = CS_HIGH_MOT_INTRA; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3917 break; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3918 case 2: |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3919 v->codingset = CS_MID_RATE_INTRA; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3920 break; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3921 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3922 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3923 switch(v->c_ac_table_index){ |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3924 case 0: |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3925 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
|
3926 break; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3927 case 1: |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3928 v->codingset2 = CS_HIGH_MOT_INTER; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3929 break; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3930 case 2: |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3931 v->codingset2 = CS_MID_RATE_INTER; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3932 break; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3933 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3934 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3935 //do frame decode |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3936 s->mb_x = s->mb_y = 0; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3937 s->mb_intra = 1; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3938 s->first_slice_line = 1; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3939 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
|
3940 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
|
3941 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
|
3942 ff_init_block_index(s); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3943 ff_update_block_index(s); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3944 s->dsp.clear_blocks(s->block[0]); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3945 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
|
3946 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
|
3947 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
|
3948 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
|
3949 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3950 // do actual MB decoding and displaying |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3951 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
|
3952 if(v->acpred_is_raw) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3953 v->s.ac_pred = get_bits(&v->s.gb, 1); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3954 else |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3955 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
|
3956 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3957 if(v->condover == CONDOVER_SELECT) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3958 if(v->overflg_is_raw) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3959 overlap = get_bits(&v->s.gb, 1); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3960 else |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3961 overlap = v->over_flags_plane[mb_pos]; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3962 } else |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3963 overlap = (v->condover == CONDOVER_ALL); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3964 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3965 GET_MQUANT(); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3966 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3967 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
|
3968 /* 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
|
3969 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
|
3970 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
|
3971 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3972 for(k = 0; k < 6; k++) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3973 val = ((cbp >> (5 - k)) & 1); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3974 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3975 if (k < 4) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3976 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
|
3977 val = val ^ pred; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3978 *coded_val = val; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3979 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3980 cbp |= val << (5 - k); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3981 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3982 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
|
3983 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
|
3984 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3985 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
|
3986 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3987 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
|
3988 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
|
3989 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3990 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3991 vc1_put_block(v, s->block); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
3992 if(overlap) { |
| 4209 | 3993 if(s->mb_x) { |
| 4239 | 3994 s->dsp.vc1_h_overlap(s->dest[0], s->linesize); |
| 3995 s->dsp.vc1_h_overlap(s->dest[0] + 8 * s->linesize, s->linesize); | |
| 4209 | 3996 if(!(s->flags & CODEC_FLAG_GRAY)) { |
| 4239 | 3997 s->dsp.vc1_h_overlap(s->dest[1], s->uvlinesize); |
| 3998 s->dsp.vc1_h_overlap(s->dest[2], s->uvlinesize); | |
| 4209 | 3999 } |
| 4000 } | |
| 4239 | 4001 s->dsp.vc1_h_overlap(s->dest[0] + 8, s->linesize); |
| 4002 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
|
4003 if(!s->first_slice_line) { |
| 4239 | 4004 s->dsp.vc1_v_overlap(s->dest[0], s->linesize); |
| 4005 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
|
4006 if(!(s->flags & CODEC_FLAG_GRAY)) { |
| 4239 | 4007 s->dsp.vc1_v_overlap(s->dest[1], s->uvlinesize); |
| 4008 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
|
4009 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4010 } |
| 4239 | 4011 s->dsp.vc1_v_overlap(s->dest[0] + 8 * s->linesize, s->linesize); |
| 4012 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
|
4013 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4014 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4015 if(get_bits_count(&s->gb) > v->bits) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4016 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
|
4017 return; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4018 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4019 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4020 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
|
4021 s->first_slice_line = 0; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4022 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4023 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4024 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4025 static void vc1_decode_p_blocks(VC1Context *v) |
| 3359 | 4026 { |
| 4027 MpegEncContext *s = &v->s; | |
| 4028 | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4029 /* 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
|
4030 switch(v->c_ac_table_index){ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4031 case 0: |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4032 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
|
4033 break; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4034 case 1: |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4035 v->codingset = CS_HIGH_MOT_INTRA; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4036 break; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4037 case 2: |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4038 v->codingset = CS_MID_RATE_INTRA; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4039 break; |
| 3359 | 4040 } |
| 4041 | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4042 switch(v->c_ac_table_index){ |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4043 case 0: |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4044 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
|
4045 break; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4046 case 1: |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4047 v->codingset2 = CS_HIGH_MOT_INTER; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4048 break; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4049 case 2: |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4050 v->codingset2 = CS_MID_RATE_INTER; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4051 break; |
| 3359 | 4052 } |
| 4053 | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4054 ff_er_add_slice(s, 0, 0, s->mb_width - 1, s->mb_height - 1, (AC_END|DC_END|MV_END)); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4055 s->first_slice_line = 1; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4056 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
|
4057 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
|
4058 ff_init_block_index(s); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4059 ff_update_block_index(s); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4060 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
|
4061 |
|
3476
33a177588139
Don't pass block[6][64] parameter to decode_p_mb as we always use s->block
kostya
parents:
3475
diff
changeset
|
4062 vc1_decode_p_mb(v); |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4063 if(get_bits_count(&s->gb) > v->bits || get_bits_count(&s->gb) < 0) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4064 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
|
4065 return; |
| 3359 | 4066 } |
| 4067 } | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4068 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
|
4069 s->first_slice_line = 0; |
| 3359 | 4070 } |
| 4071 } | |
| 4072 | |
|
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
4073 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
|
4074 { |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
4075 MpegEncContext *s = &v->s; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
4076 |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
4077 /* 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
|
4078 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
|
4079 case 0: |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
4080 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
|
4081 break; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
4082 case 1: |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
4083 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
|
4084 break; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
4085 case 2: |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
4086 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
|
4087 break; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
4088 } |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
4089 |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
4090 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
|
4091 case 0: |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
4092 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
|
4093 break; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
4094 case 1: |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
4095 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
|
4096 break; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
4097 case 2: |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
4098 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
|
4099 break; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
4100 } |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
4101 |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
4102 ff_er_add_slice(s, 0, 0, s->mb_width - 1, s->mb_height - 1, (AC_END|DC_END|MV_END)); |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
4103 s->first_slice_line = 1; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
4104 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
|
4105 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
|
4106 ff_init_block_index(s); |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
4107 ff_update_block_index(s); |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
4108 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
|
4109 |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
4110 vc1_decode_b_mb(v); |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
4111 if(get_bits_count(&s->gb) > v->bits || get_bits_count(&s->gb) < 0) { |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
4112 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
|
4113 return; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
4114 } |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
4115 } |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
4116 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
|
4117 s->first_slice_line = 0; |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
4118 } |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
4119 } |
|
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
4120 |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4121 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
|
4122 { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4123 MpegEncContext *s = &v->s; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4124 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4125 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
|
4126 s->first_slice_line = 1; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4127 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
|
4128 s->mb_x = 0; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4129 ff_init_block_index(s); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4130 ff_update_block_index(s); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4131 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
|
4132 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
|
4133 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
|
4134 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
|
4135 s->first_slice_line = 0; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4136 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4137 s->pict_type = P_TYPE; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4138 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4139 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4140 static void vc1_decode_blocks(VC1Context *v) |
| 3359 | 4141 { |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4142 |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4143 v->s.esc3_level_length = 0; |
| 3359 | 4144 |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4145 switch(v->s.pict_type) { |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4146 case I_TYPE: |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4147 if(v->profile == PROFILE_ADVANCED) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4148 vc1_decode_i_blocks_adv(v); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4149 else |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4150 vc1_decode_i_blocks(v); |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4151 break; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4152 case P_TYPE: |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4153 if(v->p_frame_skipped) |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4154 vc1_decode_skip_blocks(v); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4155 else |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4156 vc1_decode_p_blocks(v); |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4157 break; |
|
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
4158 case B_TYPE: |
| 4433 | 4159 if(v->bi_type){ |
| 4160 if(v->profile == PROFILE_ADVANCED) | |
| 4161 vc1_decode_i_blocks_adv(v); | |
| 4162 else | |
| 4163 vc1_decode_i_blocks(v); | |
| 4164 }else | |
| 3689 | 4165 vc1_decode_b_blocks(v); |
|
3515
20938be7b67b
Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents:
3514
diff
changeset
|
4166 break; |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4167 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4168 } |
| 3359 | 4169 |
| 4464 | 4170 #define IS_MARKER(x) (((x) & ~0xFF) == VC1_CODE_RES0) |
| 4462 | 4171 |
| 4172 /** Find VC-1 marker in buffer | |
| 4173 * @return position where next marker starts or end of buffer if no marker found | |
| 4174 */ | |
| 4175 static av_always_inline uint8_t* find_next_marker(uint8_t *src, uint8_t *end) | |
| 4176 { | |
| 4177 uint32_t mrk = 0xFFFFFFFF; | |
| 4178 | |
| 4179 if(end-src < 4) return end; | |
| 4180 while(src < end){ | |
| 4181 mrk = (mrk << 8) | *src++; | |
| 4182 if(IS_MARKER(mrk)) | |
| 4183 return src-4; | |
| 4184 } | |
| 4185 return end; | |
| 4186 } | |
| 4187 | |
| 4188 static av_always_inline int vc1_unescape_buffer(uint8_t *src, int size, uint8_t *dst) | |
| 4189 { | |
| 4190 int dsize = 0, i; | |
| 4191 | |
| 4192 if(size < 4){ | |
| 4193 for(dsize = 0; dsize < size; dsize++) *dst++ = *src++; | |
| 4194 return size; | |
| 4195 } | |
| 4196 for(i = 0; i < size; i++, src++) { | |
| 4197 if(src[0] == 3 && i >= 2 && !src[-1] && !src[-2] && i < size-1 && src[1] < 4) { | |
| 4198 dst[dsize++] = src[1]; | |
| 4199 src++; | |
| 4200 i++; | |
| 4201 } else | |
| 4202 dst[dsize++] = *src; | |
| 4203 } | |
| 4204 return dsize; | |
| 4205 } | |
| 3359 | 4206 |
| 4207 /** Initialize a VC1/WMV3 decoder | |
| 4208 * @todo TODO: Handle VC-1 IDUs (Transport level?) | |
| 4209 * @todo TODO: Decypher remaining bits in extra_data | |
| 4210 */ | |
| 4211 static int vc1_decode_init(AVCodecContext *avctx) | |
| 4212 { | |
| 4213 VC1Context *v = avctx->priv_data; | |
| 4214 MpegEncContext *s = &v->s; | |
| 4215 GetBitContext gb; | |
| 4216 | |
| 4217 if (!avctx->extradata_size || !avctx->extradata) return -1; | |
| 3521 | 4218 if (!(avctx->flags & CODEC_FLAG_GRAY)) |
| 4219 avctx->pix_fmt = PIX_FMT_YUV420P; | |
| 4220 else | |
| 4221 avctx->pix_fmt = PIX_FMT_GRAY8; | |
| 3359 | 4222 v->s.avctx = avctx; |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
4223 avctx->flags |= CODEC_FLAG_EMU_EDGE; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
4224 v->s.flags |= CODEC_FLAG_EMU_EDGE; |
| 3359 | 4225 |
| 4226 if(ff_h263_decode_init(avctx) < 0) | |
| 4227 return -1; | |
| 4228 if (vc1_init_common(v) < 0) return -1; | |
| 4229 | |
| 4230 avctx->coded_width = avctx->width; | |
| 4231 avctx->coded_height = avctx->height; | |
| 4232 if (avctx->codec_id == CODEC_ID_WMV3) | |
| 4233 { | |
| 4234 int count = 0; | |
| 4235 | |
| 4236 // looks like WMV3 has a sequence header stored in the extradata | |
| 4237 // advanced sequence header may be before the first frame | |
| 4238 // the last byte of the extradata is a version number, 1 for the | |
| 4239 // samples we can decode | |
| 4240 | |
| 4241 init_get_bits(&gb, avctx->extradata, avctx->extradata_size*8); | |
| 4242 | |
| 4243 if (decode_sequence_header(avctx, &gb) < 0) | |
| 4244 return -1; | |
| 4245 | |
| 4246 count = avctx->extradata_size*8 - get_bits_count(&gb); | |
| 4247 if (count>0) | |
| 4248 { | |
| 4249 av_log(avctx, AV_LOG_INFO, "Extra data: %i bits left, value: %X\n", | |
| 4250 count, get_bits(&gb, count)); | |
| 4251 } | |
| 4252 else if (count < 0) | |
| 4253 { | |
| 4254 av_log(avctx, AV_LOG_INFO, "Read %i bits in overflow\n", -count); | |
| 4255 } | |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4256 } else { // VC1/WVC1 |
| 4462 | 4257 uint8_t *start = avctx->extradata, *end = avctx->extradata + avctx->extradata_size; |
| 4258 uint8_t *next; int size, buf2_size; | |
| 4259 uint8_t *buf2 = NULL; | |
| 4260 int seq_inited = 0, ep_inited = 0; | |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4261 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4262 if(avctx->extradata_size < 16) { |
| 4462 | 4263 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
|
4264 return -1; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4265 } |
| 4462 | 4266 |
| 4267 buf2 = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); | |
| 4268 if(start[0]) start++; // in WVC1 extradata first byte is its size | |
| 4269 next = start; | |
| 4270 for(; next < end; start = next){ | |
| 4271 next = find_next_marker(start + 4, end); | |
| 4272 size = next - start - 4; | |
| 4273 if(size <= 0) continue; | |
| 4274 buf2_size = vc1_unescape_buffer(start + 4, size, buf2); | |
| 4275 init_get_bits(&gb, buf2, buf2_size * 8); | |
| 4276 switch(AV_RB32(start)){ | |
| 4277 case VC1_CODE_SEQHDR: | |
| 4278 if(decode_sequence_header(avctx, &gb) < 0){ | |
| 4279 av_free(buf2); | |
| 4280 return -1; | |
| 4281 } | |
| 4282 seq_inited = 1; | |
| 4283 break; | |
| 4284 case VC1_CODE_ENTRYPOINT: | |
| 4285 if(decode_entry_point(avctx, &gb) < 0){ | |
| 4286 av_free(buf2); | |
| 4287 return -1; | |
| 4288 } | |
| 4289 ep_inited = 1; | |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4290 break; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4291 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4292 } |
| 4462 | 4293 av_free(buf2); |
| 4294 if(!seq_inited || !ep_inited){ | |
| 4295 av_log(avctx, AV_LOG_ERROR, "Incomplete extradata\n"); | |
| 4296 return -1; | |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4297 } |
| 3359 | 4298 } |
| 4299 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
|
4300 s->low_delay = !avctx->has_b_frames; |
| 3359 | 4301 |
| 4302 s->mb_width = (avctx->coded_width+15)>>4; | |
| 4303 s->mb_height = (avctx->coded_height+15)>>4; | |
| 4304 | |
| 4305 /* Allocate mb bitplanes */ | |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
4306 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
|
4307 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
|
4308 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
|
4309 v->over_flags_plane = av_malloc(s->mb_stride * s->mb_height); |
| 3359 | 4310 |
| 3396 | 4311 /* allocate block type info in that way so it could be used with s->block_index[] */ |
| 4312 v->mb_type_base = av_malloc(s->b8_stride * (s->mb_height * 2 + 1) + s->mb_stride * (s->mb_height + 1) * 2); | |
| 4313 v->mb_type[0] = v->mb_type_base + s->b8_stride + 1; | |
| 4314 v->mb_type[1] = v->mb_type_base + s->b8_stride * (s->mb_height * 2 + 1) + s->mb_stride + 1; | |
| 4315 v->mb_type[2] = v->mb_type[1] + s->mb_stride * (s->mb_height + 1); | |
| 4316 | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4317 /* Init coded blocks info */ |
| 3359 | 4318 if (v->profile == PROFILE_ADVANCED) |
| 4319 { | |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
4320 // 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
|
4321 // return -1; |
|
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
4322 // 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
|
4323 // return -1; |
| 3359 | 4324 } |
| 4325 | |
| 4326 return 0; | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4327 } |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4328 |
| 3359 | 4329 |
| 4330 /** Decode a VC1/WMV3 frame | |
| 4331 * @todo TODO: Handle VC-1 IDUs (Transport level?) | |
| 4332 */ | |
| 4333 static int vc1_decode_frame(AVCodecContext *avctx, | |
| 4334 void *data, int *data_size, | |
| 4335 uint8_t *buf, int buf_size) | |
| 4336 { | |
| 4337 VC1Context *v = avctx->priv_data; | |
| 4338 MpegEncContext *s = &v->s; | |
| 4339 AVFrame *pict = data; | |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4340 uint8_t *buf2 = NULL; |
| 3359 | 4341 |
| 4342 /* no supplementary picture */ | |
| 4343 if (buf_size == 0) { | |
| 4344 /* special case for last picture */ | |
| 4345 if (s->low_delay==0 && s->next_picture_ptr) { | |
| 4346 *pict= *(AVFrame*)s->next_picture_ptr; | |
| 4347 s->next_picture_ptr= NULL; | |
| 4348 | |
| 4349 *data_size = sizeof(AVFrame); | |
| 4350 } | |
| 4351 | |
| 4352 return 0; | |
| 4353 } | |
| 4354 | |
| 4355 //we need to set current_picture_ptr before reading the header, otherwise we cant store anyting im there | |
| 4356 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
|
4357 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
|
4358 s->current_picture_ptr= &s->picture[i]; |
| 3359 | 4359 } |
| 4360 | |
| 4462 | 4361 //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
|
4362 if (avctx->codec_id == CODEC_ID_VC1) { |
| 4462 | 4363 int buf_size2 = 0; |
| 4364 buf2 = av_mallocz(buf_size + FF_INPUT_BUFFER_PADDING_SIZE); | |
| 4365 | |
| 4366 if(IS_MARKER(AV_RB32(buf))){ /* frame starts with marker and needs to be parsed */ | |
| 4367 uint8_t *dst = buf2, *start, *end, *next; | |
| 4368 int size; | |
| 4369 | |
| 4370 next = buf; | |
| 4371 for(start = buf, end = buf + buf_size; next < end; start = next){ | |
| 4372 next = find_next_marker(start + 4, end); | |
| 4373 size = next - start - 4; | |
| 4374 if(size <= 0) continue; | |
| 4375 switch(AV_RB32(start)){ | |
| 4376 case VC1_CODE_FRAME: | |
| 4377 buf_size2 = vc1_unescape_buffer(start + 4, size, buf2); | |
| 4378 break; | |
| 4379 case VC1_CODE_ENTRYPOINT: /* it should be before frame data */ | |
| 4380 buf_size2 = vc1_unescape_buffer(start + 4, size, buf2); | |
| 4381 init_get_bits(&s->gb, buf2, buf_size2*8); | |
| 4382 decode_entry_point(avctx, &s->gb); | |
| 4383 break; | |
| 4384 case VC1_CODE_SLICE: | |
| 4385 av_log(avctx, AV_LOG_ERROR, "Sliced decoding is not implemented (yet)\n"); | |
| 4386 av_free(buf2); | |
| 4387 return -1; | |
| 4388 } | |
| 4389 } | |
| 4390 }else if(v->interlace && ((buf[0] & 0xC0) == 0xC0)){ /* WVC1 interlaced stores both fields divided by marker */ | |
| 4391 uint8_t *divider; | |
| 4392 | |
| 4393 divider = find_next_marker(buf, buf + buf_size); | |
| 4394 if((divider == (buf + buf_size)) || AV_RB32(divider) != VC1_CODE_FIELD){ | |
| 4395 av_log(avctx, AV_LOG_ERROR, "Error in WVC1 interlaced frame\n"); | |
| 4396 return -1; | |
| 4397 } | |
| 4398 | |
| 4399 buf_size2 = vc1_unescape_buffer(buf, divider - buf, buf2); | |
| 4400 // TODO | |
| 4401 av_free(buf2);return -1; | |
| 4402 }else{ | |
| 4403 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
|
4404 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4405 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
|
4406 } else |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4407 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
|
4408 // do parse frame header |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4409 if(v->profile < PROFILE_ADVANCED) { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4410 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
|
4411 av_free(buf2); |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4412 return -1; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4413 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4414 } else { |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4415 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
|
4416 av_free(buf2); |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4417 return -1; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4418 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4419 } |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4420 |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4421 if(s->pict_type != I_TYPE && !v->res_rtm_flag){ |
|
3694
8765ee4eaa45
Drop unneeded checks before av_free() and change to av_freep() where it's more suitable.
kostya
parents:
3693
diff
changeset
|
4422 av_free(buf2); |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4423 return -1; |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4424 } |
| 3359 | 4425 |
| 4426 // for hurry_up==5 | |
| 4427 s->current_picture.pict_type= s->pict_type; | |
| 4428 s->current_picture.key_frame= s->pict_type == I_TYPE; | |
| 4429 | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4430 /* skip B-frames if we don't have reference frames */ |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4431 if(s->last_picture_ptr==NULL && (s->pict_type==B_TYPE || s->dropable)){ |
|
3694
8765ee4eaa45
Drop unneeded checks before av_free() and change to av_freep() where it's more suitable.
kostya
parents:
3693
diff
changeset
|
4432 av_free(buf2); |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4433 return -1;//buf_size; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4434 } |
| 3359 | 4435 /* skip b frames if we are in a hurry */ |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4436 if(avctx->hurry_up && s->pict_type==B_TYPE) return -1;//buf_size; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4437 if( (avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type==B_TYPE) |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4438 || (avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type!=I_TYPE) |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4439 || 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
|
4440 av_free(buf2); |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4441 return buf_size; |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4442 } |
| 3359 | 4443 /* 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
|
4444 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
|
4445 av_free(buf2); |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4446 return -1;//buf_size; |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4447 } |
| 3359 | 4448 |
| 4449 if(s->next_p_frame_damaged){ | |
| 4450 if(s->pict_type==B_TYPE) | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4451 return buf_size; |
| 3359 | 4452 else |
| 4453 s->next_p_frame_damaged=0; | |
| 4454 } | |
| 4455 | |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4456 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
|
4457 av_free(buf2); |
| 3359 | 4458 return -1; |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4459 } |
| 3359 | 4460 |
| 4461 ff_er_frame_start(s); | |
| 4462 | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4463 v->bits = buf_size * 8; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4464 vc1_decode_blocks(v); |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4465 //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
|
4466 // 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
|
4467 // return -1; |
| 3359 | 4468 ff_er_frame_end(s); |
| 4469 | |
| 4470 MPV_frame_end(s); | |
| 4471 | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4472 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
|
4473 assert(s->current_picture.pict_type == s->pict_type); |
| 3359 | 4474 if (s->pict_type == B_TYPE || s->low_delay) { |
| 4475 *pict= *(AVFrame*)s->current_picture_ptr; | |
| 4476 } else if (s->last_picture_ptr != NULL) { | |
| 4477 *pict= *(AVFrame*)s->last_picture_ptr; | |
| 4478 } | |
| 4479 | |
| 4480 if(s->last_picture_ptr || s->low_delay){ | |
| 4481 *data_size = sizeof(AVFrame); | |
| 4482 ff_print_debug_info(s, pict); | |
| 4483 } | |
| 4484 | |
| 4485 /* Return the Picture timestamp as the frame number */ | |
| 4486 /* we substract 1 because it is added on utils.c */ | |
| 4487 avctx->frame_number = s->picture_number - 1; | |
| 4488 | |
|
3694
8765ee4eaa45
Drop unneeded checks before av_free() and change to av_freep() where it's more suitable.
kostya
parents:
3693
diff
changeset
|
4489 av_free(buf2); |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4490 return buf_size; |
|
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4491 } |
| 3359 | 4492 |
| 4493 | |
| 4494 /** Close a VC1/WMV3 decoder | |
| 4495 * @warning Initial try at using MpegEncContext stuff | |
| 4496 */ | |
| 4497 static int vc1_decode_end(AVCodecContext *avctx) | |
| 4498 { | |
| 4499 VC1Context *v = avctx->priv_data; | |
| 4500 | |
| 4501 av_freep(&v->hrd_rate); | |
| 4502 av_freep(&v->hrd_buffer); | |
| 4503 MPV_common_end(&v->s); | |
|
3367
8c7b8ffc2485
Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents:
3366
diff
changeset
|
4504 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
|
4505 av_freep(&v->direct_mb_plane); |
|
3672
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4506 av_freep(&v->acpred_plane); |
|
9d4583fe8fca
VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents:
3664
diff
changeset
|
4507 av_freep(&v->over_flags_plane); |
| 3396 | 4508 av_freep(&v->mb_type_base); |
| 3359 | 4509 return 0; |
| 4510 } | |
| 4511 | |
|
3360
2c4ddf5b9217
VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents:
3359
diff
changeset
|
4512 |
| 3359 | 4513 AVCodec vc1_decoder = { |
| 4514 "vc1", | |
| 4515 CODEC_TYPE_VIDEO, | |
| 4516 CODEC_ID_VC1, | |
| 4517 sizeof(VC1Context), | |
| 4518 vc1_decode_init, | |
| 4519 NULL, | |
| 4520 vc1_decode_end, | |
| 4521 vc1_decode_frame, | |
| 4522 CODEC_CAP_DELAY, | |
| 4523 NULL | |
| 4524 }; | |
| 4525 | |
| 4526 AVCodec wmv3_decoder = { | |
| 4527 "wmv3", | |
| 4528 CODEC_TYPE_VIDEO, | |
| 4529 CODEC_ID_WMV3, | |
| 4530 sizeof(VC1Context), | |
| 4531 vc1_decode_init, | |
| 4532 NULL, | |
| 4533 vc1_decode_end, | |
| 4534 vc1_decode_frame, | |
| 4535 CODEC_CAP_DELAY, | |
| 4536 NULL | |
| 4537 }; | |
| 4465 | 4538 |
| 4539 #ifdef CONFIG_VC1_PARSER | |
| 4540 /** | |
| 4541 * finds the end of the current frame in the bitstream. | |
| 4542 * @return the position of the first byte of the next frame, or -1 | |
| 4543 */ | |
| 4544 static int vc1_find_frame_end(ParseContext *pc, const uint8_t *buf, | |
| 4545 int buf_size) { | |
| 4546 int pic_found, i; | |
| 4547 uint32_t state; | |
| 4548 | |
| 4549 pic_found= pc->frame_start_found; | |
| 4550 state= pc->state; | |
| 4551 | |
| 4552 i=0; | |
| 4553 if(!pic_found){ | |
| 4554 for(i=0; i<buf_size; i++){ | |
| 4555 state= (state<<8) | buf[i]; | |
| 4556 if(state == VC1_CODE_FRAME || state == VC1_CODE_FIELD){ | |
| 4557 i++; | |
| 4558 pic_found=1; | |
| 4559 break; | |
| 4560 } | |
| 4561 } | |
| 4562 } | |
| 4563 | |
| 4564 if(pic_found){ | |
| 4565 /* EOF considered as end of frame */ | |
| 4566 if (buf_size == 0) | |
| 4567 return 0; | |
| 4568 for(; i<buf_size; i++){ | |
| 4569 state= (state<<8) | buf[i]; | |
| 4570 if(IS_MARKER(state) && state != VC1_CODE_FIELD && state != VC1_CODE_SLICE){ | |
| 4571 pc->frame_start_found=0; | |
| 4572 pc->state=-1; | |
| 4573 return i-3; | |
| 4574 } | |
| 4575 } | |
| 4576 } | |
| 4577 pc->frame_start_found= pic_found; | |
| 4578 pc->state= state; | |
| 4579 return END_NOT_FOUND; | |
| 4580 } | |
| 4581 | |
| 4582 static int vc1_parse(AVCodecParserContext *s, | |
| 4583 AVCodecContext *avctx, | |
| 4584 uint8_t **poutbuf, int *poutbuf_size, | |
| 4585 const uint8_t *buf, int buf_size) | |
| 4586 { | |
| 4587 ParseContext *pc = s->priv_data; | |
| 4588 int next; | |
| 4589 | |
| 4590 if(s->flags & PARSER_FLAG_COMPLETE_FRAMES){ | |
| 4591 next= buf_size; | |
| 4592 }else{ | |
| 4593 next= vc1_find_frame_end(pc, buf, buf_size); | |
| 4594 | |
| 4595 if (ff_combine_frame(pc, next, (uint8_t **)&buf, &buf_size) < 0) { | |
| 4596 *poutbuf = NULL; | |
| 4597 *poutbuf_size = 0; | |
| 4598 return buf_size; | |
| 4599 } | |
| 4600 } | |
| 4601 *poutbuf = (uint8_t *)buf; | |
| 4602 *poutbuf_size = buf_size; | |
| 4603 return next; | |
| 4604 } | |
| 4605 | |
| 4784 | 4606 static int vc1_split(AVCodecContext *avctx, |
| 4465 | 4607 const uint8_t *buf, int buf_size) |
| 4608 { | |
| 4609 int i; | |
| 4610 uint32_t state= -1; | |
| 4611 | |
| 4612 for(i=0; i<buf_size; i++){ | |
| 4613 state= (state<<8) | buf[i]; | |
| 4614 if(IS_MARKER(state) && state != VC1_CODE_SEQHDR && state != VC1_CODE_ENTRYPOINT) | |
| 4615 return i-3; | |
| 4616 } | |
| 4617 return 0; | |
| 4618 } | |
| 4619 | |
| 4620 AVCodecParser vc1_parser = { | |
| 4621 { CODEC_ID_VC1 }, | |
| 4622 sizeof(ParseContext1), | |
| 4623 NULL, | |
| 4624 vc1_parse, | |
| 4625 ff_parse1_close, | |
| 4626 vc1_split, | |
| 4627 }; | |
| 4628 #endif /* CONFIG_VC1_PARSER */ |
