Mercurial > libavcodec.hg
annotate svq3.c @ 8031:eebc7209c47f libavcodec
Convert asm keyword into __asm__.
Neither the asm() nor the __asm__() keyword is part of the C99
standard, but while GCC accepts the former in C89 syntax, it is not
accepted in C99 unless GNU extensions are turned on (with -fasm). The
latter form is accepted in any syntax as an extension (without
requiring further command-line options).
Sun Studio C99 compiler also does not accept asm() while accepting
__asm__(), albeit reporting warnings that it's not valid C99 syntax.
author | flameeyes |
---|---|
date | Thu, 16 Oct 2008 13:34:09 +0000 |
parents | 086563096ac5 |
children | e7e67a20ff4d |
rev | line source |
---|---|
1234 | 1 /* |
2 * Copyright (c) 2003 The FFmpeg Project. | |
3 * | |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3036
diff
changeset
|
4 * This file is part of FFmpeg. |
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3036
diff
changeset
|
5 * |
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3036
diff
changeset
|
6 * FFmpeg is free software; you can redistribute it and/or |
1234 | 7 * modify it under the terms of the GNU Lesser General Public |
8 * 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:
3036
diff
changeset
|
9 * version 2.1 of the License, or (at your option) any later version. |
1234 | 10 * |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3036
diff
changeset
|
11 * FFmpeg is distributed in the hope that it will be useful, |
1234 | 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
14 * Lesser General Public License for more details. | |
15 * | |
16 * 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:
3036
diff
changeset
|
17 * License along with FFmpeg; if not, write to the Free Software |
3036
0b546eab515d
Update licensing information: The FSF changed postal address.
diego
parents:
2979
diff
changeset
|
18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
5215 | 19 */ |
20 | |
21 /* | |
1234 | 22 * How to use this decoder: |
23 * SVQ3 data is transported within Apple Quicktime files. Quicktime files | |
1235
8bb75c3c2f21
change the way the ImageDescription is passed to the decoder
tmmm
parents:
1234
diff
changeset
|
24 * have stsd atoms to describe media trak properties. A stsd atom for a |
8bb75c3c2f21
change the way the ImageDescription is passed to the decoder
tmmm
parents:
1234
diff
changeset
|
25 * video trak contains 1 or more ImageDescription atoms. These atoms begin |
8bb75c3c2f21
change the way the ImageDescription is passed to the decoder
tmmm
parents:
1234
diff
changeset
|
26 * with the 4-byte length of the atom followed by the codec fourcc. Some |
8bb75c3c2f21
change the way the ImageDescription is passed to the decoder
tmmm
parents:
1234
diff
changeset
|
27 * decoders need information in this atom to operate correctly. Such |
8bb75c3c2f21
change the way the ImageDescription is passed to the decoder
tmmm
parents:
1234
diff
changeset
|
28 * is the case with SVQ3. In order to get the best use out of this decoder, |
8bb75c3c2f21
change the way the ImageDescription is passed to the decoder
tmmm
parents:
1234
diff
changeset
|
29 * the calling app must make the SVQ3 ImageDescription atom available |
1234 | 30 * via the AVCodecContext's extradata[_size] field: |
31 * | |
2967 | 32 * AVCodecContext.extradata = pointer to ImageDescription, first characters |
1235
8bb75c3c2f21
change the way the ImageDescription is passed to the decoder
tmmm
parents:
1234
diff
changeset
|
33 * are expected to be 'S', 'V', 'Q', and '3', NOT the 4-byte atom length |
2967 | 34 * AVCodecContext.extradata_size = size of ImageDescription atom memory |
35 * buffer (which will be the same as the ImageDescription atom size field | |
1235
8bb75c3c2f21
change the way the ImageDescription is passed to the decoder
tmmm
parents:
1234
diff
changeset
|
36 * from the QT file, minus 4 bytes since the length is missing) |
8bb75c3c2f21
change the way the ImageDescription is passed to the decoder
tmmm
parents:
1234
diff
changeset
|
37 * |
8bb75c3c2f21
change the way the ImageDescription is passed to the decoder
tmmm
parents:
1234
diff
changeset
|
38 * You will know you have these parameters passed correctly when the decoder |
8bb75c3c2f21
change the way the ImageDescription is passed to the decoder
tmmm
parents:
1234
diff
changeset
|
39 * correctly decodes this file: |
8bb75c3c2f21
change the way the ImageDescription is passed to the decoder
tmmm
parents:
1234
diff
changeset
|
40 * ftp://ftp.mplayerhq.hu/MPlayer/samples/V-codecs/SVQ3/Vertical400kbit.sorenson3.mov |
1234 | 41 */ |
2967 | 42 |
8027
086563096ac5
Include zlib.h as it is needed for watermark support,
michael
parents:
7291
diff
changeset
|
43 #ifdef CONFIG_ZLIB |
086563096ac5
Include zlib.h as it is needed for watermark support,
michael
parents:
7291
diff
changeset
|
44 #include <zlib.h> |
086563096ac5
Include zlib.h as it is needed for watermark support,
michael
parents:
7291
diff
changeset
|
45 #endif |
086563096ac5
Include zlib.h as it is needed for watermark support,
michael
parents:
7291
diff
changeset
|
46 |
1234 | 47 /** |
48 * @file svq3.c | |
49 * svq3 decoder. | |
50 */ | |
51 | |
2967 | 52 #define FULLPEL_MODE 1 |
53 #define HALFPEL_MODE 2 | |
1265 | 54 #define THIRDPEL_MODE 3 |
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
55 #define PREDICT_MODE 4 |
2967 | 56 |
1252 | 57 /* dual scan (from some older h264 draft) |
58 o-->o-->o o | |
59 | /| | |
60 o o o / o | |
61 | / | |/ | | |
62 o o o o | |
2967 | 63 / |
1252 | 64 o-->o-->o-->o |
65 */ | |
1234 | 66 static const uint8_t svq3_scan[16]={ |
67 0+0*4, 1+0*4, 2+0*4, 2+1*4, | |
68 2+2*4, 3+0*4, 3+1*4, 3+2*4, | |
69 0+1*4, 0+2*4, 1+1*4, 1+2*4, | |
70 0+3*4, 1+3*4, 2+3*4, 3+3*4, | |
71 }; | |
72 | |
73 static const uint8_t svq3_pred_0[25][2] = { | |
74 { 0, 0 }, | |
75 { 1, 0 }, { 0, 1 }, | |
76 { 0, 2 }, { 1, 1 }, { 2, 0 }, | |
77 { 3, 0 }, { 2, 1 }, { 1, 2 }, { 0, 3 }, | |
78 { 0, 4 }, { 1, 3 }, { 2, 2 }, { 3, 1 }, { 4, 0 }, | |
79 { 4, 1 }, { 3, 2 }, { 2, 3 }, { 1, 4 }, | |
80 { 2, 4 }, { 3, 3 }, { 4, 2 }, | |
81 { 4, 3 }, { 3, 4 }, | |
82 { 4, 4 } | |
83 }; | |
84 | |
85 static const int8_t svq3_pred_1[6][6][5] = { | |
86 { { 2,-1,-1,-1,-1 }, { 2, 1,-1,-1,-1 }, { 1, 2,-1,-1,-1 }, | |
87 { 2, 1,-1,-1,-1 }, { 1, 2,-1,-1,-1 }, { 1, 2,-1,-1,-1 } }, | |
88 { { 0, 2,-1,-1,-1 }, { 0, 2, 1, 4, 3 }, { 0, 1, 2, 4, 3 }, | |
89 { 0, 2, 1, 4, 3 }, { 2, 0, 1, 3, 4 }, { 0, 4, 2, 1, 3 } }, | |
90 { { 2, 0,-1,-1,-1 }, { 2, 1, 0, 4, 3 }, { 1, 2, 4, 0, 3 }, | |
91 { 2, 1, 0, 4, 3 }, { 2, 1, 4, 3, 0 }, { 1, 2, 4, 0, 3 } }, | |
92 { { 2, 0,-1,-1,-1 }, { 2, 0, 1, 4, 3 }, { 1, 2, 0, 4, 3 }, | |
93 { 2, 1, 0, 4, 3 }, { 2, 1, 3, 4, 0 }, { 2, 4, 1, 0, 3 } }, | |
94 { { 0, 2,-1,-1,-1 }, { 0, 2, 1, 3, 4 }, { 1, 2, 3, 0, 4 }, | |
95 { 2, 0, 1, 3, 4 }, { 2, 1, 3, 0, 4 }, { 2, 0, 4, 3, 1 } }, | |
96 { { 0, 2,-1,-1,-1 }, { 0, 2, 4, 1, 3 }, { 1, 4, 2, 0, 3 }, | |
97 { 4, 2, 0, 1, 3 }, { 2, 0, 1, 4, 3 }, { 4, 2, 1, 0, 3 } }, | |
98 }; | |
99 | |
100 static const struct { uint8_t run; uint8_t level; } svq3_dct_tables[2][16] = { | |
101 { { 0, 0 }, { 0, 1 }, { 1, 1 }, { 2, 1 }, { 0, 2 }, { 3, 1 }, { 4, 1 }, { 5, 1 }, | |
102 { 0, 3 }, { 1, 2 }, { 2, 2 }, { 6, 1 }, { 7, 1 }, { 8, 1 }, { 9, 1 }, { 0, 4 } }, | |
103 { { 0, 0 }, { 0, 1 }, { 1, 1 }, { 0, 2 }, { 2, 1 }, { 0, 3 }, { 0, 4 }, { 0, 5 }, | |
104 { 3, 1 }, { 4, 1 }, { 1, 2 }, { 1, 3 }, { 0, 6 }, { 0, 7 }, { 0, 8 }, { 0, 9 } } | |
105 }; | |
106 | |
107 static const uint32_t svq3_dequant_coeff[32] = { | |
108 3881, 4351, 4890, 5481, 6154, 6914, 7761, 8718, | |
109 9781, 10987, 12339, 13828, 15523, 17435, 19561, 21873, | |
110 24552, 27656, 30847, 34870, 38807, 43747, 49103, 54683, | |
111 61694, 68745, 77615, 89113,100253,109366,126635,141533 | |
112 }; | |
113 | |
114 | |
115 static void svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp){ | |
116 const int qmul= svq3_dequant_coeff[qp]; | |
117 #define stride 16 | |
118 int i; | |
119 int temp[16]; | |
120 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride}; | |
121 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride}; | |
122 | |
123 for(i=0; i<4; i++){ | |
124 const int offset= y_offset[i]; | |
125 const int z0= 13*(block[offset+stride*0] + block[offset+stride*4]); | |
126 const int z1= 13*(block[offset+stride*0] - block[offset+stride*4]); | |
127 const int z2= 7* block[offset+stride*1] - 17*block[offset+stride*5]; | |
128 const int z3= 17* block[offset+stride*1] + 7*block[offset+stride*5]; | |
129 | |
130 temp[4*i+0]= z0+z3; | |
131 temp[4*i+1]= z1+z2; | |
132 temp[4*i+2]= z1-z2; | |
133 temp[4*i+3]= z0-z3; | |
134 } | |
135 | |
136 for(i=0; i<4; i++){ | |
137 const int offset= x_offset[i]; | |
138 const int z0= 13*(temp[4*0+i] + temp[4*2+i]); | |
139 const int z1= 13*(temp[4*0+i] - temp[4*2+i]); | |
140 const int z2= 7* temp[4*1+i] - 17*temp[4*3+i]; | |
141 const int z3= 17* temp[4*1+i] + 7*temp[4*3+i]; | |
142 | |
143 block[stride*0 +offset]= ((z0 + z3)*qmul + 0x80000)>>20; | |
144 block[stride*2 +offset]= ((z1 + z2)*qmul + 0x80000)>>20; | |
145 block[stride*8 +offset]= ((z1 - z2)*qmul + 0x80000)>>20; | |
146 block[stride*10+offset]= ((z0 - z3)*qmul + 0x80000)>>20; | |
147 } | |
148 } | |
149 #undef stride | |
150 | |
151 static void svq3_add_idct_c (uint8_t *dst, DCTELEM *block, int stride, int qp, int dc){ | |
152 const int qmul= svq3_dequant_coeff[qp]; | |
153 int i; | |
4176 | 154 uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; |
1234 | 155 |
156 if (dc) { | |
157 dc = 13*13*((dc == 1) ? 1538*block[0] : ((qmul*(block[0] >> 3)) / 2)); | |
158 block[0] = 0; | |
159 } | |
160 | |
161 for (i=0; i < 4; i++) { | |
162 const int z0= 13*(block[0 + 4*i] + block[2 + 4*i]); | |
163 const int z1= 13*(block[0 + 4*i] - block[2 + 4*i]); | |
164 const int z2= 7* block[1 + 4*i] - 17*block[3 + 4*i]; | |
165 const int z3= 17* block[1 + 4*i] + 7*block[3 + 4*i]; | |
166 | |
167 block[0 + 4*i]= z0 + z3; | |
168 block[1 + 4*i]= z1 + z2; | |
169 block[2 + 4*i]= z1 - z2; | |
170 block[3 + 4*i]= z0 - z3; | |
171 } | |
172 | |
173 for (i=0; i < 4; i++) { | |
174 const int z0= 13*(block[i + 4*0] + block[i + 4*2]); | |
175 const int z1= 13*(block[i + 4*0] - block[i + 4*2]); | |
176 const int z2= 7* block[i + 4*1] - 17*block[i + 4*3]; | |
177 const int z3= 17* block[i + 4*1] + 7*block[i + 4*3]; | |
178 const int rr= (dc + 0x80000); | |
179 | |
180 dst[i + stride*0]= cm[ dst[i + stride*0] + (((z0 + z3)*qmul + rr) >> 20) ]; | |
181 dst[i + stride*1]= cm[ dst[i + stride*1] + (((z1 + z2)*qmul + rr) >> 20) ]; | |
182 dst[i + stride*2]= cm[ dst[i + stride*2] + (((z1 - z2)*qmul + rr) >> 20) ]; | |
183 dst[i + stride*3]= cm[ dst[i + stride*3] + (((z0 - z3)*qmul + rr) >> 20) ]; | |
184 } | |
185 } | |
186 | |
187 static inline int svq3_decode_block (GetBitContext *gb, DCTELEM *block, | |
2979 | 188 int index, const int type) { |
1234 | 189 |
190 static const uint8_t *const scan_patterns[4] = | |
191 { luma_dc_zigzag_scan, zigzag_scan, svq3_scan, chroma_dc_scan }; | |
192 | |
193 int run, level, sign, vlc, limit; | |
194 const int intra = (3 * type) >> 2; | |
195 const uint8_t *const scan = scan_patterns[type]; | |
196 | |
197 for (limit=(16 >> intra); index < 16; index=limit, limit+=8) { | |
198 for (; (vlc = svq3_get_ue_golomb (gb)) != 0; index++) { | |
199 | |
200 if (vlc == INVALID_VLC) | |
2979 | 201 return -1; |
1234 | 202 |
203 sign = (vlc & 0x1) - 1; | |
204 vlc = (vlc + 1) >> 1; | |
205 | |
206 if (type == 3) { | |
2979 | 207 if (vlc < 3) { |
208 run = 0; | |
209 level = vlc; | |
210 } else if (vlc < 4) { | |
211 run = 1; | |
212 level = 1; | |
213 } else { | |
214 run = (vlc & 0x3); | |
215 level = ((vlc + 9) >> 2) - run; | |
216 } | |
1234 | 217 } else { |
2979 | 218 if (vlc < 16) { |
219 run = svq3_dct_tables[intra][vlc].run; | |
220 level = svq3_dct_tables[intra][vlc].level; | |
221 } else if (intra) { | |
222 run = (vlc & 0x7); | |
223 level = (vlc >> 3) + ((run == 0) ? 8 : ((run < 2) ? 2 : ((run < 5) ? 0 : -1))); | |
224 } else { | |
225 run = (vlc & 0xF); | |
226 level = (vlc >> 4) + ((run == 0) ? 4 : ((run < 3) ? 2 : ((run < 10) ? 1 : 0))); | |
227 } | |
1234 | 228 } |
229 | |
230 if ((index += run) >= limit) | |
2979 | 231 return -1; |
1234 | 232 |
233 block[scan[index]] = (level ^ sign) - sign; | |
234 } | |
235 | |
236 if (type != 2) { | |
237 break; | |
238 } | |
239 } | |
240 | |
241 return 0; | |
242 } | |
243 | |
1319 | 244 static inline void svq3_mc_dir_part (MpegEncContext *s, |
2979 | 245 int x, int y, int width, int height, |
246 int mx, int my, int dxy, | |
247 int thirdpel, int dir, int avg) { | |
1319 | 248 |
249 const Picture *pic = (dir == 0) ? &s->last_picture : &s->next_picture; | |
1234 | 250 uint8_t *src, *dest; |
251 int i, emu = 0; | |
1267
85b71f9f7450
moving the svq3 motion compensation stuff to dsputil (this also means that existing optimized halfpel code is used now ...)
michaelni
parents:
1265
diff
changeset
|
252 int blocksize= 2 - (width>>3); //16->0, 8->1, 4->2 |
1234 | 253 |
1265 | 254 mx += x; |
255 my += y; | |
2967 | 256 |
1268 | 257 if (mx < 0 || mx >= (s->h_edge_pos - width - 1) || |
258 my < 0 || my >= (s->v_edge_pos - height - 1)) { | |
1234 | 259 |
260 if ((s->flags & CODEC_FLAG_EMU_EDGE)) { | |
261 emu = 1; | |
262 } | |
263 | |
4594 | 264 mx = av_clip (mx, -16, (s->h_edge_pos - width + 15)); |
265 my = av_clip (my, -16, (s->v_edge_pos - height + 15)); | |
1234 | 266 } |
267 | |
268 /* form component predictions */ | |
269 dest = s->current_picture.data[0] + x + y*s->linesize; | |
1319 | 270 src = pic->data[0] + mx + my*s->linesize; |
1234 | 271 |
272 if (emu) { | |
1321 | 273 ff_emulated_edge_mc (s->edge_emu_buffer, src, s->linesize, (width + 1), (height + 1), |
2979 | 274 mx, my, s->h_edge_pos, s->v_edge_pos); |
1234 | 275 src = s->edge_emu_buffer; |
276 } | |
1267
85b71f9f7450
moving the svq3 motion compensation stuff to dsputil (this also means that existing optimized halfpel code is used now ...)
michaelni
parents:
1265
diff
changeset
|
277 if(thirdpel) |
1319 | 278 (avg ? s->dsp.avg_tpel_pixels_tab : s->dsp.put_tpel_pixels_tab)[dxy](dest, src, s->linesize, width, height); |
1267
85b71f9f7450
moving the svq3 motion compensation stuff to dsputil (this also means that existing optimized halfpel code is used now ...)
michaelni
parents:
1265
diff
changeset
|
279 else |
1319 | 280 (avg ? s->dsp.avg_pixels_tab : s->dsp.put_pixels_tab)[blocksize][dxy](dest, src, s->linesize, height); |
1234 | 281 |
282 if (!(s->flags & CODEC_FLAG_GRAY)) { | |
2979 | 283 mx = (mx + (mx < (int) x)) >> 1; |
284 my = (my + (my < (int) y)) >> 1; | |
1234 | 285 width = (width >> 1); |
286 height = (height >> 1); | |
1267
85b71f9f7450
moving the svq3 motion compensation stuff to dsputil (this also means that existing optimized halfpel code is used now ...)
michaelni
parents:
1265
diff
changeset
|
287 blocksize++; |
1234 | 288 |
289 for (i=1; i < 3; i++) { | |
290 dest = s->current_picture.data[i] + (x >> 1) + (y >> 1)*s->uvlinesize; | |
1319 | 291 src = pic->data[i] + mx + my*s->uvlinesize; |
1234 | 292 |
293 if (emu) { | |
1321 | 294 ff_emulated_edge_mc (s->edge_emu_buffer, src, s->uvlinesize, (width + 1), (height + 1), |
2979 | 295 mx, my, (s->h_edge_pos >> 1), (s->v_edge_pos >> 1)); |
1321 | 296 src = s->edge_emu_buffer; |
1234 | 297 } |
1267
85b71f9f7450
moving the svq3 motion compensation stuff to dsputil (this also means that existing optimized halfpel code is used now ...)
michaelni
parents:
1265
diff
changeset
|
298 if(thirdpel) |
1319 | 299 (avg ? s->dsp.avg_tpel_pixels_tab : s->dsp.put_tpel_pixels_tab)[dxy](dest, src, s->uvlinesize, width, height); |
1267
85b71f9f7450
moving the svq3 motion compensation stuff to dsputil (this also means that existing optimized halfpel code is used now ...)
michaelni
parents:
1265
diff
changeset
|
300 else |
1319 | 301 (avg ? s->dsp.avg_pixels_tab : s->dsp.put_pixels_tab)[blocksize][dxy](dest, src, s->uvlinesize, height); |
1234 | 302 } |
303 } | |
304 } | |
305 | |
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
306 static inline int svq3_mc_dir (H264Context *h, int size, int mode, int dir, int avg) { |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
307 |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
308 int i, j, k, mx, my, dx, dy, x, y; |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
309 MpegEncContext *const s = (MpegEncContext *) h; |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
310 const int part_width = ((size & 5) == 4) ? 4 : 16 >> (size & 1); |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
311 const int part_height = 16 >> ((unsigned) (size + 1) / 3); |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
312 const int extra_width = (mode == PREDICT_MODE) ? -16*6 : 0; |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
313 const int h_edge_pos = 6*(s->h_edge_pos - part_width ) - extra_width; |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
314 const int v_edge_pos = 6*(s->v_edge_pos - part_height) - extra_width; |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
315 |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
316 for (i=0; i < 16; i+=part_height) { |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
317 for (j=0; j < 16; j+=part_width) { |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
318 const int b_xy = (4*s->mb_x+(j>>2)) + (4*s->mb_y+(i>>2))*h->b_stride; |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
319 int dxy; |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
320 x = 16*s->mb_x + j; |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
321 y = 16*s->mb_y + i; |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
322 k = ((j>>2)&1) + ((i>>1)&2) + ((j>>1)&4) + (i&8); |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
323 |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
324 if (mode != PREDICT_MODE) { |
2979 | 325 pred_motion (h, k, (part_width >> 2), dir, 1, &mx, &my); |
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
326 } else { |
2979 | 327 mx = s->next_picture.motion_val[0][b_xy][0]<<1; |
328 my = s->next_picture.motion_val[0][b_xy][1]<<1; | |
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
329 |
2979 | 330 if (dir == 0) { |
331 mx = ((mx * h->frame_num_offset) / h->prev_frame_num_offset + 1)>>1; | |
332 my = ((my * h->frame_num_offset) / h->prev_frame_num_offset + 1)>>1; | |
333 } else { | |
334 mx = ((mx * (h->frame_num_offset - h->prev_frame_num_offset)) / h->prev_frame_num_offset + 1)>>1; | |
335 my = ((my * (h->frame_num_offset - h->prev_frame_num_offset)) / h->prev_frame_num_offset + 1)>>1; | |
336 } | |
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
337 } |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
338 |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
339 /* clip motion vector prediction to frame border */ |
4594 | 340 mx = av_clip (mx, extra_width - 6*x, h_edge_pos - 6*x); |
341 my = av_clip (my, extra_width - 6*y, v_edge_pos - 6*y); | |
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
342 |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
343 /* get (optional) motion vector differential */ |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
344 if (mode == PREDICT_MODE) { |
2979 | 345 dx = dy = 0; |
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
346 } else { |
2979 | 347 dy = svq3_get_se_golomb (&s->gb); |
348 dx = svq3_get_se_golomb (&s->gb); | |
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
349 |
2979 | 350 if (dx == INVALID_VLC || dy == INVALID_VLC) { |
2452 | 351 av_log(h->s.avctx, AV_LOG_ERROR, "invalid MV vlc\n"); |
2979 | 352 return -1; |
353 } | |
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
354 } |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
355 |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
356 /* compute motion vector */ |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
357 if (mode == THIRDPEL_MODE) { |
2979 | 358 int fx, fy; |
359 mx = ((mx + 1)>>1) + dx; | |
360 my = ((my + 1)>>1) + dy; | |
361 fx= ((unsigned)(mx + 0x3000))/3 - 0x1000; | |
362 fy= ((unsigned)(my + 0x3000))/3 - 0x1000; | |
363 dxy= (mx - 3*fx) + 4*(my - 3*fy); | |
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
364 |
2979 | 365 svq3_mc_dir_part (s, x, y, part_width, part_height, fx, fy, dxy, 1, dir, avg); |
366 mx += mx; | |
367 my += my; | |
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
368 } else if (mode == HALFPEL_MODE || mode == PREDICT_MODE) { |
2979 | 369 mx = ((unsigned)(mx + 1 + 0x3000))/3 + dx - 0x1000; |
370 my = ((unsigned)(my + 1 + 0x3000))/3 + dy - 0x1000; | |
371 dxy= (mx&1) + 2*(my&1); | |
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
372 |
2979 | 373 svq3_mc_dir_part (s, x, y, part_width, part_height, mx>>1, my>>1, dxy, 0, dir, avg); |
374 mx *= 3; | |
375 my *= 3; | |
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
376 } else { |
2979 | 377 mx = ((unsigned)(mx + 3 + 0x6000))/6 + dx - 0x1000; |
378 my = ((unsigned)(my + 3 + 0x6000))/6 + dy - 0x1000; | |
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
379 |
2979 | 380 svq3_mc_dir_part (s, x, y, part_width, part_height, mx, my, 0, 0, dir, avg); |
381 mx *= 6; | |
382 my *= 6; | |
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
383 } |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
384 |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
385 /* update mv_cache */ |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
386 if (mode != PREDICT_MODE) { |
2979 | 387 int32_t mv = pack16to32(mx,my); |
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
388 |
2979 | 389 if (part_height == 8 && i < 8) { |
390 *(int32_t *) h->mv_cache[dir][scan8[k] + 1*8] = mv; | |
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
391 |
2979 | 392 if (part_width == 8 && j < 8) { |
393 *(int32_t *) h->mv_cache[dir][scan8[k] + 1 + 1*8] = mv; | |
394 } | |
395 } | |
396 if (part_width == 8 && j < 8) { | |
397 *(int32_t *) h->mv_cache[dir][scan8[k] + 1] = mv; | |
398 } | |
399 if (part_width == 4 || part_height == 4) { | |
400 *(int32_t *) h->mv_cache[dir][scan8[k]] = mv; | |
401 } | |
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
402 } |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
403 |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
404 /* write back motion vectors */ |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
405 fill_rectangle(s->current_picture.motion_val[dir][b_xy], part_width>>2, part_height>>2, h->b_stride, pack16to32(mx,my), 4); |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
406 } |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
407 } |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
408 |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
409 return 0; |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
410 } |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
411 |
1234 | 412 static int svq3_decode_mb (H264Context *h, unsigned int mb_type) { |
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
413 int i, j, k, m, dir, mode; |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
414 int cbp = 0; |
1234 | 415 uint32_t vlc; |
416 int8_t *top, *left; | |
417 MpegEncContext *const s = (MpegEncContext *) h; | |
6787 | 418 const int mb_xy = h->mb_xy; |
1234 | 419 const int b_xy = 4*s->mb_x + 4*s->mb_y*h->b_stride; |
420 | |
2979 | 421 h->top_samples_available = (s->mb_y == 0) ? 0x33FF : 0xFFFF; |
422 h->left_samples_available = (s->mb_x == 0) ? 0x5F5F : 0xFFFF; | |
423 h->topright_samples_available = 0xFFFF; | |
1234 | 424 |
2979 | 425 if (mb_type == 0) { /* SKIP */ |
6481 | 426 if (s->pict_type == FF_P_TYPE || s->next_picture.mb_type[mb_xy] == -1) { |
1319 | 427 svq3_mc_dir_part (s, 16*s->mb_x, 16*s->mb_y, 16, 16, 0, 0, 0, 0, 0, 0); |
428 | |
6481 | 429 if (s->pict_type == FF_B_TYPE) { |
2979 | 430 svq3_mc_dir_part (s, 16*s->mb_x, 16*s->mb_y, 16, 16, 0, 0, 0, 0, 1, 1); |
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
431 } |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
432 |
1319 | 433 mb_type = MB_TYPE_SKIP; |
434 } else { | |
2088
19d4d5c6a8f4
1000l to myself for FFMIN(...,0) instead of ...,6)
michael
parents:
2086
diff
changeset
|
435 mb_type= FFMIN(s->next_picture.mb_type[mb_xy], 6); |
19d4d5c6a8f4
1000l to myself for FFMIN(...,0) instead of ...,6)
michael
parents:
2086
diff
changeset
|
436 if(svq3_mc_dir (h, mb_type, PREDICT_MODE, 0, 0) < 0) |
19d4d5c6a8f4
1000l to myself for FFMIN(...,0) instead of ...,6)
michael
parents:
2086
diff
changeset
|
437 return -1; |
19d4d5c6a8f4
1000l to myself for FFMIN(...,0) instead of ...,6)
michael
parents:
2086
diff
changeset
|
438 if(svq3_mc_dir (h, mb_type, PREDICT_MODE, 1, 1) < 0) |
19d4d5c6a8f4
1000l to myself for FFMIN(...,0) instead of ...,6)
michael
parents:
2086
diff
changeset
|
439 return -1; |
1319 | 440 |
441 mb_type = MB_TYPE_16x16; | |
442 } | |
2979 | 443 } else if (mb_type < 8) { /* INTER */ |
5513 | 444 if (h->thirdpel_flag && h->halfpel_flag == !get_bits1 (&s->gb)) { |
1265 | 445 mode = THIRDPEL_MODE; |
5513 | 446 } else if (h->halfpel_flag && h->thirdpel_flag == !get_bits1 (&s->gb)) { |
1265 | 447 mode = HALFPEL_MODE; |
1234 | 448 } else { |
1265 | 449 mode = FULLPEL_MODE; |
1234 | 450 } |
451 | |
452 /* fill caches */ | |
1319 | 453 /* note ref_cache should contain here: |
1252 | 454 ???????? |
455 ???11111 | |
456 N??11111 | |
457 N??11111 | |
458 N??11111 | |
459 */ | |
2967 | 460 |
1319 | 461 for (m=0; m < 2; m++) { |
462 if (s->mb_x > 0 && h->intra4x4_pred_mode[mb_xy - 1][0] != -1) { | |
2979 | 463 for (i=0; i < 4; i++) { |
464 *(uint32_t *) h->mv_cache[m][scan8[0] - 1 + i*8] = *(uint32_t *) s->current_picture.motion_val[m][b_xy - 1 + i*h->b_stride]; | |
465 } | |
1319 | 466 } else { |
2979 | 467 for (i=0; i < 4; i++) { |
468 *(uint32_t *) h->mv_cache[m][scan8[0] - 1 + i*8] = 0; | |
469 } | |
1234 | 470 } |
1319 | 471 if (s->mb_y > 0) { |
2979 | 472 memcpy (h->mv_cache[m][scan8[0] - 1*8], s->current_picture.motion_val[m][b_xy - h->b_stride], 4*2*sizeof(int16_t)); |
473 memset (&h->ref_cache[m][scan8[0] - 1*8], (h->intra4x4_pred_mode[mb_xy - s->mb_stride][4] == -1) ? PART_NOT_AVAILABLE : 1, 4); | |
1234 | 474 |
2979 | 475 if (s->mb_x < (s->mb_width - 1)) { |
476 *(uint32_t *) h->mv_cache[m][scan8[0] + 4 - 1*8] = *(uint32_t *) s->current_picture.motion_val[m][b_xy - h->b_stride + 4]; | |
477 h->ref_cache[m][scan8[0] + 4 - 1*8] = | |
478 (h->intra4x4_pred_mode[mb_xy - s->mb_stride + 1][0] == -1 || | |
479 h->intra4x4_pred_mode[mb_xy - s->mb_stride][4] == -1) ? PART_NOT_AVAILABLE : 1; | |
480 }else | |
481 h->ref_cache[m][scan8[0] + 4 - 1*8] = PART_NOT_AVAILABLE; | |
482 if (s->mb_x > 0) { | |
483 *(uint32_t *) h->mv_cache[m][scan8[0] - 1 - 1*8] = *(uint32_t *) s->current_picture.motion_val[m][b_xy - h->b_stride - 1]; | |
484 h->ref_cache[m][scan8[0] - 1 - 1*8] = (h->intra4x4_pred_mode[mb_xy - s->mb_stride - 1][3] == -1) ? PART_NOT_AVAILABLE : 1; | |
485 }else | |
486 h->ref_cache[m][scan8[0] - 1 - 1*8] = PART_NOT_AVAILABLE; | |
1252 | 487 }else |
2979 | 488 memset (&h->ref_cache[m][scan8[0] - 1*8 - 1], PART_NOT_AVAILABLE, 8); |
1319 | 489 |
6481 | 490 if (s->pict_type != FF_B_TYPE) |
2979 | 491 break; |
1319 | 492 } |
1234 | 493 |
494 /* decode motion vector(s) and form prediction(s) */ | |
6481 | 495 if (s->pict_type == FF_P_TYPE) { |
2088
19d4d5c6a8f4
1000l to myself for FFMIN(...,0) instead of ...,6)
michael
parents:
2086
diff
changeset
|
496 if(svq3_mc_dir (h, (mb_type - 1), mode, 0, 0) < 0) |
19d4d5c6a8f4
1000l to myself for FFMIN(...,0) instead of ...,6)
michael
parents:
2086
diff
changeset
|
497 return -1; |
6481 | 498 } else { /* FF_B_TYPE */ |
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
499 if (mb_type != 2) { |
2979 | 500 if(svq3_mc_dir (h, 0, mode, 0, 0) < 0) |
2088
19d4d5c6a8f4
1000l to myself for FFMIN(...,0) instead of ...,6)
michael
parents:
2086
diff
changeset
|
501 return -1; |
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
502 } else { |
2979 | 503 for (i=0; i < 4; i++) { |
504 memset (s->current_picture.motion_val[0][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t)); | |
505 } | |
1234 | 506 } |
1319 | 507 if (mb_type != 1) { |
2979 | 508 if(svq3_mc_dir (h, 0, mode, 1, (mb_type == 3)) < 0) |
2088
19d4d5c6a8f4
1000l to myself for FFMIN(...,0) instead of ...,6)
michael
parents:
2086
diff
changeset
|
509 return -1; |
1319 | 510 } else { |
2979 | 511 for (i=0; i < 4; i++) { |
512 memset (s->current_picture.motion_val[1][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t)); | |
513 } | |
1319 | 514 } |
1234 | 515 } |
516 | |
517 mb_type = MB_TYPE_16x16; | |
2979 | 518 } else if (mb_type == 8 || mb_type == 33) { /* INTRA4x4 */ |
1234 | 519 memset (h->intra4x4_pred_mode_cache, -1, 8*5*sizeof(int8_t)); |
520 | |
1319 | 521 if (mb_type == 8) { |
522 if (s->mb_x > 0) { | |
2979 | 523 for (i=0; i < 4; i++) { |
524 h->intra4x4_pred_mode_cache[scan8[0] - 1 + i*8] = h->intra4x4_pred_mode[mb_xy - 1][i]; | |
525 } | |
526 if (h->intra4x4_pred_mode_cache[scan8[0] - 1] == -1) { | |
527 h->left_samples_available = 0x5F5F; | |
528 } | |
1234 | 529 } |
1319 | 530 if (s->mb_y > 0) { |
2979 | 531 h->intra4x4_pred_mode_cache[4+8*0] = h->intra4x4_pred_mode[mb_xy - s->mb_stride][4]; |
532 h->intra4x4_pred_mode_cache[5+8*0] = h->intra4x4_pred_mode[mb_xy - s->mb_stride][5]; | |
533 h->intra4x4_pred_mode_cache[6+8*0] = h->intra4x4_pred_mode[mb_xy - s->mb_stride][6]; | |
534 h->intra4x4_pred_mode_cache[7+8*0] = h->intra4x4_pred_mode[mb_xy - s->mb_stride][3]; | |
1319 | 535 |
2979 | 536 if (h->intra4x4_pred_mode_cache[4+8*0] == -1) { |
537 h->top_samples_available = 0x33FF; | |
538 } | |
1319 | 539 } |
1234 | 540 |
1319 | 541 /* decode prediction codes for luma blocks */ |
542 for (i=0; i < 16; i+=2) { | |
2979 | 543 vlc = svq3_get_ue_golomb (&s->gb); |
1234 | 544 |
2979 | 545 if (vlc >= 25){ |
2452 | 546 av_log(h->s.avctx, AV_LOG_ERROR, "luma prediction:%d\n", vlc); |
2979 | 547 return -1; |
2452 | 548 } |
1319 | 549 |
2979 | 550 left = &h->intra4x4_pred_mode_cache[scan8[i] - 1]; |
551 top = &h->intra4x4_pred_mode_cache[scan8[i] - 8]; | |
1234 | 552 |
2979 | 553 left[1] = svq3_pred_1[top[0] + 1][left[0] + 1][svq3_pred_0[vlc][0]]; |
554 left[2] = svq3_pred_1[top[1] + 1][left[1] + 1][svq3_pred_0[vlc][1]]; | |
1234 | 555 |
2979 | 556 if (left[1] == -1 || left[2] == -1){ |
2452 | 557 av_log(h->s.avctx, AV_LOG_ERROR, "weird prediction\n"); |
2979 | 558 return -1; |
2452 | 559 } |
1319 | 560 } |
2979 | 561 } else { /* mb_type == 33, DC_128_PRED block type */ |
1319 | 562 for (i=0; i < 4; i++) { |
2979 | 563 memset (&h->intra4x4_pred_mode_cache[scan8[0] + 8*i], DC_PRED, 4); |
1319 | 564 } |
1234 | 565 } |
566 | |
567 write_back_intra_pred_mode (h); | |
1319 | 568 |
569 if (mb_type == 8) { | |
570 check_intra4x4_pred_mode (h); | |
571 | |
572 h->top_samples_available = (s->mb_y == 0) ? 0x33FF : 0xFFFF; | |
573 h->left_samples_available = (s->mb_x == 0) ? 0x5F5F : 0xFFFF; | |
574 } else { | |
575 for (i=0; i < 4; i++) { | |
576 memset (&h->intra4x4_pred_mode_cache[scan8[0] + 8*i], DC_128_PRED, 4); | |
577 } | |
578 | |
579 h->top_samples_available = 0x33FF; | |
580 h->left_samples_available = 0x5F5F; | |
581 } | |
1234 | 582 |
583 mb_type = MB_TYPE_INTRA4x4; | |
2979 | 584 } else { /* INTRA16x16 */ |
1234 | 585 dir = i_mb_type_info[mb_type - 8].pred_mode; |
586 dir = (dir >> 1) ^ 3*(dir & 1) ^ 1; | |
587 | |
2452 | 588 if ((h->intra16x16_pred_mode = check_intra_pred_mode (h, dir)) == -1){ |
589 av_log(h->s.avctx, AV_LOG_ERROR, "check_intra_pred_mode = -1\n"); | |
1234 | 590 return -1; |
2452 | 591 } |
1234 | 592 |
593 cbp = i_mb_type_info[mb_type - 8].cbp; | |
594 mb_type = MB_TYPE_INTRA16x16; | |
595 } | |
596 | |
6481 | 597 if (!IS_INTER(mb_type) && s->pict_type != FF_I_TYPE) { |
1234 | 598 for (i=0; i < 4; i++) { |
599 memset (s->current_picture.motion_val[0][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t)); | |
600 } | |
6481 | 601 if (s->pict_type == FF_B_TYPE) { |
1319 | 602 for (i=0; i < 4; i++) { |
2979 | 603 memset (s->current_picture.motion_val[1][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t)); |
1319 | 604 } |
605 } | |
1234 | 606 } |
607 if (!IS_INTRA4x4(mb_type)) { | |
608 memset (h->intra4x4_pred_mode[mb_xy], DC_PRED, 8); | |
609 } | |
6481 | 610 if (!IS_SKIP(mb_type) || s->pict_type == FF_B_TYPE) { |
1252 | 611 memset (h->non_zero_count_cache + 8, 0, 4*9*sizeof(uint8_t)); |
612 s->dsp.clear_blocks(h->mb); | |
1234 | 613 } |
614 | |
6481 | 615 if (!IS_INTRA16x16(mb_type) && (!IS_SKIP(mb_type) || s->pict_type == FF_B_TYPE)) { |
2452 | 616 if ((vlc = svq3_get_ue_golomb (&s->gb)) >= 48){ |
617 av_log(h->s.avctx, AV_LOG_ERROR, "cbp_vlc=%d\n", vlc); | |
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
618 return -1; |
2452 | 619 } |
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
620 |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
621 cbp = IS_INTRA(mb_type) ? golomb_to_intra4x4_cbp[vlc] : golomb_to_inter_cbp[vlc]; |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
622 } |
6481 | 623 if (IS_INTRA16x16(mb_type) || (s->pict_type != FF_I_TYPE && s->adaptive_quant && cbp)) { |
1234 | 624 s->qscale += svq3_get_se_golomb (&s->gb); |
625 | |
2452 | 626 if (s->qscale > 31){ |
627 av_log(h->s.avctx, AV_LOG_ERROR, "qscale:%d\n", s->qscale); | |
1234 | 628 return -1; |
2452 | 629 } |
1234 | 630 } |
631 if (IS_INTRA16x16(mb_type)) { | |
2452 | 632 if (svq3_decode_block (&s->gb, h->mb, 0, 0)){ |
633 av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding intra luma dc\n"); | |
1234 | 634 return -1; |
2452 | 635 } |
1234 | 636 } |
637 | |
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
638 if (cbp) { |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
639 const int index = IS_INTRA16x16(mb_type) ? 1 : 0; |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
640 const int type = ((s->qscale < 24 && IS_INTRA4x4(mb_type)) ? 2 : 1); |
1234 | 641 |
642 for (i=0; i < 4; i++) { | |
643 if ((cbp & (1 << i))) { | |
2979 | 644 for (j=0; j < 4; j++) { |
645 k = index ? ((j&1) + 2*(i&1) + 2*(j&2) + 4*(i&2)) : (4*i + j); | |
646 h->non_zero_count_cache[ scan8[k] ] = 1; | |
1234 | 647 |
2979 | 648 if (svq3_decode_block (&s->gb, &h->mb[16*k], index, type)){ |
2452 | 649 av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding block\n"); |
2979 | 650 return -1; |
2452 | 651 } |
2979 | 652 } |
1234 | 653 } |
654 } | |
655 | |
656 if ((cbp & 0x30)) { | |
657 for (i=0; i < 2; ++i) { | |
2979 | 658 if (svq3_decode_block (&s->gb, &h->mb[16*(16 + 4*i)], 0, 3)){ |
2452 | 659 av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding chroma dc block\n"); |
2979 | 660 return -1; |
2452 | 661 } |
1234 | 662 } |
663 | |
664 if ((cbp & 0x20)) { | |
2979 | 665 for (i=0; i < 8; i++) { |
666 h->non_zero_count_cache[ scan8[16+i] ] = 1; | |
1234 | 667 |
2979 | 668 if (svq3_decode_block (&s->gb, &h->mb[16*(16 + i)], 1, 1)){ |
2452 | 669 av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding chroma ac block\n"); |
2979 | 670 return -1; |
2452 | 671 } |
2979 | 672 } |
1234 | 673 } |
674 } | |
675 } | |
676 | |
677 s->current_picture.mb_type[mb_xy] = mb_type; | |
678 | |
679 if (IS_INTRA(mb_type)) { | |
680 h->chroma_pred_mode = check_intra_pred_mode (h, DC_PRED8x8); | |
681 } | |
682 | |
683 return 0; | |
684 } | |
685 | |
1319 | 686 static int svq3_decode_slice_header (H264Context *h) { |
687 MpegEncContext *const s = (MpegEncContext *) h; | |
6789
8107e891b226
Previous commit missed an initialization - this fixes FATE's test sample.
astrange
parents:
6787
diff
changeset
|
688 const int mb_xy = h->mb_xy; |
1319 | 689 int i, header; |
690 | |
691 header = get_bits (&s->gb, 8); | |
692 | |
693 if (((header & 0x9F) != 1 && (header & 0x9F) != 2) || (header & 0x60) == 0) { | |
694 /* TODO: what? */ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1330
diff
changeset
|
695 av_log(h->s.avctx, AV_LOG_ERROR, "unsupported slice header (%02X)\n", header); |
1319 | 696 return -1; |
697 } else { | |
698 int length = (header >> 5) & 3; | |
699 | |
2614
5e24800ab329
various fixes related to the non alt_bitstream_reader
michael
parents:
2453
diff
changeset
|
700 h->next_slice_index = get_bits_count(&s->gb) + 8*show_bits (&s->gb, 8*length) + 8*length; |
1319 | 701 |
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1699
diff
changeset
|
702 if (h->next_slice_index > s->gb.size_in_bits){ |
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1699
diff
changeset
|
703 av_log(h->s.avctx, AV_LOG_ERROR, "slice after bitstream end\n"); |
1319 | 704 return -1; |
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1699
diff
changeset
|
705 } |
1319 | 706 |
707 s->gb.size_in_bits = h->next_slice_index - 8*(length - 1); | |
2614
5e24800ab329
various fixes related to the non alt_bitstream_reader
michael
parents:
2453
diff
changeset
|
708 skip_bits(&s->gb, 8); |
1319 | 709 |
710 if (length > 0) { | |
7291 | 711 memcpy ((uint8_t *) &s->gb.buffer[get_bits_count(&s->gb) >> 3], |
1319 | 712 &s->gb.buffer[s->gb.size_in_bits >> 3], (length - 1)); |
713 } | |
714 } | |
715 | |
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1699
diff
changeset
|
716 if ((i = svq3_get_ue_golomb (&s->gb)) == INVALID_VLC || i >= 3){ |
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1699
diff
changeset
|
717 av_log(h->s.avctx, AV_LOG_ERROR, "illegal slice type %d \n", i); |
1319 | 718 return -1; |
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1699
diff
changeset
|
719 } |
1319 | 720 |
721 h->slice_type = golomb_to_pict_type[i]; | |
722 | |
723 if ((header & 0x9F) == 2) { | |
724 i = (s->mb_num < 64) ? 6 : (1 + av_log2 (s->mb_num - 1)); | |
725 s->mb_skip_run = get_bits (&s->gb, i) - (s->mb_x + (s->mb_y * s->mb_width)); | |
726 } else { | |
5519 | 727 skip_bits1 (&s->gb); |
1319 | 728 s->mb_skip_run = 0; |
729 } | |
730 | |
731 h->slice_num = get_bits (&s->gb, 8); | |
732 s->qscale = get_bits (&s->gb, 5); | |
733 s->adaptive_quant = get_bits1 (&s->gb); | |
734 | |
735 /* unknown fields */ | |
5519 | 736 skip_bits1 (&s->gb); |
1319 | 737 |
738 if (h->unknown_svq3_flag) { | |
5519 | 739 skip_bits1 (&s->gb); |
1319 | 740 } |
741 | |
5519 | 742 skip_bits1 (&s->gb); |
743 skip_bits (&s->gb, 2); | |
1319 | 744 |
745 while (get_bits1 (&s->gb)) { | |
5519 | 746 skip_bits (&s->gb, 8); |
1319 | 747 } |
748 | |
749 /* reset intra predictors and invalidate motion vector references */ | |
750 if (s->mb_x > 0) { | |
751 memset (h->intra4x4_pred_mode[mb_xy - 1], -1, 4*sizeof(int8_t)); | |
752 memset (h->intra4x4_pred_mode[mb_xy - s->mb_x], -1, 8*sizeof(int8_t)*s->mb_x); | |
753 } | |
754 if (s->mb_y > 0) { | |
755 memset (h->intra4x4_pred_mode[mb_xy - s->mb_stride], -1, 8*sizeof(int8_t)*(s->mb_width - s->mb_x)); | |
756 | |
757 if (s->mb_x > 0) { | |
758 h->intra4x4_pred_mode[mb_xy - s->mb_stride - 1][3] = -1; | |
759 } | |
760 } | |
761 | |
762 return 0; | |
763 } | |
764 | |
1234 | 765 static int svq3_decode_frame (AVCodecContext *avctx, |
2979 | 766 void *data, int *data_size, |
6216 | 767 const uint8_t *buf, int buf_size) { |
1234 | 768 MpegEncContext *const s = avctx->priv_data; |
769 H264Context *const h = avctx->priv_data; | |
1319 | 770 int m, mb_type; |
1877
869256817a91
smarten up the SVQ3 extradata decoder without changing the external API
melanson
parents:
1754
diff
changeset
|
771 unsigned char *extradata; |
1878
838c18d1e7fc
be smarter about the variable size of the extra SVQ3 data
melanson
parents:
1877
diff
changeset
|
772 unsigned int size; |
1319 | 773 |
1234 | 774 s->flags = avctx->flags; |
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1699
diff
changeset
|
775 s->flags2 = avctx->flags2; |
1699 | 776 s->unrestricted_mv = 1; |
777 | |
1234 | 778 if (!s->context_initialized) { |
1268 | 779 s->width = avctx->width; |
780 s->height = avctx->height; | |
1234 | 781 h->halfpel_flag = 1; |
782 h->thirdpel_flag = 1; | |
1319 | 783 h->unknown_svq3_flag = 0; |
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5215
diff
changeset
|
784 h->chroma_qp[0] = h->chroma_qp[1] = 4; |
1234 | 785 |
786 if (MPV_common_init (s) < 0) | |
787 return -1; | |
788 | |
1268 | 789 h->b_stride = 4*s->mb_width; |
790 | |
1234 | 791 alloc_tables (h); |
1319 | 792 |
1877
869256817a91
smarten up the SVQ3 extradata decoder without changing the external API
melanson
parents:
1754
diff
changeset
|
793 /* prowl for the "SEQH" marker in the extradata */ |
869256817a91
smarten up the SVQ3 extradata decoder without changing the external API
melanson
parents:
1754
diff
changeset
|
794 extradata = (unsigned char *)avctx->extradata; |
869256817a91
smarten up the SVQ3 extradata decoder without changing the external API
melanson
parents:
1754
diff
changeset
|
795 for (m = 0; m < avctx->extradata_size; m++) { |
869256817a91
smarten up the SVQ3 extradata decoder without changing the external API
melanson
parents:
1754
diff
changeset
|
796 if (!memcmp (extradata, "SEQH", 4)) |
869256817a91
smarten up the SVQ3 extradata decoder without changing the external API
melanson
parents:
1754
diff
changeset
|
797 break; |
869256817a91
smarten up the SVQ3 extradata decoder without changing the external API
melanson
parents:
1754
diff
changeset
|
798 extradata++; |
869256817a91
smarten up the SVQ3 extradata decoder without changing the external API
melanson
parents:
1754
diff
changeset
|
799 } |
1878
838c18d1e7fc
be smarter about the variable size of the extra SVQ3 data
melanson
parents:
1877
diff
changeset
|
800 |
1877
869256817a91
smarten up the SVQ3 extradata decoder without changing the external API
melanson
parents:
1754
diff
changeset
|
801 /* if a match was found, parse the extra data */ |
4392
e0c94f1b8f55
maybe fix segfault with missing extradata (unchecked)
michael
parents:
4364
diff
changeset
|
802 if (extradata && !memcmp (extradata, "SEQH", 4)) { |
1319 | 803 |
804 GetBitContext gb; | |
1234 | 805 |
4364 | 806 size = AV_RB32(&extradata[4]); |
2966
564788471dd4
bitstream related fixes from [PATCH] from DivX, Part 9: bitstream crashes by (Steve Lhomme | slhomme divxcorp com)
michael
parents:
2792
diff
changeset
|
807 init_get_bits (&gb, extradata + 8, size*8); |
1234 | 808 |
1319 | 809 /* 'frame size code' and optional 'width, height' */ |
810 if (get_bits (&gb, 3) == 7) { | |
5519 | 811 skip_bits (&gb, 12); |
812 skip_bits (&gb, 12); | |
1234 | 813 } |
814 | |
1319 | 815 h->halfpel_flag = get_bits1 (&gb); |
816 h->thirdpel_flag = get_bits1 (&gb); | |
817 | |
818 /* unknown fields */ | |
5519 | 819 skip_bits1 (&gb); |
820 skip_bits1 (&gb); | |
821 skip_bits1 (&gb); | |
822 skip_bits1 (&gb); | |
1319 | 823 |
824 s->low_delay = get_bits1 (&gb); | |
825 | |
826 /* unknown field */ | |
5519 | 827 skip_bits1 (&gb); |
1319 | 828 |
829 while (get_bits1 (&gb)) { | |
5519 | 830 skip_bits (&gb, 8); |
1319 | 831 } |
832 | |
833 h->unknown_svq3_flag = get_bits1 (&gb); | |
834 avctx->has_b_frames = !s->low_delay; | |
1234 | 835 } |
836 } | |
837 | |
1319 | 838 /* special case for last picture */ |
839 if (buf_size == 0) { | |
840 if (s->next_picture_ptr && !s->low_delay) { | |
841 *(AVFrame *) data = *(AVFrame *) &s->next_picture; | |
7276 | 842 s->next_picture_ptr= NULL; |
1319 | 843 *data_size = sizeof(AVFrame); |
1234 | 844 } |
1319 | 845 return 0; |
1234 | 846 } |
847 | |
1319 | 848 init_get_bits (&s->gb, buf, 8*buf_size); |
1234 | 849 |
6789
8107e891b226
Previous commit missed an initialization - this fixes FATE's test sample.
astrange
parents:
6787
diff
changeset
|
850 s->mb_x = s->mb_y = h->mb_xy = 0; |
1319 | 851 |
852 if (svq3_decode_slice_header (h)) | |
1234 | 853 return -1; |
854 | |
1319 | 855 s->pict_type = h->slice_type; |
856 s->picture_number = h->slice_num; | |
1234 | 857 |
1250 | 858 if(avctx->debug&FF_DEBUG_PICT_INFO){ |
7287 | 859 av_log(h->s.avctx, AV_LOG_DEBUG, "%c hpel:%d, tpel:%d aqp:%d qp:%d, slice_num:%02X\n", |
1264 | 860 av_get_pict_type_char(s->pict_type), h->halfpel_flag, h->thirdpel_flag, |
7287 | 861 s->adaptive_quant, s->qscale, h->slice_num |
1250 | 862 ); |
863 } | |
1234 | 864 |
1319 | 865 /* for hurry_up==5 */ |
866 s->current_picture.pict_type = s->pict_type; | |
6481 | 867 s->current_picture.key_frame = (s->pict_type == FF_I_TYPE); |
1319 | 868 |
5127 | 869 /* Skip B-frames if we do not have reference frames. */ |
6481 | 870 if (s->last_picture_ptr == NULL && s->pict_type == FF_B_TYPE) return 0; |
5127 | 871 /* Skip B-frames if we are in a hurry. */ |
6481 | 872 if (avctx->hurry_up && s->pict_type == FF_B_TYPE) return 0; |
5127 | 873 /* Skip everything if we are in a hurry >= 5. */ |
1319 | 874 if (avctx->hurry_up >= 5) return 0; |
6481 | 875 if( (avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type==FF_B_TYPE) |
876 ||(avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type!=FF_I_TYPE) | |
2792 | 877 || avctx->skip_frame >= AVDISCARD_ALL) |
878 return 0; | |
1319 | 879 |
880 if (s->next_p_frame_damaged) { | |
6481 | 881 if (s->pict_type == FF_B_TYPE) |
1319 | 882 return 0; |
883 else | |
884 s->next_p_frame_damaged = 0; | |
885 } | |
1234 | 886 |
4395 | 887 if (frame_start (h) < 0) |
888 return -1; | |
1234 | 889 |
6481 | 890 if (s->pict_type == FF_B_TYPE) { |
1319 | 891 h->frame_num_offset = (h->slice_num - h->prev_frame_num); |
892 | |
893 if (h->frame_num_offset < 0) { | |
894 h->frame_num_offset += 256; | |
895 } | |
896 if (h->frame_num_offset == 0 || h->frame_num_offset >= h->prev_frame_num_offset) { | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1330
diff
changeset
|
897 av_log(h->s.avctx, AV_LOG_ERROR, "error in B-frame picture id\n"); |
1319 | 898 return -1; |
899 } | |
900 } else { | |
901 h->prev_frame_num = h->frame_num; | |
902 h->frame_num = h->slice_num; | |
903 h->prev_frame_num_offset = (h->frame_num - h->prev_frame_num); | |
904 | |
905 if (h->prev_frame_num_offset < 0) { | |
906 h->prev_frame_num_offset += 256; | |
907 } | |
908 } | |
909 | |
910 for(m=0; m<2; m++){ | |
911 int i; | |
912 for(i=0; i<4; i++){ | |
913 int j; | |
914 for(j=-1; j<4; j++) | |
2979 | 915 h->ref_cache[m][scan8[0] + 8*i + j]= 1; |
5008 | 916 if(i<3) |
917 h->ref_cache[m][scan8[0] + 8*i + j]= PART_NOT_AVAILABLE; | |
1319 | 918 } |
1252 | 919 } |
2967 | 920 |
1234 | 921 for (s->mb_y=0; s->mb_y < s->mb_height; s->mb_y++) { |
922 for (s->mb_x=0; s->mb_x < s->mb_width; s->mb_x++) { | |
6789
8107e891b226
Previous commit missed an initialization - this fixes FATE's test sample.
astrange
parents:
6787
diff
changeset
|
923 h->mb_xy = s->mb_x + s->mb_y*s->mb_stride; |
1319 | 924 |
2614
5e24800ab329
various fixes related to the non alt_bitstream_reader
michael
parents:
2453
diff
changeset
|
925 if ( (get_bits_count(&s->gb) + 7) >= s->gb.size_in_bits && |
2979 | 926 ((get_bits_count(&s->gb) & 7) == 0 || show_bits (&s->gb, (-get_bits_count(&s->gb) & 7)) == 0)) { |
1319 | 927 |
2979 | 928 skip_bits(&s->gb, h->next_slice_index - get_bits_count(&s->gb)); |
929 s->gb.size_in_bits = 8*buf_size; | |
1319 | 930 |
2979 | 931 if (svq3_decode_slice_header (h)) |
932 return -1; | |
1319 | 933 |
2979 | 934 /* TODO: support s->mb_skip_run */ |
1319 | 935 } |
936 | |
937 mb_type = svq3_get_ue_golomb (&s->gb); | |
1234 | 938 |
6481 | 939 if (s->pict_type == FF_I_TYPE) { |
2979 | 940 mb_type += 8; |
6481 | 941 } else if (s->pict_type == FF_B_TYPE && mb_type >= 4) { |
2979 | 942 mb_type += 4; |
1234 | 943 } |
1319 | 944 if (mb_type > 33 || svq3_decode_mb (h, mb_type)) { |
2979 | 945 av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding MB %d %d\n", s->mb_x, s->mb_y); |
946 return -1; | |
1234 | 947 } |
948 | |
949 if (mb_type != 0) { | |
2979 | 950 hl_decode_mb (h); |
1234 | 951 } |
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
952 |
6481 | 953 if (s->pict_type != FF_B_TYPE && !s->low_delay) { |
2979 | 954 s->current_picture.mb_type[s->mb_x + s->mb_y*s->mb_stride] = |
6481 | 955 (s->pict_type == FF_P_TYPE && mb_type < 8) ? (mb_type - 1) : -1; |
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
956 } |
1234 | 957 } |
1268 | 958 |
959 ff_draw_horiz_band(s, 16*s->mb_y, 16); | |
1234 | 960 } |
961 | |
1319 | 962 MPV_frame_end(s); |
963 | |
6481 | 964 if (s->pict_type == FF_B_TYPE || s->low_delay) { |
1319 | 965 *(AVFrame *) data = *(AVFrame *) &s->current_picture; |
966 } else { | |
967 *(AVFrame *) data = *(AVFrame *) &s->last_picture; | |
968 } | |
1234 | 969 |
1319 | 970 avctx->frame_number = s->picture_number - 1; |
971 | |
5127 | 972 /* Do not output the last pic after seeking. */ |
1319 | 973 if (s->last_picture_ptr || s->low_delay) { |
974 *data_size = sizeof(AVFrame); | |
975 } | |
976 | |
1234 | 977 return buf_size; |
978 } | |
979 | |
980 | |
981 AVCodec svq3_decoder = { | |
982 "svq3", | |
983 CODEC_TYPE_VIDEO, | |
984 CODEC_ID_SVQ3, | |
985 sizeof(H264Context), | |
986 decode_init, | |
987 NULL, | |
988 decode_end, | |
989 svq3_decode_frame, | |
2453 | 990 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_DELAY, |
7040
e943e1409077
Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents:
6789
diff
changeset
|
991 .long_name = NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 3"), |
1234 | 992 }; |