Mercurial > libavcodec.hg
annotate mpeg12.c @ 1690:db54bb946ab3 libavcodec
10l (printing qscale before parsing it)
author | michael |
---|---|
date | Sun, 14 Dec 2003 16:15:32 +0000 |
parents | 7b810155650f |
children | 7d8af3b5699a |
rev | line source |
---|---|
0 | 1 /* |
1106 | 2 * MPEG1 codec / MPEG2 decoder |
429 | 3 * Copyright (c) 2000,2001 Fabrice Bellard. |
0 | 4 * |
429 | 5 * This library is free software; you can redistribute it and/or |
6 * modify it under the terms of the GNU Lesser General Public | |
7 * License as published by the Free Software Foundation; either | |
8 * version 2 of the License, or (at your option) any later version. | |
0 | 9 * |
429 | 10 * This library is distributed in the hope that it will be useful, |
0 | 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
429 | 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 * Lesser General Public License for more details. | |
0 | 14 * |
429 | 15 * You should have received a copy of the GNU Lesser General Public |
16 * License along with this library; if not, write to the Free Software | |
17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
0 | 18 */ |
1106 | 19 |
20 /** | |
21 * @file mpeg12.c | |
1421 | 22 * MPEG1/2 codec |
1106 | 23 */ |
24 | |
76 | 25 //#define DEBUG |
0 | 26 #include "avcodec.h" |
27 #include "dsputil.h" | |
28 #include "mpegvideo.h" | |
29 | |
30 #include "mpeg12data.h" | |
31 | |
694 | 32 |
0 | 33 /* Start codes. */ |
34 #define SEQ_END_CODE 0x000001b7 | |
35 #define SEQ_START_CODE 0x000001b3 | |
36 #define GOP_START_CODE 0x000001b8 | |
37 #define PICTURE_START_CODE 0x00000100 | |
38 #define SLICE_MIN_START_CODE 0x00000101 | |
39 #define SLICE_MAX_START_CODE 0x000001af | |
40 #define EXT_START_CODE 0x000001b5 | |
41 #define USER_START_CODE 0x000001b2 | |
42 | |
552 | 43 #define DC_VLC_BITS 9 |
44 #define MV_VLC_BITS 9 | |
45 #define MBINCR_VLC_BITS 9 | |
46 #define MB_PAT_VLC_BITS 9 | |
47 #define MB_PTYPE_VLC_BITS 6 | |
48 #define MB_BTYPE_VLC_BITS 6 | |
49 #define TEX_VLC_BITS 9 | |
50 | |
1530
3b31998fe22f
disable encoders where appropriate (patch courtesy of BERO
melanson
parents:
1503
diff
changeset
|
51 #ifdef CONFIG_ENCODERS |
0 | 52 static void mpeg1_encode_block(MpegEncContext *s, |
53 DCTELEM *block, | |
54 int component); | |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
55 static void mpeg1_encode_motion(MpegEncContext *s, int val, int f_or_b_code); // RAL: f_code parameter added |
1530
3b31998fe22f
disable encoders where appropriate (patch courtesy of BERO
melanson
parents:
1503
diff
changeset
|
56 #endif //CONFIG_ENCODERS |
0 | 57 static void mpeg1_skip_picture(MpegEncContext *s, int pict_num); |
711 | 58 static inline int mpeg1_decode_block_inter(MpegEncContext *s, |
59 DCTELEM *block, | |
60 int n); | |
61 static inline int mpeg1_decode_block_intra(MpegEncContext *s, | |
0 | 62 DCTELEM *block, |
63 int n); | |
714 | 64 static inline int mpeg2_decode_block_non_intra(MpegEncContext *s, |
0 | 65 DCTELEM *block, |
66 int n); | |
714 | 67 static inline int mpeg2_decode_block_intra(MpegEncContext *s, |
0 | 68 DCTELEM *block, |
69 int n); | |
70 static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred); | |
1620 | 71 static void exchange_uv(MpegEncContext *s); |
0 | 72 |
1381 | 73 #ifdef HAVE_XVMC |
74 extern int XVMC_field_start(MpegEncContext *s, AVCodecContext *avctx); | |
75 extern int XVMC_field_end(MpegEncContext *s); | |
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
76 extern void XVMC_pack_pblocks(MpegEncContext *s,int cbp); |
1620 | 77 extern void XVMC_init_block(MpegEncContext *s);//set s->block |
1381 | 78 #endif |
79 | |
947 | 80 #ifdef CONFIG_ENCODERS |
1162 | 81 static uint8_t (*mv_penalty)[MAX_MV*2+1]= NULL; |
1064 | 82 static uint8_t fcode_tab[MAX_MV*2+1]; |
281
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
83 |
947 | 84 static uint32_t uni_mpeg1_ac_vlc_bits[64*64*2]; |
85 static uint8_t uni_mpeg1_ac_vlc_len [64*64*2]; | |
1325 | 86 |
87 /* simple include everything table for dc, first byte is bits number next 3 are code*/ | |
88 static uint32_t mpeg1_lum_dc_uni[512]; | |
89 static uint32_t mpeg1_chr_dc_uni[512]; | |
90 | |
91 static uint8_t mpeg1_index_run[2][64]; | |
92 static int8_t mpeg1_max_level[2][64]; | |
1530
3b31998fe22f
disable encoders where appropriate (patch courtesy of BERO
melanson
parents:
1503
diff
changeset
|
93 #endif //CONFIG_ENCODERS |
947 | 94 |
552 | 95 static void init_2d_vlc_rl(RLTable *rl) |
96 { | |
620
a5aa53b6e648
warning patch by (Dominik Mierzejewski <dominik at rangers dot eu dot org>)
michaelni
parents:
617
diff
changeset
|
97 int i; |
552 | 98 |
99 init_vlc(&rl->vlc, TEX_VLC_BITS, rl->n + 2, | |
100 &rl->table_vlc[0][1], 4, 2, | |
101 &rl->table_vlc[0][0], 4, 2); | |
102 | |
103 | |
104 rl->rl_vlc[0]= av_malloc(rl->vlc.table_size*sizeof(RL_VLC_ELEM)); | |
105 for(i=0; i<rl->vlc.table_size; i++){ | |
106 int code= rl->vlc.table[i][0]; | |
107 int len = rl->vlc.table[i][1]; | |
108 int level, run; | |
109 | |
110 if(len==0){ // illegal code | |
111 run= 65; | |
112 level= MAX_LEVEL; | |
113 }else if(len<0){ //more bits needed | |
114 run= 0; | |
115 level= code; | |
116 }else{ | |
117 if(code==rl->n){ //esc | |
118 run= 65; | |
119 level= 0; | |
120 }else if(code==rl->n+1){ //eob | |
711 | 121 run= 0; |
122 level= 127; | |
552 | 123 }else{ |
124 run= rl->table_run [code] + 1; | |
125 level= rl->table_level[code]; | |
126 } | |
127 } | |
128 rl->rl_vlc[0][i].len= len; | |
129 rl->rl_vlc[0][i].level= level; | |
130 rl->rl_vlc[0][i].run= run; | |
131 } | |
132 } | |
133 | |
1325 | 134 #ifdef CONFIG_ENCODERS |
947 | 135 static void init_uni_ac_vlc(RLTable *rl, uint32_t *uni_ac_vlc_bits, uint8_t *uni_ac_vlc_len){ |
136 int i; | |
137 | |
138 for(i=0; i<128; i++){ | |
139 int level= i-64; | |
140 int run; | |
141 for(run=0; run<64; run++){ | |
142 int len, bits, code; | |
143 | |
144 int alevel= ABS(level); | |
145 int sign= (level>>31)&1; | |
146 | |
147 if (alevel > rl->max_level[0][run]) | |
148 code= 111; /*rl->n*/ | |
149 else | |
150 code= rl->index_run[0][run] + alevel - 1; | |
151 | |
152 if (code < 111 /* rl->n */) { | |
153 /* store the vlc & sign at once */ | |
154 len= mpeg1_vlc[code][1]+1; | |
155 bits= (mpeg1_vlc[code][0]<<1) + sign; | |
156 } else { | |
157 len= mpeg1_vlc[111/*rl->n*/][1]+6; | |
158 bits= mpeg1_vlc[111/*rl->n*/][0]<<6; | |
159 | |
160 bits|= run; | |
161 if (alevel < 128) { | |
162 bits<<=8; len+=8; | |
163 bits|= level & 0xff; | |
164 } else { | |
165 bits<<=16; len+=16; | |
166 bits|= level & 0xff; | |
167 if (level < 0) { | |
168 bits|= 0x8001 + level + 255; | |
169 } else { | |
170 bits|= level & 0xffff; | |
171 } | |
172 } | |
173 } | |
174 | |
175 uni_ac_vlc_bits[UNI_AC_ENC_INDEX(run, i)]= bits; | |
176 uni_ac_vlc_len [UNI_AC_ENC_INDEX(run, i)]= len; | |
177 } | |
178 } | |
179 } | |
552 | 180 |
0 | 181 static void put_header(MpegEncContext *s, int header) |
182 { | |
183 align_put_bits(&s->pb); | |
236 | 184 put_bits(&s->pb, 16, header>>16); |
185 put_bits(&s->pb, 16, header&0xFFFF); | |
0 | 186 } |
187 | |
188 /* put sequence header if needed */ | |
189 static void mpeg1_encode_sequence_header(MpegEncContext *s) | |
190 { | |
191 unsigned int vbv_buffer_size; | |
1 | 192 unsigned int fps, v; |
918 | 193 int n, i; |
1064 | 194 uint64_t time_code; |
918 | 195 float best_aspect_error= 1E10; |
1548 | 196 float aspect_ratio= av_q2d(s->avctx->sample_aspect_ratio); |
1479 | 197 int constraint_parameter_flag; |
918 | 198 |
1548 | 199 if(aspect_ratio==0.0) aspect_ratio= 1.0; //pixel aspect 1:1 (VGA) |
0 | 200 |
903 | 201 if (s->current_picture.key_frame) { |
0 | 202 /* mpeg1 header repeated every gop */ |
203 put_header(s, SEQ_START_CODE); | |
204 | |
205 /* search closest frame rate */ | |
206 { | |
207 int i, dmin, d; | |
208 s->frame_rate_index = 0; | |
209 dmin = 0x7fffffff; | |
1126
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
210 for(i=1;i<14;i++) { |
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
211 if(s->avctx->strict_std_compliance >= 0 && i>=9) break; |
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
212 |
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
213 d = abs(MPEG1_FRAME_RATE_BASE*(int64_t)s->avctx->frame_rate/s->avctx->frame_rate_base - frame_rate_tab[i]); |
0 | 214 if (d < dmin) { |
215 dmin = d; | |
216 s->frame_rate_index = i; | |
217 } | |
218 } | |
219 } | |
220 | |
221 put_bits(&s->pb, 12, s->width); | |
222 put_bits(&s->pb, 12, s->height); | |
918 | 223 |
224 for(i=1; i<15; i++){ | |
1550 | 225 float error= aspect_ratio; |
226 if(s->codec_id == CODEC_ID_MPEG1VIDEO || i <=1) | |
1587
b69b086f5570
100l (SAR is written as height/width instead of width/height in the MPEG1 standard)
michael
parents:
1580
diff
changeset
|
227 error-= 1.0/mpeg1_aspect[i]; |
1550 | 228 else |
229 error-= av_q2d(mpeg2_aspect[i])*s->height/s->width; | |
230 | |
918 | 231 error= ABS(error); |
232 | |
233 if(error < best_aspect_error){ | |
234 best_aspect_error= error; | |
235 s->aspect_ratio_info= i; | |
236 } | |
237 } | |
238 | |
239 put_bits(&s->pb, 4, s->aspect_ratio_info); | |
0 | 240 put_bits(&s->pb, 4, s->frame_rate_index); |
1430
248d9ae1033c
bit_rate in mpeg1/2 should be 0x3FFFF for vbr or at least >= max_bitrate
michaelni
parents:
1429
diff
changeset
|
241 |
248d9ae1033c
bit_rate in mpeg1/2 should be 0x3FFFF for vbr or at least >= max_bitrate
michaelni
parents:
1429
diff
changeset
|
242 if(s->avctx->rc_max_rate){ |
248d9ae1033c
bit_rate in mpeg1/2 should be 0x3FFFF for vbr or at least >= max_bitrate
michaelni
parents:
1429
diff
changeset
|
243 v = (s->avctx->rc_max_rate + 399) / 400; |
248d9ae1033c
bit_rate in mpeg1/2 should be 0x3FFFF for vbr or at least >= max_bitrate
michaelni
parents:
1429
diff
changeset
|
244 if (v > 0x3ffff && s->codec_id == CODEC_ID_MPEG1VIDEO) |
248d9ae1033c
bit_rate in mpeg1/2 should be 0x3FFFF for vbr or at least >= max_bitrate
michaelni
parents:
1429
diff
changeset
|
245 v = 0x3ffff; |
248d9ae1033c
bit_rate in mpeg1/2 should be 0x3FFFF for vbr or at least >= max_bitrate
michaelni
parents:
1429
diff
changeset
|
246 }else{ |
248d9ae1033c
bit_rate in mpeg1/2 should be 0x3FFFF for vbr or at least >= max_bitrate
michaelni
parents:
1429
diff
changeset
|
247 v= 0x3FFFF; |
248d9ae1033c
bit_rate in mpeg1/2 should be 0x3FFFF for vbr or at least >= max_bitrate
michaelni
parents:
1429
diff
changeset
|
248 } |
639
f449913e8419
new vbv calculation patch by (Henry Mason <talus25 at speakeasy dot net>) with slight modification by me
michaelni
parents:
620
diff
changeset
|
249 |
f449913e8419
new vbv calculation patch by (Henry Mason <talus25 at speakeasy dot net>) with slight modification by me
michaelni
parents:
620
diff
changeset
|
250 if(s->avctx->rc_buffer_size) |
f449913e8419
new vbv calculation patch by (Henry Mason <talus25 at speakeasy dot net>) with slight modification by me
michaelni
parents:
620
diff
changeset
|
251 vbv_buffer_size = s->avctx->rc_buffer_size; |
f449913e8419
new vbv calculation patch by (Henry Mason <talus25 at speakeasy dot net>) with slight modification by me
michaelni
parents:
620
diff
changeset
|
252 else |
f449913e8419
new vbv calculation patch by (Henry Mason <talus25 at speakeasy dot net>) with slight modification by me
michaelni
parents:
620
diff
changeset
|
253 /* VBV calculation: Scaled so that a VCD has the proper VBV size of 40 kilobytes */ |
1430
248d9ae1033c
bit_rate in mpeg1/2 should be 0x3FFFF for vbr or at least >= max_bitrate
michaelni
parents:
1429
diff
changeset
|
254 vbv_buffer_size = (( 20 * s->bit_rate) / (1151929 / 2)) * 8 * 1024; |
248d9ae1033c
bit_rate in mpeg1/2 should be 0x3FFFF for vbr or at least >= max_bitrate
michaelni
parents:
1429
diff
changeset
|
255 vbv_buffer_size= (vbv_buffer_size + 16383) / 16384; |
248d9ae1033c
bit_rate in mpeg1/2 should be 0x3FFFF for vbr or at least >= max_bitrate
michaelni
parents:
1429
diff
changeset
|
256 |
248d9ae1033c
bit_rate in mpeg1/2 should be 0x3FFFF for vbr or at least >= max_bitrate
michaelni
parents:
1429
diff
changeset
|
257 put_bits(&s->pb, 18, v & 0x3FFFF); |
248d9ae1033c
bit_rate in mpeg1/2 should be 0x3FFFF for vbr or at least >= max_bitrate
michaelni
parents:
1429
diff
changeset
|
258 put_bits(&s->pb, 1, 1); /* marker */ |
1479 | 259 put_bits(&s->pb, 10, vbv_buffer_size & 0x3FF); |
260 | |
261 constraint_parameter_flag= | |
262 s->width <= 768 && s->height <= 576 && | |
263 s->mb_width * s->mb_height <= 396 && | |
264 s->mb_width * s->mb_height * frame_rate_tab[s->frame_rate_index] <= MPEG1_FRAME_RATE_BASE*396*25 && | |
265 frame_rate_tab[s->frame_rate_index] <= MPEG1_FRAME_RATE_BASE*30 && | |
266 vbv_buffer_size <= 20 && | |
267 v <= 1856000/400 && | |
268 s->codec_id == CODEC_ID_MPEG1VIDEO; | |
269 | |
270 put_bits(&s->pb, 1, constraint_parameter_flag); | |
1411 | 271 |
272 ff_write_quant_matrix(&s->pb, s->avctx->intra_matrix); | |
273 ff_write_quant_matrix(&s->pb, s->avctx->inter_matrix); | |
0 | 274 |
1421 | 275 if(s->codec_id == CODEC_ID_MPEG2VIDEO){ |
276 put_header(s, EXT_START_CODE); | |
277 put_bits(&s->pb, 4, 1); //seq ext | |
278 put_bits(&s->pb, 1, 0); //esc | |
279 put_bits(&s->pb, 3, 4); //profile | |
280 put_bits(&s->pb, 4, 8); //level | |
1677 | 281 put_bits(&s->pb, 1, s->progressive_sequence); |
1421 | 282 put_bits(&s->pb, 2, 1); //chroma format 4:2:0 |
283 put_bits(&s->pb, 2, 0); //horizontal size ext | |
284 put_bits(&s->pb, 2, 0); //vertical size ext | |
285 put_bits(&s->pb, 12, v>>18); //bitrate ext | |
286 put_bits(&s->pb, 1, 1); //marker | |
287 put_bits(&s->pb, 8, vbv_buffer_size >>10); //vbv buffer ext | |
288 put_bits(&s->pb, 1, s->low_delay); | |
289 put_bits(&s->pb, 2, 0); // frame_rate_ext_n | |
290 put_bits(&s->pb, 5, 0); // frame_rate_ext_d | |
291 } | |
292 | |
0 | 293 put_header(s, GOP_START_CODE); |
294 put_bits(&s->pb, 1, 0); /* do drop frame */ | |
295 /* time code : we must convert from the real frame rate to a | |
296 fake mpeg frame rate in case of low frame rate */ | |
297 fps = frame_rate_tab[s->frame_rate_index]; | |
1126
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
298 time_code = (int64_t)s->fake_picture_number * MPEG1_FRAME_RATE_BASE; |
0 | 299 s->gop_picture_number = s->fake_picture_number; |
1064 | 300 put_bits(&s->pb, 5, (uint32_t)((time_code / (fps * 3600)) % 24)); |
301 put_bits(&s->pb, 6, (uint32_t)((time_code / (fps * 60)) % 60)); | |
0 | 302 put_bits(&s->pb, 1, 1); |
1064 | 303 put_bits(&s->pb, 6, (uint32_t)((time_code / fps) % 60)); |
1126
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
304 put_bits(&s->pb, 6, (uint32_t)((time_code % fps) / MPEG1_FRAME_RATE_BASE)); |
1429 | 305 put_bits(&s->pb, 1, 0); /* closed gop */ |
0 | 306 put_bits(&s->pb, 1, 0); /* broken link */ |
307 } | |
308 | |
1126
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
309 if (s->avctx->frame_rate < (24 * s->avctx->frame_rate_base) && s->picture_number > 0) { |
0 | 310 /* insert empty P pictures to slow down to the desired |
311 frame rate. Each fake pictures takes about 20 bytes */ | |
312 fps = frame_rate_tab[s->frame_rate_index]; | |
1126
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
313 n = av_rescale((int64_t)s->picture_number * s->avctx->frame_rate_base, fps, s->avctx->frame_rate) / MPEG1_FRAME_RATE_BASE - 1; |
0 | 314 while (s->fake_picture_number < n) { |
315 mpeg1_skip_picture(s, s->fake_picture_number - | |
316 s->gop_picture_number); | |
317 s->fake_picture_number++; | |
318 } | |
319 | |
320 } | |
321 } | |
322 | |
1160 | 323 static inline void encode_mb_skip_run(MpegEncContext *s, int run){ |
324 while (run >= 33) { | |
325 put_bits(&s->pb, 11, 0x008); | |
326 run -= 33; | |
327 } | |
328 put_bits(&s->pb, mbAddrIncrTable[run][1], | |
329 mbAddrIncrTable[run][0]); | |
330 } | |
0 | 331 |
332 /* insert a fake P picture */ | |
333 static void mpeg1_skip_picture(MpegEncContext *s, int pict_num) | |
334 { | |
1421 | 335 assert(s->codec_id == CODEC_ID_MPEG1VIDEO); // mpeg2 can do these repeat things |
336 | |
0 | 337 /* mpeg1 picture header */ |
338 put_header(s, PICTURE_START_CODE); | |
339 /* temporal reference */ | |
340 put_bits(&s->pb, 10, pict_num & 0x3ff); | |
341 | |
342 put_bits(&s->pb, 3, P_TYPE); | |
343 put_bits(&s->pb, 16, 0xffff); /* non constant bit rate */ | |
344 | |
345 put_bits(&s->pb, 1, 1); /* integer coordinates */ | |
346 put_bits(&s->pb, 3, 1); /* forward_f_code */ | |
347 | |
348 put_bits(&s->pb, 1, 0); /* extra bit picture */ | |
349 | |
350 /* only one slice */ | |
351 put_header(s, SLICE_MIN_START_CODE); | |
352 put_bits(&s->pb, 5, 1); /* quantizer scale */ | |
353 put_bits(&s->pb, 1, 0); /* slice extra information */ | |
354 | |
1160 | 355 encode_mb_skip_run(s, 0); |
0 | 356 |
357 /* empty macroblock */ | |
358 put_bits(&s->pb, 3, 1); /* motion only */ | |
359 | |
360 /* zero motion x & y */ | |
361 put_bits(&s->pb, 1, 1); | |
362 put_bits(&s->pb, 1, 1); | |
363 | |
364 /* output a number of empty slice */ | |
1160 | 365 encode_mb_skip_run(s, s->mb_width * s->mb_height - 2); |
0 | 366 |
367 /* empty macroblock */ | |
368 put_bits(&s->pb, 3, 1); /* motion only */ | |
369 | |
370 /* zero motion x & y */ | |
371 put_bits(&s->pb, 1, 1); | |
372 put_bits(&s->pb, 1, 1); | |
373 } | |
1530
3b31998fe22f
disable encoders where appropriate (patch courtesy of BERO
melanson
parents:
1503
diff
changeset
|
374 #endif //CONFIG_ENCODERS |
0 | 375 |
498 | 376 static void common_init(MpegEncContext *s) |
377 { | |
378 s->y_dc_scale_table= | |
379 s->c_dc_scale_table= ff_mpeg1_dc_scale_table; | |
380 } | |
381 | |
1325 | 382 void ff_mpeg1_clean_buffers(MpegEncContext *s){ |
383 s->last_dc[0] = 1 << (7 + s->intra_dc_precision); | |
384 s->last_dc[1] = s->last_dc[0]; | |
385 s->last_dc[2] = s->last_dc[0]; | |
386 memset(s->last_mv, 0, sizeof(s->last_mv)); | |
387 } | |
388 | |
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
389 #ifdef CONFIG_ENCODERS |
1160 | 390 |
391 void ff_mpeg1_encode_slice_header(MpegEncContext *s){ | |
392 put_header(s, SLICE_MIN_START_CODE + s->mb_y); | |
393 put_bits(&s->pb, 5, s->qscale); /* quantizer scale */ | |
394 put_bits(&s->pb, 1, 0); /* slice extra information */ | |
395 } | |
396 | |
0 | 397 void mpeg1_encode_picture_header(MpegEncContext *s, int picture_number) |
398 { | |
399 mpeg1_encode_sequence_header(s); | |
400 | |
401 /* mpeg1 picture header */ | |
402 put_header(s, PICTURE_START_CODE); | |
403 /* temporal reference */ | |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
404 |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
405 // RAL: s->picture_number instead of s->fake_picture_number |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
406 put_bits(&s->pb, 10, (s->picture_number - |
0 | 407 s->gop_picture_number) & 0x3ff); |
276
1e2f9ef286d4
- Fix pts calculation on mpeg mux (A/V sync) - Thanks to Lennert Buytenhek
pulento
parents:
275
diff
changeset
|
408 s->fake_picture_number++; |
0 | 409 |
410 put_bits(&s->pb, 3, s->pict_type); | |
411 put_bits(&s->pb, 16, 0xffff); /* non constant bit rate */ | |
412 | |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
413 // RAL: Forward f_code also needed for B frames |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
414 if (s->pict_type == P_TYPE || s->pict_type == B_TYPE) { |
0 | 415 put_bits(&s->pb, 1, 0); /* half pel coordinates */ |
1432 | 416 if(s->codec_id == CODEC_ID_MPEG1VIDEO) |
417 put_bits(&s->pb, 3, s->f_code); /* forward_f_code */ | |
418 else | |
419 put_bits(&s->pb, 3, 7); /* forward_f_code */ | |
0 | 420 } |
421 | |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
422 // RAL: Backward f_code necessary for B frames |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
423 if (s->pict_type == B_TYPE) { |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
424 put_bits(&s->pb, 1, 0); /* half pel coordinates */ |
1432 | 425 if(s->codec_id == CODEC_ID_MPEG1VIDEO) |
426 put_bits(&s->pb, 3, s->b_code); /* backward_f_code */ | |
427 else | |
428 put_bits(&s->pb, 3, 7); /* backward_f_code */ | |
1421 | 429 } |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
430 |
0 | 431 put_bits(&s->pb, 1, 0); /* extra bit picture */ |
1677 | 432 |
433 s->frame_pred_frame_dct = 1; | |
1421 | 434 if(s->codec_id == CODEC_ID_MPEG2VIDEO){ |
435 put_header(s, EXT_START_CODE); | |
436 put_bits(&s->pb, 4, 8); //pic ext | |
1432 | 437 if (s->pict_type == P_TYPE || s->pict_type == B_TYPE) { |
438 put_bits(&s->pb, 4, s->f_code); | |
439 put_bits(&s->pb, 4, s->f_code); | |
440 }else{ | |
441 put_bits(&s->pb, 8, 255); | |
442 } | |
443 if (s->pict_type == B_TYPE) { | |
444 put_bits(&s->pb, 4, s->b_code); | |
445 put_bits(&s->pb, 4, s->b_code); | |
446 }else{ | |
447 put_bits(&s->pb, 8, 255); | |
448 } | |
1421 | 449 put_bits(&s->pb, 2, s->intra_dc_precision); |
450 put_bits(&s->pb, 2, s->picture_structure= PICT_FRAME); | |
1682 | 451 if (s->progressive_sequence) { |
452 put_bits(&s->pb, 1, 0); /* no repeat */ | |
453 } else { | |
454 put_bits(&s->pb, 1, s->current_picture_ptr->top_field_first); | |
455 } | |
1677 | 456 /* XXX: optimize the generation of this flag with entropy |
457 measures */ | |
458 s->frame_pred_frame_dct = s->progressive_sequence; | |
459 | |
460 put_bits(&s->pb, 1, s->frame_pred_frame_dct); | |
1421 | 461 put_bits(&s->pb, 1, s->concealment_motion_vectors); |
462 put_bits(&s->pb, 1, s->q_scale_type); | |
463 put_bits(&s->pb, 1, s->intra_vlc_format); | |
464 put_bits(&s->pb, 1, s->alternate_scan); | |
465 put_bits(&s->pb, 1, s->repeat_first_field); | |
466 put_bits(&s->pb, 1, s->chroma_420_type=1); | |
1677 | 467 s->progressive_frame = s->progressive_sequence; |
468 put_bits(&s->pb, 1, s->progressive_frame); | |
1421 | 469 put_bits(&s->pb, 1, 0); //composite_display_flag |
470 } | |
471 | |
1160 | 472 s->mb_y=0; |
473 ff_mpeg1_encode_slice_header(s); | |
0 | 474 } |
475 | |
1677 | 476 static inline void put_mb_modes(MpegEncContext *s, int n, int bits, |
477 int has_mv) | |
478 { | |
479 put_bits(&s->pb, n, bits); | |
480 if (!s->frame_pred_frame_dct) { | |
481 if (has_mv) | |
482 put_bits(&s->pb, 2, 2); /* motion_type: frame */ | |
483 put_bits(&s->pb, 1, s->interlaced_dct); | |
484 } | |
485 } | |
486 | |
0 | 487 void mpeg1_encode_mb(MpegEncContext *s, |
488 DCTELEM block[6][64], | |
489 int motion_x, int motion_y) | |
490 { | |
1160 | 491 int i, cbp; |
492 const int mb_x = s->mb_x; | |
493 const int mb_y = s->mb_y; | |
494 const int first_mb= mb_x == s->resync_mb_x && mb_y == s->resync_mb_y; | |
0 | 495 |
496 /* compute cbp */ | |
497 cbp = 0; | |
498 for(i=0;i<6;i++) { | |
499 if (s->block_last_index[i] >= 0) | |
500 cbp |= 1 << (5 - i); | |
501 } | |
502 | |
1421 | 503 if (cbp == 0 && !first_mb && (mb_x != s->mb_width - 1 || (mb_y != s->mb_height - 1 && s->codec_id == CODEC_ID_MPEG1VIDEO)) && |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
504 ((s->pict_type == P_TYPE && (motion_x | motion_y) == 0) || |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
505 (s->pict_type == B_TYPE && s->mv_dir == s->last_mv_dir && (((s->mv_dir & MV_DIR_FORWARD) ? ((s->mv[0][0][0] - s->last_mv[0][0][0])|(s->mv[0][0][1] - s->last_mv[0][0][1])) : 0) | |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
506 ((s->mv_dir & MV_DIR_BACKWARD) ? ((s->mv[1][0][0] - s->last_mv[1][0][0])|(s->mv[1][0][1] - s->last_mv[1][0][1])) : 0)) == 0))) { |
1160 | 507 s->mb_skip_run++; |
694 | 508 s->qscale -= s->dquant; |
740 | 509 s->skip_count++; |
510 s->misc_bits++; | |
511 s->last_bits++; | |
0 | 512 } else { |
1160 | 513 if(first_mb){ |
514 assert(s->mb_skip_run == 0); | |
515 encode_mb_skip_run(s, s->mb_x); | |
516 }else{ | |
517 encode_mb_skip_run(s, s->mb_skip_run); | |
0 | 518 } |
519 | |
520 if (s->pict_type == I_TYPE) { | |
694 | 521 if(s->dquant && cbp){ |
1677 | 522 put_mb_modes(s, 2, 1, 0); /* macroblock_type : macroblock_quant = 1 */ |
694 | 523 put_bits(&s->pb, 5, s->qscale); |
524 }else{ | |
1677 | 525 put_mb_modes(s, 1, 1, 0); /* macroblock_type : macroblock_quant = 0 */ |
694 | 526 s->qscale -= s->dquant; |
527 } | |
740 | 528 s->misc_bits+= get_bits_diff(s); |
529 s->i_count++; | |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
530 } else if (s->mb_intra) { |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
531 if(s->dquant && cbp){ |
1677 | 532 put_mb_modes(s, 6, 0x01, 0); |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
533 put_bits(&s->pb, 5, s->qscale); |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
534 }else{ |
1677 | 535 put_mb_modes(s, 5, 0x03, 0); |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
536 s->qscale -= s->dquant; |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
537 } |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
538 s->misc_bits+= get_bits_diff(s); |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
539 s->i_count++; |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
540 s->last_mv[0][0][0] = |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
541 s->last_mv[0][0][1] = 0; |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
542 } else if (s->pict_type == P_TYPE) { |
0 | 543 if (cbp != 0) { |
544 if (motion_x == 0 && motion_y == 0) { | |
694 | 545 if(s->dquant){ |
1677 | 546 put_mb_modes(s, 5, 1, 0); /* macroblock_pattern & quant */ |
694 | 547 put_bits(&s->pb, 5, s->qscale); |
548 }else{ | |
1677 | 549 put_mb_modes(s, 2, 1, 0); /* macroblock_pattern only */ |
694 | 550 } |
740 | 551 s->misc_bits+= get_bits_diff(s); |
0 | 552 put_bits(&s->pb, mbPatTable[cbp - 1][1], mbPatTable[cbp - 1][0]); |
553 } else { | |
694 | 554 if(s->dquant){ |
1677 | 555 put_mb_modes(s, 5, 2, 1); /* motion + cbp */ |
694 | 556 put_bits(&s->pb, 5, s->qscale); |
557 }else{ | |
1677 | 558 put_mb_modes(s, 1, 1, 1); /* motion + cbp */ |
694 | 559 } |
740 | 560 s->misc_bits+= get_bits_diff(s); |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
561 mpeg1_encode_motion(s, motion_x - s->last_mv[0][0][0], s->f_code); // RAL: f_code parameter added |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
562 mpeg1_encode_motion(s, motion_y - s->last_mv[0][0][1], s->f_code); // RAL: f_code parameter added |
740 | 563 s->mv_bits+= get_bits_diff(s); |
0 | 564 put_bits(&s->pb, mbPatTable[cbp - 1][1], mbPatTable[cbp - 1][0]); |
565 } | |
566 } else { | |
567 put_bits(&s->pb, 3, 1); /* motion only */ | |
1677 | 568 if (!s->frame_pred_frame_dct) |
569 put_bits(&s->pb, 2, 2); /* motion_type: frame */ | |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
570 mpeg1_encode_motion(s, motion_x - s->last_mv[0][0][0], s->f_code); // RAL: f_code parameter added |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
571 mpeg1_encode_motion(s, motion_y - s->last_mv[0][0][1], s->f_code); // RAL: f_code parameter added |
694 | 572 s->qscale -= s->dquant; |
740 | 573 s->mv_bits+= get_bits_diff(s); |
0 | 574 } |
740 | 575 s->f_count++; |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
576 } else |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
577 { // RAL: All the following bloc added for B frames: |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
578 if (cbp != 0) |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
579 { // With coded bloc pattern |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
580 if (s->mv_dir == (MV_DIR_FORWARD | MV_DIR_BACKWARD)) |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
581 { // Bi-directional motion |
1677 | 582 if (s->dquant) { |
583 put_mb_modes(s, 5, 2, 1); | |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
584 put_bits(&s->pb, 5, s->qscale); |
1677 | 585 } else { |
586 put_mb_modes(s, 2, 3, 1); | |
587 } | |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
588 s->misc_bits += get_bits_diff(s); |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
589 mpeg1_encode_motion(s, s->mv[0][0][0] - s->last_mv[0][0][0], s->f_code); |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
590 mpeg1_encode_motion(s, s->mv[0][0][1] - s->last_mv[0][0][1], s->f_code); |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
591 mpeg1_encode_motion(s, s->mv[1][0][0] - s->last_mv[1][0][0], s->b_code); |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
592 mpeg1_encode_motion(s, s->mv[1][0][1] - s->last_mv[1][0][1], s->b_code); |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
593 s->b_count++; |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
594 s->f_count++; |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
595 s->mv_bits += get_bits_diff(s); |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
596 put_bits(&s->pb, mbPatTable[cbp - 1][1], mbPatTable[cbp - 1][0]); |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
597 } |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
598 else if (s->mv_dir == MV_DIR_BACKWARD) |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
599 { // Backward motion |
1677 | 600 if (s->dquant) { |
601 put_mb_modes(s, 6, 2, 1); | |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
602 put_bits(&s->pb, 5, s->qscale); |
1677 | 603 } else { |
604 put_mb_modes(s, 3, 3, 1); | |
605 } | |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
606 s->misc_bits += get_bits_diff(s); |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
607 mpeg1_encode_motion(s, motion_x - s->last_mv[1][0][0], s->b_code); |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
608 mpeg1_encode_motion(s, motion_y - s->last_mv[1][0][1], s->b_code); |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
609 s->b_count++; |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
610 s->mv_bits += get_bits_diff(s); |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
611 put_bits(&s->pb, mbPatTable[cbp - 1][1], mbPatTable[cbp - 1][0]); |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
612 } |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
613 else if (s->mv_dir == MV_DIR_FORWARD) |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
614 { // Forward motion |
1677 | 615 if (s->dquant) { |
616 put_mb_modes(s, 6, 3, 1); | |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
617 put_bits(&s->pb, 5, s->qscale); |
1677 | 618 } else { |
619 put_mb_modes(s, 4, 3, 1); | |
620 } | |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
621 s->misc_bits += get_bits_diff(s); |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
622 mpeg1_encode_motion(s, motion_x - s->last_mv[0][0][0], s->f_code); |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
623 mpeg1_encode_motion(s, motion_y - s->last_mv[0][0][1], s->f_code); |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
624 s->f_count++; |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
625 s->mv_bits += get_bits_diff(s); |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
626 put_bits(&s->pb, mbPatTable[cbp - 1][1], mbPatTable[cbp - 1][0]); |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
627 } |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
628 } |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
629 else |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
630 { // No coded bloc pattern |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
631 if (s->mv_dir == (MV_DIR_FORWARD | MV_DIR_BACKWARD)) |
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
632 { // Bi-directional motion |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
633 put_bits(&s->pb, 2, 2); /* backward & forward motion */ |
1677 | 634 if (!s->frame_pred_frame_dct) |
635 put_bits(&s->pb, 2, 2); /* motion_type: frame */ | |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
636 mpeg1_encode_motion(s, s->mv[0][0][0] - s->last_mv[0][0][0], s->f_code); |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
637 mpeg1_encode_motion(s, s->mv[0][0][1] - s->last_mv[0][0][1], s->f_code); |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
638 mpeg1_encode_motion(s, s->mv[1][0][0] - s->last_mv[1][0][0], s->b_code); |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
639 mpeg1_encode_motion(s, s->mv[1][0][1] - s->last_mv[1][0][1], s->b_code); |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
640 s->b_count++; |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
641 s->f_count++; |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
642 } |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
643 else if (s->mv_dir == MV_DIR_BACKWARD) |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
644 { // Backward motion |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
645 put_bits(&s->pb, 3, 2); /* backward motion only */ |
1677 | 646 if (!s->frame_pred_frame_dct) |
647 put_bits(&s->pb, 2, 2); /* motion_type: frame */ | |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
648 mpeg1_encode_motion(s, motion_x - s->last_mv[1][0][0], s->b_code); |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
649 mpeg1_encode_motion(s, motion_y - s->last_mv[1][0][1], s->b_code); |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
650 s->b_count++; |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
651 } |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
652 else if (s->mv_dir == MV_DIR_FORWARD) |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
653 { // Forward motion |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
654 put_bits(&s->pb, 4, 2); /* forward motion only */ |
1677 | 655 if (!s->frame_pred_frame_dct) |
656 put_bits(&s->pb, 2, 2); /* motion_type: frame */ | |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
657 mpeg1_encode_motion(s, motion_x - s->last_mv[0][0][0], s->f_code); |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
658 mpeg1_encode_motion(s, motion_y - s->last_mv[0][0][1], s->f_code); |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
659 s->f_count++; |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
660 } |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
661 s->qscale -= s->dquant; |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
662 s->mv_bits += get_bits_diff(s); |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
663 } |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
664 // End of bloc from RAL |
0 | 665 } |
666 for(i=0;i<6;i++) { | |
667 if (cbp & (1 << (5 - i))) { | |
668 mpeg1_encode_block(s, block[i], i); | |
669 } | |
670 } | |
1160 | 671 s->mb_skip_run = 0; |
740 | 672 if(s->mb_intra) |
673 s->i_tex_bits+= get_bits_diff(s); | |
674 else | |
675 s->p_tex_bits+= get_bits_diff(s); | |
0 | 676 } |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
677 |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
678 // RAL: By this: |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
679 if (s->mv_dir & MV_DIR_FORWARD) |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
680 { |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
681 s->last_mv[0][0][0]= s->mv[0][0][0]; |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
682 s->last_mv[0][0][1]= s->mv[0][0][1]; |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
683 } |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
684 if (s->mv_dir & MV_DIR_BACKWARD) |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
685 { |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
686 s->last_mv[1][0][0]= s->mv[1][0][0]; |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
687 s->last_mv[1][0][1]= s->mv[1][0][1]; |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
688 } |
0 | 689 } |
690 | |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
691 // RAL: Parameter added: f_or_b_code |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
692 static void mpeg1_encode_motion(MpegEncContext *s, int val, int f_or_b_code) |
0 | 693 { |
694 int code, bit_size, l, m, bits, range, sign; | |
695 | |
696 if (val == 0) { | |
697 /* zero vector */ | |
698 code = 0; | |
699 put_bits(&s->pb, | |
700 mbMotionVectorTable[0][1], | |
701 mbMotionVectorTable[0][0]); | |
702 } else { | |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
703 bit_size = f_or_b_code - 1; |
0 | 704 range = 1 << bit_size; |
705 /* modulo encoding */ | |
706 l = 16 * range; | |
707 m = 2 * l; | |
708 if (val < -l) { | |
709 val += m; | |
710 } else if (val >= l) { | |
711 val -= m; | |
712 } | |
713 | |
714 if (val >= 0) { | |
715 val--; | |
716 code = (val >> bit_size) + 1; | |
717 bits = val & (range - 1); | |
718 sign = 0; | |
719 } else { | |
720 val = -val; | |
721 val--; | |
722 code = (val >> bit_size) + 1; | |
723 bits = val & (range - 1); | |
724 sign = 1; | |
725 } | |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
726 |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
727 assert(code > 0 && code <= 16); |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
728 |
0 | 729 put_bits(&s->pb, |
730 mbMotionVectorTable[code][1], | |
731 mbMotionVectorTable[code][0]); | |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents:
1025
diff
changeset
|
732 |
0 | 733 put_bits(&s->pb, 1, sign); |
734 if (bit_size > 0) { | |
735 put_bits(&s->pb, bit_size, bits); | |
736 } | |
737 } | |
738 } | |
739 | |
498 | 740 void ff_mpeg1_encode_init(MpegEncContext *s) |
281
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
741 { |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
742 static int done=0; |
498 | 743 |
744 common_init(s); | |
745 | |
281
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
746 if(!done){ |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
747 int f_code; |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
748 int mv; |
498 | 749 int i; |
281
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
750 |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
751 done=1; |
498 | 752 init_rl(&rl_mpeg1); |
947 | 753 |
498 | 754 for(i=0; i<64; i++) |
755 { | |
756 mpeg1_max_level[0][i]= rl_mpeg1.max_level[0][i]; | |
757 mpeg1_index_run[0][i]= rl_mpeg1.index_run[0][i]; | |
758 } | |
947 | 759 |
760 init_uni_ac_vlc(&rl_mpeg1, uni_mpeg1_ac_vlc_bits, uni_mpeg1_ac_vlc_len); | |
498 | 761 |
762 /* build unified dc encoding tables */ | |
763 for(i=-255; i<256; i++) | |
764 { | |
765 int adiff, index; | |
766 int bits, code; | |
767 int diff=i; | |
768 | |
769 adiff = ABS(diff); | |
770 if(diff<0) diff--; | |
771 index = vlc_dc_table[adiff]; | |
772 | |
773 bits= vlc_dc_lum_bits[index] + index; | |
774 code= (vlc_dc_lum_code[index]<<index) + (diff & ((1 << index) - 1)); | |
775 mpeg1_lum_dc_uni[i+255]= bits + (code<<8); | |
776 | |
777 bits= vlc_dc_chroma_bits[index] + index; | |
778 code= (vlc_dc_chroma_code[index]<<index) + (diff & ((1 << index) - 1)); | |
779 mpeg1_chr_dc_uni[i+255]= bits + (code<<8); | |
780 } | |
781 | |
1162 | 782 mv_penalty= av_mallocz( sizeof(uint8_t)*(MAX_FCODE+1)*(2*MAX_MV+1) ); |
783 | |
281
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
784 for(f_code=1; f_code<=MAX_FCODE; f_code++){ |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
785 for(mv=-MAX_MV; mv<=MAX_MV; mv++){ |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
786 int len; |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
787 |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
788 if(mv==0) len= mbMotionVectorTable[0][1]; |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
789 else{ |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
790 int val, bit_size, range, code; |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
791 |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
792 bit_size = s->f_code - 1; |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
793 range = 1 << bit_size; |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
794 |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
795 val=mv; |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
796 if (val < 0) |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
797 val = -val; |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
798 val--; |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
799 code = (val >> bit_size) + 1; |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
800 if(code<17){ |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
801 len= mbMotionVectorTable[code][1] + 1 + bit_size; |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
802 }else{ |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
803 len= mbMotionVectorTable[16][1] + 2 + bit_size; |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
804 } |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
805 } |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
806 |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
807 mv_penalty[f_code][mv+MAX_MV]= len; |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
808 } |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
809 } |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
810 |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
811 |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
812 for(f_code=MAX_FCODE; f_code>0; f_code--){ |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
813 for(mv=-(8<<f_code); mv<(8<<f_code); mv++){ |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
814 fcode_tab[mv+MAX_MV]= f_code; |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
815 } |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
816 } |
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
817 } |
936 | 818 s->me.mv_penalty= mv_penalty; |
281
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
819 s->fcode_tab= fcode_tab; |
1421 | 820 if(s->codec_id == CODEC_ID_MPEG1VIDEO){ |
821 s->min_qcoeff=-255; | |
822 s->max_qcoeff= 255; | |
823 }else{ | |
824 s->min_qcoeff=-2047; | |
825 s->max_qcoeff= 2047; | |
826 } | |
947 | 827 s->intra_ac_vlc_length= |
1503 | 828 s->inter_ac_vlc_length= |
829 s->intra_ac_vlc_last_length= | |
830 s->inter_ac_vlc_last_length= uni_mpeg1_ac_vlc_len; | |
281
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
277
diff
changeset
|
831 } |
498 | 832 |
0 | 833 static inline void encode_dc(MpegEncContext *s, int diff, int component) |
834 { | |
835 if (component == 0) { | |
237
75123d30f862
optimized encode_dc() (+2% speed on P3 for mpeg1 intra only encodings)
michaelni
parents:
236
diff
changeset
|
836 put_bits( |
75123d30f862
optimized encode_dc() (+2% speed on P3 for mpeg1 intra only encodings)
michaelni
parents:
236
diff
changeset
|
837 &s->pb, |
75123d30f862
optimized encode_dc() (+2% speed on P3 for mpeg1 intra only encodings)
michaelni
parents:
236
diff
changeset
|
838 mpeg1_lum_dc_uni[diff+255]&0xFF, |
75123d30f862
optimized encode_dc() (+2% speed on P3 for mpeg1 intra only encodings)
michaelni
parents:
236
diff
changeset
|
839 mpeg1_lum_dc_uni[diff+255]>>8); |
0 | 840 } else { |
237
75123d30f862
optimized encode_dc() (+2% speed on P3 for mpeg1 intra only encodings)
michaelni
parents:
236
diff
changeset
|
841 put_bits( |
75123d30f862
optimized encode_dc() (+2% speed on P3 for mpeg1 intra only encodings)
michaelni
parents:
236
diff
changeset
|
842 &s->pb, |
75123d30f862
optimized encode_dc() (+2% speed on P3 for mpeg1 intra only encodings)
michaelni
parents:
236
diff
changeset
|
843 mpeg1_chr_dc_uni[diff+255]&0xFF, |
75123d30f862
optimized encode_dc() (+2% speed on P3 for mpeg1 intra only encodings)
michaelni
parents:
236
diff
changeset
|
844 mpeg1_chr_dc_uni[diff+255]>>8); |
0 | 845 } |
846 } | |
847 | |
848 static void mpeg1_encode_block(MpegEncContext *s, | |
849 DCTELEM *block, | |
850 int n) | |
851 { | |
852 int alevel, level, last_non_zero, dc, diff, i, j, run, last_index, sign; | |
853 int code, component; | |
236 | 854 // RLTable *rl = &rl_mpeg1; |
0 | 855 |
856 last_index = s->block_last_index[n]; | |
857 | |
858 /* DC coef */ | |
859 if (s->mb_intra) { | |
860 component = (n <= 3 ? 0 : n - 4 + 1); | |
861 dc = block[0]; /* overflow is impossible */ | |
862 diff = dc - s->last_dc[component]; | |
863 encode_dc(s, diff, component); | |
864 s->last_dc[component] = dc; | |
865 i = 1; | |
1421 | 866 /* |
867 if (s->intra_vlc_format) | |
868 rl = &rl_mpeg2; | |
869 else | |
870 rl = &rl_mpeg1; | |
871 */ | |
0 | 872 } else { |
873 /* encode the first coefficient : needs to be done here because | |
874 it is handled slightly differently */ | |
875 level = block[0]; | |
876 if (abs(level) == 1) { | |
1064 | 877 code = ((uint32_t)level >> 31); /* the sign bit */ |
0 | 878 put_bits(&s->pb, 2, code | 0x02); |
879 i = 1; | |
880 } else { | |
881 i = 0; | |
882 last_non_zero = -1; | |
883 goto next_coef; | |
884 } | |
885 } | |
886 | |
887 /* now quantify & encode AC coefs */ | |
888 last_non_zero = i - 1; | |
236 | 889 |
0 | 890 for(;i<=last_index;i++) { |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
694
diff
changeset
|
891 j = s->intra_scantable.permutated[i]; |
0 | 892 level = block[j]; |
893 next_coef: | |
894 #if 0 | |
895 if (level != 0) | |
896 dprintf("level[%d]=%d\n", i, level); | |
897 #endif | |
898 /* encode using VLC */ | |
899 if (level != 0) { | |
900 run = i - last_non_zero - 1; | |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
694
diff
changeset
|
901 |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
694
diff
changeset
|
902 alevel= level; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
694
diff
changeset
|
903 MASK_ABS(sign, alevel) |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
694
diff
changeset
|
904 sign&=1; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
694
diff
changeset
|
905 |
236 | 906 // code = get_rl_index(rl, 0, run, alevel); |
947 | 907 if (alevel <= mpeg1_max_level[0][run]){ |
236 | 908 code= mpeg1_index_run[0][run] + alevel - 1; |
909 /* store the vlc & sign at once */ | |
910 put_bits(&s->pb, mpeg1_vlc[code][1]+1, (mpeg1_vlc[code][0]<<1) + sign); | |
0 | 911 } else { |
236 | 912 /* escape seems to be pretty rare <5% so i dont optimize it */ |
913 put_bits(&s->pb, mpeg1_vlc[111/*rl->n*/][1], mpeg1_vlc[111/*rl->n*/][0]); | |
0 | 914 /* escape: only clip in this case */ |
915 put_bits(&s->pb, 6, run); | |
1421 | 916 if(s->codec_id == CODEC_ID_MPEG1VIDEO){ |
917 if (alevel < 128) { | |
918 put_bits(&s->pb, 8, level & 0xff); | |
0 | 919 } else { |
1421 | 920 if (level < 0) { |
921 put_bits(&s->pb, 16, 0x8001 + level + 255); | |
922 } else { | |
923 put_bits(&s->pb, 16, level & 0xffff); | |
924 } | |
0 | 925 } |
1421 | 926 }else{ |
927 put_bits(&s->pb, 12, level & 0xfff); | |
0 | 928 } |
929 } | |
930 last_non_zero = i; | |
931 } | |
932 } | |
933 /* end of block */ | |
934 put_bits(&s->pb, 2, 0x2); | |
935 } | |
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
936 #endif //CONFIG_ENCODERS |
0 | 937 |
938 /******************************************/ | |
939 /* decoding */ | |
940 | |
941 static VLC dc_lum_vlc; | |
942 static VLC dc_chroma_vlc; | |
943 static VLC mv_vlc; | |
944 static VLC mbincr_vlc; | |
945 static VLC mb_ptype_vlc; | |
946 static VLC mb_btype_vlc; | |
947 static VLC mb_pat_vlc; | |
948 | |
1410
524c904a66b8
PSX MDEC decoder, based upon some code from Sebastian Jedruszkiewicz <elf at frogger dot rules dot pl>
michaelni
parents:
1409
diff
changeset
|
949 static void init_vlcs() |
0 | 950 { |
951 static int done = 0; | |
952 | |
953 if (!done) { | |
494 | 954 done = 1; |
0 | 955 |
568 | 956 init_vlc(&dc_lum_vlc, DC_VLC_BITS, 12, |
0 | 957 vlc_dc_lum_bits, 1, 1, |
958 vlc_dc_lum_code, 2, 2); | |
568 | 959 init_vlc(&dc_chroma_vlc, DC_VLC_BITS, 12, |
0 | 960 vlc_dc_chroma_bits, 1, 1, |
961 vlc_dc_chroma_code, 2, 2); | |
545 | 962 init_vlc(&mv_vlc, MV_VLC_BITS, 17, |
0 | 963 &mbMotionVectorTable[0][1], 2, 1, |
964 &mbMotionVectorTable[0][0], 2, 1); | |
1181 | 965 init_vlc(&mbincr_vlc, MBINCR_VLC_BITS, 36, |
0 | 966 &mbAddrIncrTable[0][1], 2, 1, |
967 &mbAddrIncrTable[0][0], 2, 1); | |
545 | 968 init_vlc(&mb_pat_vlc, MB_PAT_VLC_BITS, 63, |
0 | 969 &mbPatTable[0][1], 2, 1, |
970 &mbPatTable[0][0], 2, 1); | |
971 | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
972 init_vlc(&mb_ptype_vlc, MB_PTYPE_VLC_BITS, 7, |
0 | 973 &table_mb_ptype[0][1], 2, 1, |
974 &table_mb_ptype[0][0], 2, 1); | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
975 init_vlc(&mb_btype_vlc, MB_BTYPE_VLC_BITS, 11, |
0 | 976 &table_mb_btype[0][1], 2, 1, |
977 &table_mb_btype[0][0], 2, 1); | |
978 init_rl(&rl_mpeg1); | |
979 init_rl(&rl_mpeg2); | |
552 | 980 |
981 init_2d_vlc_rl(&rl_mpeg1); | |
982 init_2d_vlc_rl(&rl_mpeg2); | |
0 | 983 } |
984 } | |
985 | |
986 static inline int get_dmv(MpegEncContext *s) | |
987 { | |
21 | 988 if(get_bits1(&s->gb)) |
989 return 1 - (get_bits1(&s->gb) << 1); | |
0 | 990 else |
991 return 0; | |
992 } | |
993 | |
54 | 994 static inline int get_qscale(MpegEncContext *s) |
995 { | |
1253
5642ebadf1b5
small optimize mpeg12.c/get_qscale patch by (BERO <bero at geocities dot co dot jp>) and the return idea by arpi
michaelni
parents:
1220
diff
changeset
|
996 int qscale = get_bits(&s->gb, 5); |
1421 | 997 if (s->codec_id == CODEC_ID_MPEG2VIDEO) { |
54 | 998 if (s->q_scale_type) { |
1253
5642ebadf1b5
small optimize mpeg12.c/get_qscale patch by (BERO <bero at geocities dot co dot jp>) and the return idea by arpi
michaelni
parents:
1220
diff
changeset
|
999 return non_linear_qscale[qscale]; |
54 | 1000 } else { |
1253
5642ebadf1b5
small optimize mpeg12.c/get_qscale patch by (BERO <bero at geocities dot co dot jp>) and the return idea by arpi
michaelni
parents:
1220
diff
changeset
|
1001 return qscale << 1; |
54 | 1002 } |
1003 } | |
1004 return qscale; | |
1005 } | |
1006 | |
0 | 1007 /* motion type (for mpeg2) */ |
1008 #define MT_FIELD 1 | |
1009 #define MT_FRAME 2 | |
1010 #define MT_16X8 2 | |
1011 #define MT_DMV 3 | |
1012 | |
1013 static int mpeg_decode_mb(MpegEncContext *s, | |
1014 DCTELEM block[6][64]) | |
1015 { | |
751 | 1016 int i, j, k, cbp, val, mb_type, motion_type; |
0 | 1017 |
1018 dprintf("decode_mb: x=%d y=%d\n", s->mb_x, s->mb_y); | |
1019 | |
1021
2d7c9f5738de
trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents:
947
diff
changeset
|
1020 assert(s->mb_skiped==0); |
2d7c9f5738de
trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents:
947
diff
changeset
|
1021 |
1160 | 1022 if (s->mb_skip_run-- != 0) { |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1023 if(s->pict_type == I_TYPE){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
1024 av_log(s->avctx, AV_LOG_ERROR, "skiped MB in I frame at %d %d\n", s->mb_x, s->mb_y); |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1025 return -1; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1026 } |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1027 |
0 | 1028 /* skip mb */ |
1029 s->mb_intra = 0; | |
1030 for(i=0;i<6;i++) | |
1031 s->block_last_index[i] = -1; | |
1032 s->mv_type = MV_TYPE_16X16; | |
1033 if (s->pict_type == P_TYPE) { | |
1034 /* if P type, zero motion vector is implied */ | |
1035 s->mv_dir = MV_DIR_FORWARD; | |
1036 s->mv[0][0][0] = s->mv[0][0][1] = 0; | |
1037 s->last_mv[0][0][0] = s->last_mv[0][0][1] = 0; | |
59
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
1038 s->last_mv[0][1][0] = s->last_mv[0][1][1] = 0; |
1021
2d7c9f5738de
trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents:
947
diff
changeset
|
1039 s->mb_skiped = 1; |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1040 s->current_picture.mb_type[ s->mb_x + s->mb_y*s->mb_stride ]= MB_TYPE_SKIP | MB_TYPE_L0 | MB_TYPE_16x16; |
0 | 1041 } else { |
1042 /* if B type, reuse previous vectors and directions */ | |
1043 s->mv[0][0][0] = s->last_mv[0][0][0]; | |
1044 s->mv[0][0][1] = s->last_mv[0][0][1]; | |
1045 s->mv[1][0][0] = s->last_mv[1][0][0]; | |
1046 s->mv[1][0][1] = s->last_mv[1][0][1]; | |
1021
2d7c9f5738de
trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents:
947
diff
changeset
|
1047 |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1048 s->current_picture.mb_type[ s->mb_x + s->mb_y*s->mb_stride ]= |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1049 s->current_picture.mb_type[ s->mb_x + s->mb_y*s->mb_stride - 1] | MB_TYPE_SKIP; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1050 // assert(s->current_picture.mb_type[ s->mb_x + s->mb_y*s->mb_stride - 1]&(MB_TYPE_16x16|MB_TYPE_16x8)); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1051 |
1021
2d7c9f5738de
trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents:
947
diff
changeset
|
1052 if((s->mv[0][0][0]|s->mv[0][0][1]|s->mv[1][0][0]|s->mv[1][0][1])==0) |
2d7c9f5738de
trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents:
947
diff
changeset
|
1053 s->mb_skiped = 1; |
0 | 1054 } |
930 | 1055 |
0 | 1056 return 0; |
1057 } | |
1058 | |
1059 switch(s->pict_type) { | |
1060 default: | |
1061 case I_TYPE: | |
21 | 1062 if (get_bits1(&s->gb) == 0) { |
1376 | 1063 if (get_bits1(&s->gb) == 0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
1064 av_log(s->avctx, AV_LOG_ERROR, "invalid mb type in I Frame at %d %d\n", s->mb_x, s->mb_y); |
0 | 1065 return -1; |
1376 | 1066 } |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1067 mb_type = MB_TYPE_QUANT | MB_TYPE_INTRA; |
0 | 1068 } else { |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1069 mb_type = MB_TYPE_INTRA; |
0 | 1070 } |
1071 break; | |
1072 case P_TYPE: | |
545 | 1073 mb_type = get_vlc2(&s->gb, mb_ptype_vlc.table, MB_PTYPE_VLC_BITS, 1); |
568 | 1074 if (mb_type < 0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
1075 av_log(s->avctx, AV_LOG_ERROR, "invalid mb type in P Frame at %d %d\n", s->mb_x, s->mb_y); |
0 | 1076 return -1; |
568 | 1077 } |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1078 mb_type = ptype2mb_type[ mb_type ]; |
0 | 1079 break; |
1080 case B_TYPE: | |
545 | 1081 mb_type = get_vlc2(&s->gb, mb_btype_vlc.table, MB_BTYPE_VLC_BITS, 1); |
568 | 1082 if (mb_type < 0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
1083 av_log(s->avctx, AV_LOG_ERROR, "invalid mb type in B Frame at %d %d\n", s->mb_x, s->mb_y); |
0 | 1084 return -1; |
568 | 1085 } |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1086 mb_type = btype2mb_type[ mb_type ]; |
0 | 1087 break; |
1088 } | |
1089 dprintf("mb_type=%x\n", mb_type); | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1090 // motion_type = 0; /* avoid warning */ |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1091 if (IS_INTRA(mb_type)) { |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1092 /* compute dct type */ |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1093 if (s->picture_structure == PICT_FRAME && //FIXME add a interlaced_dct coded var? |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1094 !s->frame_pred_frame_dct) { |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1095 s->interlaced_dct = get_bits1(&s->gb); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1096 } |
0 | 1097 |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1098 if (IS_QUANT(mb_type)) |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1099 s->qscale = get_qscale(s); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1100 |
0 | 1101 if (s->concealment_motion_vectors) { |
1102 /* just parse them */ | |
1103 if (s->picture_structure != PICT_FRAME) | |
21 | 1104 skip_bits1(&s->gb); /* field select */ |
1323 | 1105 |
1106 s->mv[0][0][0]= s->last_mv[0][0][0]= s->last_mv[0][1][0] = | |
1107 mpeg_decode_motion(s, s->mpeg_f_code[0][0], s->last_mv[0][0][0]); | |
1108 s->mv[0][0][1]= s->last_mv[0][0][1]= s->last_mv[0][1][1] = | |
1109 mpeg_decode_motion(s, s->mpeg_f_code[0][1], s->last_mv[0][0][1]); | |
1110 | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1111 skip_bits1(&s->gb); /* marker */ |
1323 | 1112 }else |
1113 memset(s->last_mv, 0, sizeof(s->last_mv)); /* reset mv prediction */ | |
0 | 1114 s->mb_intra = 1; |
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1115 #ifdef HAVE_XVMC |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1116 //one 1 we memcpy blocks in xvmcvideo |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1117 if(s->avctx->xvmc_acceleration > 1){ |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1118 XVMC_pack_pblocks(s,-1);//inter are always full blocks |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1119 if(s->swap_uv){ |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1120 exchange_uv(s); |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1121 } |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1122 } |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1123 #endif |
0 | 1124 |
1421 | 1125 if (s->codec_id == CODEC_ID_MPEG2VIDEO) { |
0 | 1126 for(i=0;i<6;i++) { |
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1127 if (mpeg2_decode_block_intra(s, s->pblocks[i], i) < 0) |
711 | 1128 return -1; |
0 | 1129 } |
1130 } else { | |
1131 for(i=0;i<6;i++) { | |
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1132 if (mpeg1_decode_block_intra(s, s->pblocks[i], i) < 0) |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1133 return -1; |
0 | 1134 } |
1135 } | |
1136 } else { | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1137 if (mb_type & MB_TYPE_ZERO_MV){ |
1655 | 1138 assert(mb_type & MB_TYPE_CBP); |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1139 |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1140 /* compute dct type */ |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1141 if (s->picture_structure == PICT_FRAME && //FIXME add a interlaced_dct coded var? |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1142 !s->frame_pred_frame_dct) { |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1143 s->interlaced_dct = get_bits1(&s->gb); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1144 } |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1145 |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1146 if (IS_QUANT(mb_type)) |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1147 s->qscale = get_qscale(s); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1148 |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1149 s->mv_dir = MV_DIR_FORWARD; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1150 s->mv_type = MV_TYPE_16X16; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1151 s->last_mv[0][0][0] = 0; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1152 s->last_mv[0][0][1] = 0; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1153 s->last_mv[0][1][0] = 0; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1154 s->last_mv[0][1][1] = 0; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1155 s->mv[0][0][0] = 0; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1156 s->mv[0][0][1] = 0; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1157 }else{ |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1158 assert(mb_type & MB_TYPE_L0L1); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1159 //FIXME decide if MBs in field pictures are MB_TYPE_INTERLACED |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1160 /* get additionnal motion vector type */ |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1161 if (s->frame_pred_frame_dct) |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1162 motion_type = MT_FRAME; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1163 else{ |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1164 motion_type = get_bits(&s->gb, 2); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1165 } |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1166 |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1167 /* compute dct type */ |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1168 if (s->picture_structure == PICT_FRAME && //FIXME add a interlaced_dct coded var? |
1655 | 1169 !s->frame_pred_frame_dct && HAS_CBP(mb_type)) { |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1170 s->interlaced_dct = get_bits1(&s->gb); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1171 } |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1172 |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1173 if (IS_QUANT(mb_type)) |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1174 s->qscale = get_qscale(s); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1175 |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1176 /* motion vectors */ |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1177 s->mv_dir = 0; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1178 for(i=0;i<2;i++) { |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1179 if (USES_LIST(mb_type, i)) { |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1180 s->mv_dir |= (MV_DIR_FORWARD >> i); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1181 dprintf("motion_type=%d\n", motion_type); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1182 switch(motion_type) { |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1183 case MT_FRAME: /* or MT_16X8 */ |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1184 if (s->picture_structure == PICT_FRAME) { |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1185 /* MT_FRAME */ |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1186 mb_type |= MB_TYPE_16x16; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1187 s->mv_type = MV_TYPE_16X16; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1188 s->mv[i][0][0]= s->last_mv[i][0][0]= s->last_mv[i][1][0] = |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1189 mpeg_decode_motion(s, s->mpeg_f_code[i][0], s->last_mv[i][0][0]); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1190 s->mv[i][0][1]= s->last_mv[i][0][1]= s->last_mv[i][1][1] = |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1191 mpeg_decode_motion(s, s->mpeg_f_code[i][1], s->last_mv[i][0][1]); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1192 /* full_pel: only for mpeg1 */ |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1193 if (s->full_pel[i]){ |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1194 s->mv[i][0][0] <<= 1; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1195 s->mv[i][0][1] <<= 1; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1196 } |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1197 } else { |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1198 /* MT_16X8 */ |
1673 | 1199 mb_type |= MB_TYPE_16x8 | MB_TYPE_INTERLACED; |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1200 s->mv_type = MV_TYPE_16X8; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1201 for(j=0;j<2;j++) { |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1202 s->field_select[i][j] = get_bits1(&s->gb); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1203 for(k=0;k<2;k++) { |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1204 val = mpeg_decode_motion(s, s->mpeg_f_code[i][k], |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1205 s->last_mv[i][j][k]); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1206 s->last_mv[i][j][k] = val; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1207 s->mv[i][j][k] = val; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1208 } |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1209 } |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1210 } |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1211 break; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1212 case MT_FIELD: |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1213 s->mv_type = MV_TYPE_FIELD; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1214 if (s->picture_structure == PICT_FRAME) { |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1215 mb_type |= MB_TYPE_16x8 | MB_TYPE_INTERLACED; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1216 for(j=0;j<2;j++) { |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1217 s->field_select[i][j] = get_bits1(&s->gb); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1218 val = mpeg_decode_motion(s, s->mpeg_f_code[i][0], |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1219 s->last_mv[i][j][0]); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1220 s->last_mv[i][j][0] = val; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1221 s->mv[i][j][0] = val; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1222 dprintf("fmx=%d\n", val); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1223 val = mpeg_decode_motion(s, s->mpeg_f_code[i][1], |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1224 s->last_mv[i][j][1] >> 1); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1225 s->last_mv[i][j][1] = val << 1; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1226 s->mv[i][j][1] = val; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1227 dprintf("fmy=%d\n", val); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1228 } |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1229 } else { |
1673 | 1230 mb_type |= MB_TYPE_16x16 | MB_TYPE_INTERLACED; |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1231 s->field_select[i][0] = get_bits1(&s->gb); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1232 for(k=0;k<2;k++) { |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1233 val = mpeg_decode_motion(s, s->mpeg_f_code[i][k], |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1234 s->last_mv[i][0][k]); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1235 s->last_mv[i][0][k] = val; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1236 s->last_mv[i][1][k] = val; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1237 s->mv[i][0][k] = val; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1238 } |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1239 } |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1240 break; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1241 case MT_DMV: |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1242 { |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1243 int dmx, dmy, mx, my, m; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1244 |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1245 mx = mpeg_decode_motion(s, s->mpeg_f_code[i][0], |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1246 s->last_mv[i][0][0]); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1247 s->last_mv[i][0][0] = mx; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1248 s->last_mv[i][1][0] = mx; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1249 dmx = get_dmv(s); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1250 my = mpeg_decode_motion(s, s->mpeg_f_code[i][1], |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1251 s->last_mv[i][0][1] >> 1); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1252 dmy = get_dmv(s); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1253 s->mv_type = MV_TYPE_DMV; |
1326
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
1254 |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
1255 |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
1256 s->last_mv[i][0][1] = my<<1; |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
1257 s->last_mv[i][1][1] = my<<1; |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
1258 |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
1259 s->mv[i][0][0] = mx; |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
1260 s->mv[i][0][1] = my; |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
1261 s->mv[i][1][0] = mx;//not used |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
1262 s->mv[i][1][1] = my;//not used |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
1263 |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1264 if (s->picture_structure == PICT_FRAME) { |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1265 mb_type |= MB_TYPE_16x16 | MB_TYPE_INTERLACED; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1266 |
1326
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
1267 //m = 1 + 2 * s->top_field_first; |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
1268 m = s->top_field_first ? 1 : 3; |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1269 |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1270 /* top -> top pred */ |
1326
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
1271 s->mv[i][2][0] = ((mx * m + (mx > 0)) >> 1) + dmx; |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
1272 s->mv[i][2][1] = ((my * m + (my > 0)) >> 1) + dmy - 1; |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1273 m = 4 - m; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1274 s->mv[i][3][0] = ((mx * m + (mx > 0)) >> 1) + dmx; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1275 s->mv[i][3][1] = ((my * m + (my > 0)) >> 1) + dmy + 1; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1276 } else { |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1277 mb_type |= MB_TYPE_16x16; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1278 |
1326
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
1279 s->mv[i][2][0] = ((mx + (mx > 0)) >> 1) + dmx; |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
1280 s->mv[i][2][1] = ((my + (my > 0)) >> 1) + dmy; |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
1281 if(s->picture_structure == PICT_TOP_FIELD) |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
1282 s->mv[i][2][1]--; |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
1283 else |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1325
diff
changeset
|
1284 s->mv[i][2][1]++; |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1285 } |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1286 } |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1287 break; |
1673 | 1288 default: |
1289 av_log(s->avctx, AV_LOG_ERROR, "00 motion_type at %d %d\n", s->mb_x, s->mb_y); | |
1290 return -1; | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1291 } |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1292 } |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1293 } |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1294 } |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1295 |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1296 s->mb_intra = 0; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1297 |
1655 | 1298 if (HAS_CBP(mb_type)) { |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1299 cbp = get_vlc2(&s->gb, mb_pat_vlc.table, MB_PAT_VLC_BITS, 1); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1300 if (cbp < 0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
1301 av_log(s->avctx, AV_LOG_ERROR, "invalid cbp at %d %d\n", s->mb_x, s->mb_y); |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1302 return -1; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1303 } |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1304 cbp++; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1305 |
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1306 #ifdef HAVE_XVMC |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1307 //on 1 we memcpy blocks in xvmcvideo |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1308 if(s->avctx->xvmc_acceleration > 1){ |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1309 XVMC_pack_pblocks(s,cbp); |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1310 if(s->swap_uv){ |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1311 exchange_uv(s); |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1312 } |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1313 } |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1314 #endif |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1315 |
1421 | 1316 if (s->codec_id == CODEC_ID_MPEG2VIDEO) { |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1317 for(i=0;i<6;i++) { |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1318 if (cbp & 32) { |
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1319 if (mpeg2_decode_block_non_intra(s, s->pblocks[i], i) < 0) |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1320 return -1; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1321 } else { |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1322 s->block_last_index[i] = -1; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1323 } |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1324 cbp+=cbp; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1325 } |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1326 } else { |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1327 for(i=0;i<6;i++) { |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1328 if (cbp & 32) { |
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
1329 if (mpeg1_decode_block_inter(s, s->pblocks[i], i) < 0) |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1330 return -1; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1331 } else { |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1332 s->block_last_index[i] = -1; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1333 } |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1334 cbp+=cbp; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1335 } |
711 | 1336 } |
1337 }else{ | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1338 for(i=0;i<6;i++) |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1339 s->block_last_index[i] = -1; |
0 | 1340 } |
1341 } | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1342 |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1343 s->current_picture.mb_type[ s->mb_x + s->mb_y*s->mb_stride ]= mb_type; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1344 |
0 | 1345 return 0; |
1346 } | |
1347 | |
1348 /* as h263, but only 17 codes */ | |
1349 static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred) | |
1350 { | |
1255
625ccacd1113
decode motion & modulo optimize patch by (BERO <bero at geocities dot co dot jp>)
michaelni
parents:
1254
diff
changeset
|
1351 int code, sign, val, l, shift; |
0 | 1352 |
545 | 1353 code = get_vlc2(&s->gb, mv_vlc.table, MV_VLC_BITS, 2); |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1354 if (code == 0) { |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1355 return pred; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1356 } |
0 | 1357 if (code < 0) { |
1358 return 0xffff; | |
1359 } | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1360 |
21 | 1361 sign = get_bits1(&s->gb); |
0 | 1362 shift = fcode - 1; |
1255
625ccacd1113
decode motion & modulo optimize patch by (BERO <bero at geocities dot co dot jp>)
michaelni
parents:
1254
diff
changeset
|
1363 val = code; |
625ccacd1113
decode motion & modulo optimize patch by (BERO <bero at geocities dot co dot jp>)
michaelni
parents:
1254
diff
changeset
|
1364 if (shift) { |
625ccacd1113
decode motion & modulo optimize patch by (BERO <bero at geocities dot co dot jp>)
michaelni
parents:
1254
diff
changeset
|
1365 val = (val - 1) << shift; |
0 | 1366 val |= get_bits(&s->gb, shift); |
1255
625ccacd1113
decode motion & modulo optimize patch by (BERO <bero at geocities dot co dot jp>)
michaelni
parents:
1254
diff
changeset
|
1367 val++; |
625ccacd1113
decode motion & modulo optimize patch by (BERO <bero at geocities dot co dot jp>)
michaelni
parents:
1254
diff
changeset
|
1368 } |
0 | 1369 if (sign) |
1370 val = -val; | |
1371 val += pred; | |
1372 | |
1373 /* modulo decoding */ | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1374 l = 1 << (shift+4); |
1255
625ccacd1113
decode motion & modulo optimize patch by (BERO <bero at geocities dot co dot jp>)
michaelni
parents:
1254
diff
changeset
|
1375 val = ((val + l)&(l*2-1)) - l; |
0 | 1376 return val; |
1377 } | |
1378 | |
1410
524c904a66b8
PSX MDEC decoder, based upon some code from Sebastian Jedruszkiewicz <elf at frogger dot rules dot pl>
michaelni
parents:
1409
diff
changeset
|
1379 static inline int decode_dc(GetBitContext *gb, int component) |
0 | 1380 { |
1381 int code, diff; | |
1382 | |
1383 if (component == 0) { | |
1410
524c904a66b8
PSX MDEC decoder, based upon some code from Sebastian Jedruszkiewicz <elf at frogger dot rules dot pl>
michaelni
parents:
1409
diff
changeset
|
1384 code = get_vlc2(gb, dc_lum_vlc.table, DC_VLC_BITS, 2); |
0 | 1385 } else { |
1410
524c904a66b8
PSX MDEC decoder, based upon some code from Sebastian Jedruszkiewicz <elf at frogger dot rules dot pl>
michaelni
parents:
1409
diff
changeset
|
1386 code = get_vlc2(gb, dc_chroma_vlc.table, DC_VLC_BITS, 2); |
0 | 1387 } |
568 | 1388 if (code < 0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
1389 av_log(NULL, AV_LOG_ERROR, "invalid dc code at\n"); |
0 | 1390 return 0xffff; |
568 | 1391 } |
0 | 1392 if (code == 0) { |
1393 diff = 0; | |
1394 } else { | |
1410
524c904a66b8
PSX MDEC decoder, based upon some code from Sebastian Jedruszkiewicz <elf at frogger dot rules dot pl>
michaelni
parents:
1409
diff
changeset
|
1395 diff = get_xbits(gb, code); |
0 | 1396 } |
1397 return diff; | |
1398 } | |
1399 | |
711 | 1400 static inline int mpeg1_decode_block_intra(MpegEncContext *s, |
0 | 1401 DCTELEM *block, |
1402 int n) | |
1403 { | |
1404 int level, dc, diff, i, j, run; | |
711 | 1405 int component; |
0 | 1406 RLTable *rl = &rl_mpeg1; |
1064 | 1407 uint8_t * const scantable= s->intra_scantable.permutated; |
1408 const uint16_t *quant_matrix= s->intra_matrix; | |
711 | 1409 const int qscale= s->qscale; |
0 | 1410 |
711 | 1411 /* DC coef */ |
1412 component = (n <= 3 ? 0 : n - 4 + 1); | |
1410
524c904a66b8
PSX MDEC decoder, based upon some code from Sebastian Jedruszkiewicz <elf at frogger dot rules dot pl>
michaelni
parents:
1409
diff
changeset
|
1413 diff = decode_dc(&s->gb, component); |
711 | 1414 if (diff >= 0xffff) |
1415 return -1; | |
1416 dc = s->last_dc[component]; | |
1417 dc += diff; | |
1418 s->last_dc[component] = dc; | |
1419 block[0] = dc<<3; | |
1420 dprintf("dc=%d diff=%d\n", dc, diff); | |
1421 i = 0; | |
1422 { | |
1423 OPEN_READER(re, &s->gb); | |
1424 /* now quantify & encode AC coefs */ | |
1425 for(;;) { | |
1426 UPDATE_CACHE(re, &s->gb); | |
1427 GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2); | |
1428 | |
1429 if(level == 127){ | |
1430 break; | |
1431 } else if(level != 0) { | |
1432 i += run; | |
1433 j = scantable[i]; | |
1434 level= (level*qscale*quant_matrix[j])>>3; | |
1435 level= (level-1)|1; | |
1436 level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1); | |
1437 LAST_SKIP_BITS(re, &s->gb, 1); | |
1438 } else { | |
1439 /* escape */ | |
1440 run = SHOW_UBITS(re, &s->gb, 6)+1; LAST_SKIP_BITS(re, &s->gb, 6); | |
1441 UPDATE_CACHE(re, &s->gb); | |
1442 level = SHOW_SBITS(re, &s->gb, 8); SKIP_BITS(re, &s->gb, 8); | |
1443 if (level == -128) { | |
1444 level = SHOW_UBITS(re, &s->gb, 8) - 256; LAST_SKIP_BITS(re, &s->gb, 8); | |
1445 } else if (level == 0) { | |
1446 level = SHOW_UBITS(re, &s->gb, 8) ; LAST_SKIP_BITS(re, &s->gb, 8); | |
1447 } | |
1448 i += run; | |
1449 j = scantable[i]; | |
1450 if(level<0){ | |
1451 level= -level; | |
1452 level= (level*qscale*quant_matrix[j])>>3; | |
1453 level= (level-1)|1; | |
1454 level= -level; | |
1455 }else{ | |
1456 level= (level*qscale*quant_matrix[j])>>3; | |
1457 level= (level-1)|1; | |
1458 } | |
1459 } | |
1460 if (i > 63){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
1461 av_log(s->avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n", s->mb_x, s->mb_y); |
711 | 1462 return -1; |
1463 } | |
1464 | |
1465 block[j] = level; | |
1466 } | |
1467 CLOSE_READER(re, &s->gb); | |
1468 } | |
1469 s->block_last_index[n] = i; | |
1470 return 0; | |
1471 } | |
1472 | |
1473 static inline int mpeg1_decode_block_inter(MpegEncContext *s, | |
1474 DCTELEM *block, | |
1475 int n) | |
1476 { | |
1477 int level, i, j, run; | |
1478 RLTable *rl = &rl_mpeg1; | |
1064 | 1479 uint8_t * const scantable= s->intra_scantable.permutated; |
1480 const uint16_t *quant_matrix= s->inter_matrix; | |
711 | 1481 const int qscale= s->qscale; |
1482 | |
1483 { | |
520
19a5e2a81e1a
new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents:
498
diff
changeset
|
1484 int v; |
19a5e2a81e1a
new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents:
498
diff
changeset
|
1485 OPEN_READER(re, &s->gb); |
711 | 1486 i = -1; |
0 | 1487 /* special case for the first coef. no need to add a second vlc table */ |
520
19a5e2a81e1a
new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents:
498
diff
changeset
|
1488 UPDATE_CACHE(re, &s->gb); |
19a5e2a81e1a
new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents:
498
diff
changeset
|
1489 v= SHOW_UBITS(re, &s->gb, 2); |
0 | 1490 if (v & 2) { |
714 | 1491 LAST_SKIP_BITS(re, &s->gb, 2); |
711 | 1492 level= (3*qscale*quant_matrix[0])>>4; |
1493 level= (level-1)|1; | |
1494 if(v&1) | |
1495 level= -level; | |
714 | 1496 block[0] = level; |
711 | 1497 i++; |
0 | 1498 } |
714 | 1499 |
711 | 1500 /* now quantify & encode AC coefs */ |
1501 for(;;) { | |
1502 UPDATE_CACHE(re, &s->gb); | |
1503 GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2); | |
1504 | |
1505 if(level == 127){ | |
1506 break; | |
1507 } else if(level != 0) { | |
1508 i += run; | |
1509 j = scantable[i]; | |
1510 level= ((level*2+1)*qscale*quant_matrix[j])>>4; | |
1511 level= (level-1)|1; | |
1512 level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1); | |
1513 LAST_SKIP_BITS(re, &s->gb, 1); | |
1514 } else { | |
1515 /* escape */ | |
1516 run = SHOW_UBITS(re, &s->gb, 6)+1; LAST_SKIP_BITS(re, &s->gb, 6); | |
1517 UPDATE_CACHE(re, &s->gb); | |
1518 level = SHOW_SBITS(re, &s->gb, 8); SKIP_BITS(re, &s->gb, 8); | |
1519 if (level == -128) { | |
1520 level = SHOW_UBITS(re, &s->gb, 8) - 256; LAST_SKIP_BITS(re, &s->gb, 8); | |
1521 } else if (level == 0) { | |
1522 level = SHOW_UBITS(re, &s->gb, 8) ; LAST_SKIP_BITS(re, &s->gb, 8); | |
1523 } | |
1524 i += run; | |
1525 j = scantable[i]; | |
1526 if(level<0){ | |
1527 level= -level; | |
1528 level= ((level*2+1)*qscale*quant_matrix[j])>>4; | |
1529 level= (level-1)|1; | |
1530 level= -level; | |
1531 }else{ | |
1532 level= ((level*2+1)*qscale*quant_matrix[j])>>4; | |
1533 level= (level-1)|1; | |
1534 } | |
1535 } | |
1536 if (i > 63){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
1537 av_log(s->avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n", s->mb_x, s->mb_y); |
711 | 1538 return -1; |
1539 } | |
0 | 1540 |
711 | 1541 block[j] = level; |
0 | 1542 } |
711 | 1543 CLOSE_READER(re, &s->gb); |
0 | 1544 } |
711 | 1545 s->block_last_index[n] = i; |
0 | 1546 return 0; |
1547 } | |
1548 | |
1549 /* Also does unquantization here, since I will never support mpeg2 | |
1550 encoding */ | |
714 | 1551 static inline int mpeg2_decode_block_non_intra(MpegEncContext *s, |
1552 DCTELEM *block, | |
1553 int n) | |
0 | 1554 { |
1555 int level, i, j, run; | |
1556 RLTable *rl = &rl_mpeg1; | |
1064 | 1557 uint8_t * const scantable= s->intra_scantable.permutated; |
1558 const uint16_t *quant_matrix; | |
714 | 1559 const int qscale= s->qscale; |
0 | 1560 int mismatch; |
1561 | |
1562 mismatch = 1; | |
1563 | |
1564 { | |
520
19a5e2a81e1a
new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents:
498
diff
changeset
|
1565 int v; |
19a5e2a81e1a
new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents:
498
diff
changeset
|
1566 OPEN_READER(re, &s->gb); |
714 | 1567 i = -1; |
520
19a5e2a81e1a
new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents:
498
diff
changeset
|
1568 if (n < 4) |
714 | 1569 quant_matrix = s->inter_matrix; |
0 | 1570 else |
714 | 1571 quant_matrix = s->chroma_inter_matrix; |
520
19a5e2a81e1a
new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents:
498
diff
changeset
|
1572 |
0 | 1573 /* special case for the first coef. no need to add a second vlc table */ |
520
19a5e2a81e1a
new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents:
498
diff
changeset
|
1574 UPDATE_CACHE(re, &s->gb); |
19a5e2a81e1a
new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents:
498
diff
changeset
|
1575 v= SHOW_UBITS(re, &s->gb, 2); |
0 | 1576 if (v & 2) { |
714 | 1577 LAST_SKIP_BITS(re, &s->gb, 2); |
1578 level= (3*qscale*quant_matrix[0])>>5; | |
1579 if(v&1) | |
1580 level= -level; | |
1581 block[0] = level; | |
1582 mismatch ^= level; | |
1583 i++; | |
1584 } | |
1585 | |
1586 /* now quantify & encode AC coefs */ | |
1587 for(;;) { | |
1588 UPDATE_CACHE(re, &s->gb); | |
1589 GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2); | |
1590 | |
1591 if(level == 127){ | |
1592 break; | |
1593 } else if(level != 0) { | |
1594 i += run; | |
1595 j = scantable[i]; | |
1596 level= ((level*2+1)*qscale*quant_matrix[j])>>5; | |
1597 level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1); | |
1598 LAST_SKIP_BITS(re, &s->gb, 1); | |
1599 } else { | |
1600 /* escape */ | |
1601 run = SHOW_UBITS(re, &s->gb, 6)+1; LAST_SKIP_BITS(re, &s->gb, 6); | |
1602 UPDATE_CACHE(re, &s->gb); | |
1603 level = SHOW_SBITS(re, &s->gb, 12); SKIP_BITS(re, &s->gb, 12); | |
1604 | |
1605 i += run; | |
1606 j = scantable[i]; | |
1607 if(level<0){ | |
1608 level= ((-level*2+1)*qscale*quant_matrix[j])>>5; | |
1609 level= -level; | |
1610 }else{ | |
1611 level= ((level*2+1)*qscale*quant_matrix[j])>>5; | |
1612 } | |
1613 } | |
1614 if (i > 63){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
1615 av_log(s->avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n", s->mb_x, s->mb_y); |
714 | 1616 return -1; |
1617 } | |
1618 | |
1619 mismatch ^= level; | |
1620 block[j] = level; | |
0 | 1621 } |
520
19a5e2a81e1a
new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents:
498
diff
changeset
|
1622 CLOSE_READER(re, &s->gb); |
0 | 1623 } |
1624 block[63] ^= (mismatch & 1); | |
714 | 1625 |
0 | 1626 s->block_last_index[n] = i; |
1627 return 0; | |
1628 } | |
1629 | |
714 | 1630 static inline int mpeg2_decode_block_intra(MpegEncContext *s, |
1631 DCTELEM *block, | |
1632 int n) | |
0 | 1633 { |
1634 int level, dc, diff, i, j, run; | |
714 | 1635 int component; |
0 | 1636 RLTable *rl; |
1064 | 1637 uint8_t * const scantable= s->intra_scantable.permutated; |
1638 const uint16_t *quant_matrix; | |
714 | 1639 const int qscale= s->qscale; |
0 | 1640 int mismatch; |
1641 | |
1642 /* DC coef */ | |
714 | 1643 if (n < 4){ |
1644 quant_matrix = s->intra_matrix; | |
1645 component = 0; | |
1646 }else{ | |
1647 quant_matrix = s->chroma_intra_matrix; | |
1648 component = n - 3; | |
1649 } | |
1410
524c904a66b8
PSX MDEC decoder, based upon some code from Sebastian Jedruszkiewicz <elf at frogger dot rules dot pl>
michaelni
parents:
1409
diff
changeset
|
1650 diff = decode_dc(&s->gb, component); |
0 | 1651 if (diff >= 0xffff) |
1652 return -1; | |
1653 dc = s->last_dc[component]; | |
1654 dc += diff; | |
1655 s->last_dc[component] = dc; | |
1656 block[0] = dc << (3 - s->intra_dc_precision); | |
1657 dprintf("dc=%d\n", block[0]); | |
58
0e0a24def67a
fixed last zero mv for field - fixed mismatch handling for intra coefs
glantau
parents:
54
diff
changeset
|
1658 mismatch = block[0] ^ 1; |
714 | 1659 i = 0; |
0 | 1660 if (s->intra_vlc_format) |
1661 rl = &rl_mpeg2; | |
1662 else | |
1663 rl = &rl_mpeg1; | |
59
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
1664 |
714 | 1665 { |
1666 OPEN_READER(re, &s->gb); | |
1667 /* now quantify & encode AC coefs */ | |
1668 for(;;) { | |
1669 UPDATE_CACHE(re, &s->gb); | |
1670 GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2); | |
1671 | |
1672 if(level == 127){ | |
1673 break; | |
1674 } else if(level != 0) { | |
1675 i += run; | |
1676 j = scantable[i]; | |
1677 level= (level*qscale*quant_matrix[j])>>4; | |
1678 level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1); | |
1679 LAST_SKIP_BITS(re, &s->gb, 1); | |
1680 } else { | |
1681 /* escape */ | |
1682 run = SHOW_UBITS(re, &s->gb, 6)+1; LAST_SKIP_BITS(re, &s->gb, 6); | |
1683 UPDATE_CACHE(re, &s->gb); | |
1684 level = SHOW_SBITS(re, &s->gb, 12); SKIP_BITS(re, &s->gb, 12); | |
1685 i += run; | |
1686 j = scantable[i]; | |
1687 if(level<0){ | |
1688 level= (-level*qscale*quant_matrix[j])>>4; | |
1689 level= -level; | |
1690 }else{ | |
1691 level= (level*qscale*quant_matrix[j])>>4; | |
1692 } | |
1693 } | |
1694 if (i > 63){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
1695 av_log(s->avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n", s->mb_x, s->mb_y); |
714 | 1696 return -1; |
1697 } | |
1698 | |
1699 mismatch^= level; | |
1700 block[j] = level; | |
568 | 1701 } |
714 | 1702 CLOSE_READER(re, &s->gb); |
0 | 1703 } |
714 | 1704 block[63]^= mismatch&1; |
1705 | |
0 | 1706 s->block_last_index[n] = i; |
1707 return 0; | |
1708 } | |
1709 | |
1710 typedef struct Mpeg1Context { | |
1711 MpegEncContext mpeg_enc_ctx; | |
1712 int mpeg_enc_ctx_allocated; /* true if decoding context allocated */ | |
267
e10840e4f773
- Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents:
241
diff
changeset
|
1713 int repeat_field; /* true if we must repeat the field */ |
1546 | 1714 AVPanScan pan_scan; /** some temporary storage for the panscan */ |
0 | 1715 } Mpeg1Context; |
1716 | |
1717 static int mpeg_decode_init(AVCodecContext *avctx) | |
1718 { | |
1719 Mpeg1Context *s = avctx->priv_data; | |
498 | 1720 |
558 | 1721 s->mpeg_enc_ctx.flags= avctx->flags; |
498 | 1722 common_init(&s->mpeg_enc_ctx); |
1410
524c904a66b8
PSX MDEC decoder, based upon some code from Sebastian Jedruszkiewicz <elf at frogger dot rules dot pl>
michaelni
parents:
1409
diff
changeset
|
1723 init_vlcs(); |
0 | 1724 |
1725 s->mpeg_enc_ctx_allocated = 0; | |
1726 s->mpeg_enc_ctx.picture_number = 0; | |
267
e10840e4f773
- Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents:
241
diff
changeset
|
1727 s->repeat_field = 0; |
344 | 1728 s->mpeg_enc_ctx.codec_id= avctx->codec->id; |
0 | 1729 return 0; |
1730 } | |
1731 | |
1732 /* return the 8 bit start code value and update the search | |
1733 state. Return -1 if no start code found */ | |
1211 | 1734 static int find_start_code(uint8_t **pbuf_ptr, uint8_t *buf_end) |
0 | 1735 { |
1064 | 1736 uint8_t *buf_ptr; |
1211 | 1737 unsigned int state=0xFFFFFFFF, v; |
0 | 1738 int val; |
1739 | |
1740 buf_ptr = *pbuf_ptr; | |
1741 while (buf_ptr < buf_end) { | |
1742 v = *buf_ptr++; | |
1743 if (state == 0x000001) { | |
1744 state = ((state << 8) | v) & 0xffffff; | |
1745 val = state; | |
1746 goto found; | |
1747 } | |
1748 state = ((state << 8) | v) & 0xffffff; | |
1749 } | |
1750 val = -1; | |
1751 found: | |
1752 *pbuf_ptr = buf_ptr; | |
1753 return val; | |
1754 } | |
1755 | |
1756 static int mpeg1_decode_picture(AVCodecContext *avctx, | |
1064 | 1757 uint8_t *buf, int buf_size) |
0 | 1758 { |
1759 Mpeg1Context *s1 = avctx->priv_data; | |
1760 MpegEncContext *s = &s1->mpeg_enc_ctx; | |
1761 int ref, f_code; | |
1762 | |
1025
1f9afd8b9131
GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents:
1021
diff
changeset
|
1763 init_get_bits(&s->gb, buf, buf_size*8); |
0 | 1764 |
1765 ref = get_bits(&s->gb, 10); /* temporal ref */ | |
1766 s->pict_type = get_bits(&s->gb, 3); | |
45
933cc4acab5c
fixed mpeg1 last block bug (mb stuffing code was not included in vlc table...)
glantau
parents:
38
diff
changeset
|
1767 dprintf("pict_type=%d number=%d\n", s->pict_type, s->picture_number); |
872 | 1768 |
21 | 1769 skip_bits(&s->gb, 16); |
0 | 1770 if (s->pict_type == P_TYPE || s->pict_type == B_TYPE) { |
21 | 1771 s->full_pel[0] = get_bits1(&s->gb); |
0 | 1772 f_code = get_bits(&s->gb, 3); |
1773 if (f_code == 0) | |
1774 return -1; | |
1775 s->mpeg_f_code[0][0] = f_code; | |
1776 s->mpeg_f_code[0][1] = f_code; | |
1777 } | |
1778 if (s->pict_type == B_TYPE) { | |
21 | 1779 s->full_pel[1] = get_bits1(&s->gb); |
0 | 1780 f_code = get_bits(&s->gb, 3); |
1781 if (f_code == 0) | |
1782 return -1; | |
1783 s->mpeg_f_code[1][0] = f_code; | |
1784 s->mpeg_f_code[1][1] = f_code; | |
1785 } | |
903 | 1786 s->current_picture.pict_type= s->pict_type; |
1787 s->current_picture.key_frame= s->pict_type == I_TYPE; | |
911 | 1788 |
0 | 1789 s->y_dc_scale = 8; |
1790 s->c_dc_scale = 8; | |
1791 s->first_slice = 1; | |
1792 return 0; | |
1793 } | |
1794 | |
1795 static void mpeg_decode_sequence_extension(MpegEncContext *s) | |
1796 { | |
1797 int horiz_size_ext, vert_size_ext; | |
917 | 1798 int bit_rate_ext, vbv_buf_ext; |
0 | 1799 int frame_rate_ext_n, frame_rate_ext_d; |
1421 | 1800 int level, profile; |
0 | 1801 |
1421 | 1802 skip_bits(&s->gb, 1); /* profil and level esc*/ |
1803 profile= get_bits(&s->gb, 3); | |
1804 level= get_bits(&s->gb, 4); | |
267
e10840e4f773
- Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents:
241
diff
changeset
|
1805 s->progressive_sequence = get_bits1(&s->gb); /* progressive_sequence */ |
21 | 1806 skip_bits(&s->gb, 2); /* chroma_format */ |
0 | 1807 horiz_size_ext = get_bits(&s->gb, 2); |
1808 vert_size_ext = get_bits(&s->gb, 2); | |
1809 s->width |= (horiz_size_ext << 12); | |
1810 s->height |= (vert_size_ext << 12); | |
1811 bit_rate_ext = get_bits(&s->gb, 12); /* XXX: handle it */ | |
1812 s->bit_rate = ((s->bit_rate / 400) | (bit_rate_ext << 12)) * 400; | |
21 | 1813 skip_bits1(&s->gb); /* marker */ |
0 | 1814 vbv_buf_ext = get_bits(&s->gb, 8); |
1346 | 1815 |
917 | 1816 s->low_delay = get_bits1(&s->gb); |
1346 | 1817 if(s->flags & CODEC_FLAG_LOW_DELAY) s->low_delay=1; |
1818 | |
0 | 1819 frame_rate_ext_n = get_bits(&s->gb, 2); |
1820 frame_rate_ext_d = get_bits(&s->gb, 5); | |
1126
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
1821 av_reduce( |
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
1822 &s->avctx->frame_rate, |
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
1823 &s->avctx->frame_rate_base, |
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
1824 frame_rate_tab[s->frame_rate_index] * (frame_rate_ext_n+1), |
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
1825 MPEG1_FRAME_RATE_BASE * (frame_rate_ext_d+1), |
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
1826 1<<30); |
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
1827 |
0 | 1828 dprintf("sequence extension\n"); |
1421 | 1829 s->codec_id= s->avctx->codec_id= CODEC_ID_MPEG2VIDEO; |
401
e20655449d4a
mpeg1/2 identifier - fixed frame rate for some bad mpeg1 streams
glantau
parents:
391
diff
changeset
|
1830 s->avctx->sub_id = 2; /* indicates mpeg2 found */ |
917 | 1831 |
1548 | 1832 if(s->aspect_ratio_info <= 1) |
1833 s->avctx->sample_aspect_ratio= mpeg2_aspect[s->aspect_ratio_info]; | |
1834 else{ | |
1835 s->avctx->sample_aspect_ratio= | |
1836 av_div_q( | |
1837 mpeg2_aspect[s->aspect_ratio_info], | |
1838 (AVRational){s->width, s->height} | |
1839 ); | |
1840 } | |
1421 | 1841 |
1842 if(s->avctx->debug & FF_DEBUG_PICT_INFO) | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
1843 av_log(s->avctx, AV_LOG_DEBUG, "profile: %d, level: %d \n", profile, level); |
0 | 1844 } |
1845 | |
1546 | 1846 static void mpeg_decode_sequence_display_extension(Mpeg1Context *s1) |
1847 { | |
1848 MpegEncContext *s= &s1->mpeg_enc_ctx; | |
1849 int color_description, w, h; | |
1850 | |
1851 skip_bits(&s->gb, 3); /* video format */ | |
1852 color_description= get_bits1(&s->gb); | |
1853 if(color_description){ | |
1854 skip_bits(&s->gb, 8); /* color primaries */ | |
1855 skip_bits(&s->gb, 8); /* transfer_characteristics */ | |
1856 skip_bits(&s->gb, 8); /* matrix_coefficients */ | |
1857 } | |
1858 w= get_bits(&s->gb, 14); | |
1859 skip_bits(&s->gb, 1); //marker | |
1860 h= get_bits(&s->gb, 14); | |
1861 skip_bits(&s->gb, 1); //marker | |
1862 | |
1863 s1->pan_scan.width= 16*w; | |
1864 s1->pan_scan.height=16*h; | |
1865 | |
1548 | 1866 if(s->aspect_ratio_info > 1) |
1867 s->avctx->sample_aspect_ratio= | |
1868 av_div_q( | |
1869 mpeg2_aspect[s->aspect_ratio_info], | |
1870 (AVRational){w, h} | |
1871 ); | |
1546 | 1872 |
1873 if(s->avctx->debug & FF_DEBUG_PICT_INFO) | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
1874 av_log(s->avctx, AV_LOG_DEBUG, "sde w:%d, h:%d\n", w, h); |
1546 | 1875 } |
1876 | |
1877 static void mpeg_decode_picture_display_extension(Mpeg1Context *s1) | |
1878 { | |
1879 MpegEncContext *s= &s1->mpeg_enc_ctx; | |
1880 int i; | |
1881 | |
1882 for(i=0; i<1; i++){ //FIXME count | |
1883 s1->pan_scan.position[i][0]= get_sbits(&s->gb, 16); | |
1884 skip_bits(&s->gb, 1); //marker | |
1885 s1->pan_scan.position[i][1]= get_sbits(&s->gb, 16); | |
1886 skip_bits(&s->gb, 1); //marker | |
1887 } | |
1888 | |
1889 if(s->avctx->debug & FF_DEBUG_PICT_INFO) | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
1890 av_log(s->avctx, AV_LOG_DEBUG, "pde (%d,%d) (%d,%d) (%d,%d)\n", |
1546 | 1891 s1->pan_scan.position[0][0], s1->pan_scan.position[0][1], |
1892 s1->pan_scan.position[1][0], s1->pan_scan.position[1][1], | |
1893 s1->pan_scan.position[2][0], s1->pan_scan.position[2][1] | |
1894 ); | |
1895 } | |
1896 | |
0 | 1897 static void mpeg_decode_quant_matrix_extension(MpegEncContext *s) |
1898 { | |
38
5bf15419d47e
changed quant matrix order (should fix mmx mpeg decoding bug)
glantau
parents:
21
diff
changeset
|
1899 int i, v, j; |
0 | 1900 |
59
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
1901 dprintf("matrix extension\n"); |
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
1902 |
21 | 1903 if (get_bits1(&s->gb)) { |
0 | 1904 for(i=0;i<64;i++) { |
1905 v = get_bits(&s->gb, 8); | |
1092 | 1906 j= s->dsp.idct_permutation[ ff_zigzag_direct[i] ]; |
38
5bf15419d47e
changed quant matrix order (should fix mmx mpeg decoding bug)
glantau
parents:
21
diff
changeset
|
1907 s->intra_matrix[j] = v; |
5bf15419d47e
changed quant matrix order (should fix mmx mpeg decoding bug)
glantau
parents:
21
diff
changeset
|
1908 s->chroma_intra_matrix[j] = v; |
0 | 1909 } |
1910 } | |
21 | 1911 if (get_bits1(&s->gb)) { |
0 | 1912 for(i=0;i<64;i++) { |
1913 v = get_bits(&s->gb, 8); | |
1092 | 1914 j= s->dsp.idct_permutation[ ff_zigzag_direct[i] ]; |
344 | 1915 s->inter_matrix[j] = v; |
1916 s->chroma_inter_matrix[j] = v; | |
0 | 1917 } |
1918 } | |
21 | 1919 if (get_bits1(&s->gb)) { |
0 | 1920 for(i=0;i<64;i++) { |
1921 v = get_bits(&s->gb, 8); | |
1092 | 1922 j= s->dsp.idct_permutation[ ff_zigzag_direct[i] ]; |
38
5bf15419d47e
changed quant matrix order (should fix mmx mpeg decoding bug)
glantau
parents:
21
diff
changeset
|
1923 s->chroma_intra_matrix[j] = v; |
0 | 1924 } |
1925 } | |
21 | 1926 if (get_bits1(&s->gb)) { |
0 | 1927 for(i=0;i<64;i++) { |
1928 v = get_bits(&s->gb, 8); | |
1092 | 1929 j= s->dsp.idct_permutation[ ff_zigzag_direct[i] ]; |
344 | 1930 s->chroma_inter_matrix[j] = v; |
0 | 1931 } |
1932 } | |
1933 } | |
1934 | |
1935 static void mpeg_decode_picture_coding_extension(MpegEncContext *s) | |
1936 { | |
1937 s->full_pel[0] = s->full_pel[1] = 0; | |
1938 s->mpeg_f_code[0][0] = get_bits(&s->gb, 4); | |
1939 s->mpeg_f_code[0][1] = get_bits(&s->gb, 4); | |
1940 s->mpeg_f_code[1][0] = get_bits(&s->gb, 4); | |
1941 s->mpeg_f_code[1][1] = get_bits(&s->gb, 4); | |
1942 s->intra_dc_precision = get_bits(&s->gb, 2); | |
1943 s->picture_structure = get_bits(&s->gb, 2); | |
21 | 1944 s->top_field_first = get_bits1(&s->gb); |
1945 s->frame_pred_frame_dct = get_bits1(&s->gb); | |
1946 s->concealment_motion_vectors = get_bits1(&s->gb); | |
1947 s->q_scale_type = get_bits1(&s->gb); | |
1948 s->intra_vlc_format = get_bits1(&s->gb); | |
1949 s->alternate_scan = get_bits1(&s->gb); | |
1950 s->repeat_first_field = get_bits1(&s->gb); | |
1951 s->chroma_420_type = get_bits1(&s->gb); | |
1952 s->progressive_frame = get_bits1(&s->gb); | |
715
8b3ccabfce4a
move scantable init from block-decode to header parser
michaelni
parents:
714
diff
changeset
|
1953 |
1096
5e6e505d8997
field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents:
1092
diff
changeset
|
1954 if(s->picture_structure == PICT_FRAME) |
5e6e505d8997
field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents:
1092
diff
changeset
|
1955 s->first_field=0; |
5e6e505d8997
field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents:
1092
diff
changeset
|
1956 else{ |
5e6e505d8997
field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents:
1092
diff
changeset
|
1957 s->first_field ^= 1; |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
1958 memset(s->mbskip_table, 0, s->mb_stride*s->mb_height); |
1096
5e6e505d8997
field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents:
1092
diff
changeset
|
1959 } |
5e6e505d8997
field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents:
1092
diff
changeset
|
1960 |
715
8b3ccabfce4a
move scantable init from block-decode to header parser
michaelni
parents:
714
diff
changeset
|
1961 if(s->alternate_scan){ |
1273 | 1962 ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable , ff_alternate_vertical_scan); |
1963 ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable , ff_alternate_vertical_scan); | |
1964 ff_init_scantable(s->dsp.idct_permutation, &s->intra_h_scantable, ff_alternate_vertical_scan); | |
1965 ff_init_scantable(s->dsp.idct_permutation, &s->intra_v_scantable, ff_alternate_vertical_scan); | |
715
8b3ccabfce4a
move scantable init from block-decode to header parser
michaelni
parents:
714
diff
changeset
|
1966 }else{ |
1273 | 1967 ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable , ff_zigzag_direct); |
1968 ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable , ff_zigzag_direct); | |
1969 ff_init_scantable(s->dsp.idct_permutation, &s->intra_h_scantable, ff_alternate_horizontal_scan); | |
1970 ff_init_scantable(s->dsp.idct_permutation, &s->intra_v_scantable, ff_alternate_vertical_scan); | |
715
8b3ccabfce4a
move scantable init from block-decode to header parser
michaelni
parents:
714
diff
changeset
|
1971 } |
8b3ccabfce4a
move scantable init from block-decode to header parser
michaelni
parents:
714
diff
changeset
|
1972 |
0 | 1973 /* composite display not parsed */ |
267
e10840e4f773
- Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents:
241
diff
changeset
|
1974 dprintf("intra_dc_precision=%d\n", s->intra_dc_precision); |
59
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
1975 dprintf("picture_structure=%d\n", s->picture_structure); |
383
e6b64bc3bc87
- repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents:
377
diff
changeset
|
1976 dprintf("top field first=%d\n", s->top_field_first); |
e6b64bc3bc87
- repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents:
377
diff
changeset
|
1977 dprintf("repeat first field=%d\n", s->repeat_first_field); |
0 | 1978 dprintf("conceal=%d\n", s->concealment_motion_vectors); |
59
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
1979 dprintf("intra_vlc_format=%d\n", s->intra_vlc_format); |
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
1980 dprintf("alternate_scan=%d\n", s->alternate_scan); |
0 | 1981 dprintf("frame_pred_frame_dct=%d\n", s->frame_pred_frame_dct); |
267
e10840e4f773
- Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents:
241
diff
changeset
|
1982 dprintf("progressive_frame=%d\n", s->progressive_frame); |
0 | 1983 } |
1984 | |
1985 static void mpeg_decode_extension(AVCodecContext *avctx, | |
1064 | 1986 uint8_t *buf, int buf_size) |
0 | 1987 { |
1988 Mpeg1Context *s1 = avctx->priv_data; | |
1989 MpegEncContext *s = &s1->mpeg_enc_ctx; | |
1990 int ext_type; | |
1991 | |
1025
1f9afd8b9131
GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents:
1021
diff
changeset
|
1992 init_get_bits(&s->gb, buf, buf_size*8); |
0 | 1993 |
1994 ext_type = get_bits(&s->gb, 4); | |
1995 switch(ext_type) { | |
1996 case 0x1: | |
1997 mpeg_decode_sequence_extension(s); | |
1998 break; | |
1546 | 1999 case 0x2: |
2000 mpeg_decode_sequence_display_extension(s1); | |
2001 break; | |
0 | 2002 case 0x3: |
2003 mpeg_decode_quant_matrix_extension(s); | |
2004 break; | |
1546 | 2005 case 0x7: |
2006 mpeg_decode_picture_display_extension(s1); | |
2007 break; | |
0 | 2008 case 0x8: |
2009 mpeg_decode_picture_coding_extension(s); | |
2010 break; | |
2011 } | |
2012 } | |
2013 | |
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
2014 static void exchange_uv(MpegEncContext *s){ |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
2015 short * tmp; |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
2016 |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
2017 tmp = s->pblocks[4]; |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
2018 s->pblocks[4] = s->pblocks[5]; |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
2019 s->pblocks[5] = tmp; |
1380 | 2020 } |
2021 | |
826 | 2022 #define DECODE_SLICE_FATAL_ERROR -2 |
2023 #define DECODE_SLICE_ERROR -1 | |
2024 #define DECODE_SLICE_OK 0 | |
2025 | |
2026 /** | |
2027 * decodes a slice. | |
2028 * @return DECODE_SLICE_FATAL_ERROR if a non recoverable error occured<br> | |
2029 * DECODE_SLICE_ERROR if the slice is damaged<br> | |
2030 * DECODE_SLICE_OK if this slice is ok<br> | |
2031 */ | |
0 | 2032 static int mpeg_decode_slice(AVCodecContext *avctx, |
925 | 2033 AVFrame *pict, |
0 | 2034 int start_code, |
1211 | 2035 uint8_t **buf, int buf_size) |
0 | 2036 { |
2037 Mpeg1Context *s1 = avctx->priv_data; | |
2038 MpegEncContext *s = &s1->mpeg_enc_ctx; | |
2039 int ret; | |
1096
5e6e505d8997
field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents:
1092
diff
changeset
|
2040 const int field_pic= s->picture_structure != PICT_FRAME; |
0 | 2041 |
1285 | 2042 s->resync_mb_x= s->mb_x = |
2043 s->resync_mb_y= s->mb_y = -1; | |
2044 | |
0 | 2045 start_code = (start_code - 1) & 0xff; |
568 | 2046 if (start_code >= s->mb_height){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
2047 av_log(s->avctx, AV_LOG_ERROR, "slice below image (%d >= %d)\n", start_code, s->mb_height); |
1285 | 2048 return -1; |
568 | 2049 } |
1160 | 2050 |
2051 ff_mpeg1_clean_buffers(s); | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
2052 s->interlaced_dct = 0; |
1096
5e6e505d8997
field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents:
1092
diff
changeset
|
2053 |
0 | 2054 /* start frame decoding */ |
1138 | 2055 if (s->first_slice) { |
2056 if(s->first_field || s->picture_structure==PICT_FRAME){ | |
771
d4cc92144266
handle direct rendering buffer allocation failure
michaelni
parents:
751
diff
changeset
|
2057 if(MPV_frame_start(s, avctx) < 0) |
826 | 2058 return DECODE_SLICE_FATAL_ERROR; |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
2059 |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
2060 ff_er_frame_start(s); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
2061 |
1085
9acf4b552047
move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents:
1084
diff
changeset
|
2062 /* first check if we must repeat the frame */ |
1409 | 2063 s->current_picture_ptr->repeat_pict = 0; |
1085
9acf4b552047
move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents:
1084
diff
changeset
|
2064 if (s->repeat_first_field) { |
9acf4b552047
move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents:
1084
diff
changeset
|
2065 if (s->progressive_sequence) { |
9acf4b552047
move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents:
1084
diff
changeset
|
2066 if (s->top_field_first) |
1409 | 2067 s->current_picture_ptr->repeat_pict = 4; |
1085
9acf4b552047
move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents:
1084
diff
changeset
|
2068 else |
1409 | 2069 s->current_picture_ptr->repeat_pict = 2; |
1085
9acf4b552047
move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents:
1084
diff
changeset
|
2070 } else if (s->progressive_frame) { |
1409 | 2071 s->current_picture_ptr->repeat_pict = 1; |
1085
9acf4b552047
move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents:
1084
diff
changeset
|
2072 } |
9acf4b552047
move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536)
michaelni
parents:
1084
diff
changeset
|
2073 } |
1546 | 2074 |
2075 *s->current_picture_ptr->pan_scan= s1->pan_scan; | |
1138 | 2076 }else{ //second field |
2077 int i; | |
1182
38e8b8f331cb
some checks to avoid segfaults if the decoder is feeded with junk
michaelni
parents:
1181
diff
changeset
|
2078 |
38e8b8f331cb
some checks to avoid segfaults if the decoder is feeded with junk
michaelni
parents:
1181
diff
changeset
|
2079 if(!s->current_picture_ptr){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
2080 av_log(s->avctx, AV_LOG_ERROR, "first field missing\n"); |
1182
38e8b8f331cb
some checks to avoid segfaults if the decoder is feeded with junk
michaelni
parents:
1181
diff
changeset
|
2081 return -1; |
38e8b8f331cb
some checks to avoid segfaults if the decoder is feeded with junk
michaelni
parents:
1181
diff
changeset
|
2082 } |
38e8b8f331cb
some checks to avoid segfaults if the decoder is feeded with junk
michaelni
parents:
1181
diff
changeset
|
2083 |
1138 | 2084 for(i=0; i<4; i++){ |
2085 s->current_picture.data[i] = s->current_picture_ptr->data[i]; | |
2086 if(s->picture_structure == PICT_BOTTOM_FIELD){ | |
2087 s->current_picture.data[i] += s->current_picture_ptr->linesize[i]; | |
2088 } | |
2089 } | |
2090 } | |
1381 | 2091 #ifdef HAVE_XVMC |
2092 // MPV_frame_start will call this function too, | |
2093 // but we need to call it on every field | |
2094 if(s->avctx->xvmc_acceleration) | |
2095 XVMC_field_start(s,avctx); | |
2096 #endif | |
2097 }//fi(s->first_slice) | |
0 | 2098 |
1211 | 2099 init_get_bits(&s->gb, *buf, buf_size*8); |
0 | 2100 |
54 | 2101 s->qscale = get_qscale(s); |
1690 | 2102 if (s->first_slice && (s->first_field || s->picture_structure==PICT_FRAME)) { |
2103 if(s->avctx->debug&FF_DEBUG_PICT_INFO){ | |
2104 av_log(s->avctx, AV_LOG_DEBUG, "qp:%d fc:%2d%2d%2d%2d %s %s %s %s dc:%d pstruct:%d fdct:%d cmv:%d qtype:%d ivlc:%d rff:%d %s\n", | |
2105 s->qscale, s->mpeg_f_code[0][0],s->mpeg_f_code[0][1],s->mpeg_f_code[1][0],s->mpeg_f_code[1][1], | |
2106 s->pict_type == I_TYPE ? "I" : (s->pict_type == P_TYPE ? "P" : (s->pict_type == B_TYPE ? "B" : "S")), | |
2107 s->progressive_sequence ? "pro" :"", s->alternate_scan ? "alt" :"", s->top_field_first ? "top" :"", | |
2108 s->intra_dc_precision, s->picture_structure, s->frame_pred_frame_dct, s->concealment_motion_vectors, | |
2109 s->q_scale_type, s->intra_vlc_format, s->repeat_first_field, s->chroma_420_type ? "420" :""); | |
2110 } | |
2111 } | |
2112 | |
2113 s->first_slice = 0; | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
2114 if(s->qscale == 0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
2115 av_log(s->avctx, AV_LOG_ERROR, "qscale == 0\n"); |
1285 | 2116 return -1; |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
2117 } |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
2118 |
0 | 2119 /* extra slice info */ |
21 | 2120 while (get_bits1(&s->gb) != 0) { |
2121 skip_bits(&s->gb, 8); | |
0 | 2122 } |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
2123 |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
2124 s->mb_x=0; |
0 | 2125 |
716 | 2126 for(;;) { |
2127 int code = get_vlc2(&s->gb, mbincr_vlc.table, MBINCR_VLC_BITS, 2); | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
2128 if (code < 0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
2129 av_log(s->avctx, AV_LOG_ERROR, "first mb_incr damaged\n"); |
1285 | 2130 return -1; |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
2131 } |
716 | 2132 if (code >= 33) { |
2133 if (code == 33) { | |
2134 s->mb_x += 33; | |
2135 } | |
2136 /* otherwise, stuffing, nothing to do */ | |
2137 } else { | |
2138 s->mb_x += code; | |
2139 break; | |
2140 } | |
2141 } | |
1160 | 2142 |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
2143 s->resync_mb_x= s->mb_x; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
2144 s->resync_mb_y= s->mb_y = start_code; |
1160 | 2145 s->mb_skip_run= 0; |
1389 | 2146 ff_init_block_index(s); |
716 | 2147 |
0 | 2148 for(;;) { |
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
2149 #ifdef HAVE_XVMC |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
2150 //one 1 we memcpy blocks in xvmcvideo |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
2151 if(s->avctx->xvmc_acceleration > 1) |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
2152 XVMC_init_block(s);//set s->block |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
2153 #endif |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
2154 |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
844
diff
changeset
|
2155 s->dsp.clear_blocks(s->block[0]); |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
2156 |
12
4d50c7d89e0f
use block[] in structure to have it aligned on 8 bytes for mmx optimizations
glantau
parents:
7
diff
changeset
|
2157 ret = mpeg_decode_mb(s, s->block); |
1644 | 2158 s->chroma_qscale= s->qscale; |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
2159 |
0 | 2160 dprintf("ret=%d\n", ret); |
2161 if (ret < 0) | |
2162 return -1; | |
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1655
diff
changeset
|
2163 |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1655
diff
changeset
|
2164 if(s->current_picture.motion_val[0]){ //note motion_val is normally NULL unless we want to extract the MVs |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
2165 const int wrap = s->block_wrap[0]; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
2166 const int xy = s->mb_x*2 + 1 + (s->mb_y*2 +1)*wrap; |
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1655
diff
changeset
|
2167 int motion_for_x, motion_for_y, motion_back_x, motion_back_y; |
1285 | 2168 if (s->mb_intra) { |
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1655
diff
changeset
|
2169 motion_for_x = motion_for_y = motion_back_x = motion_back_y = 0; |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1655
diff
changeset
|
2170 }else if (s->mv_type == MV_TYPE_16X16){ |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1655
diff
changeset
|
2171 motion_for_x = s->mv[0][0][0]; |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1655
diff
changeset
|
2172 motion_for_y = s->mv[0][0][1]; |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1655
diff
changeset
|
2173 motion_back_x = s->mv[1][0][0]; |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1655
diff
changeset
|
2174 motion_back_y = s->mv[1][0][1]; |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1655
diff
changeset
|
2175 } else /*if ((s->mv_type == MV_TYPE_FIELD) || (s->mv_type == MV_TYPE_16X8))*/ { |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1655
diff
changeset
|
2176 motion_for_x = s->mv[0][0][0] + s->mv[0][1][0]; |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1655
diff
changeset
|
2177 motion_for_y = s->mv[0][0][1] + s->mv[0][1][1]; |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1655
diff
changeset
|
2178 motion_for_x = (motion_for_x>>1) | (motion_for_x&1); |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1655
diff
changeset
|
2179 motion_back_x = s->mv[1][0][0] + s->mv[1][1][0]; |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1655
diff
changeset
|
2180 motion_back_y = s->mv[1][0][1] + s->mv[1][1][1]; |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1655
diff
changeset
|
2181 motion_back_x = (motion_back_x>>1) | (motion_back_x&1); |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
2182 } |
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1655
diff
changeset
|
2183 |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1655
diff
changeset
|
2184 s->current_picture.motion_val[0][xy][0] = motion_for_x; |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1655
diff
changeset
|
2185 s->current_picture.motion_val[0][xy][1] = motion_for_y; |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1655
diff
changeset
|
2186 s->current_picture.motion_val[0][xy + 1][0] = motion_for_x; |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1655
diff
changeset
|
2187 s->current_picture.motion_val[0][xy + 1][1] = motion_for_y; |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1655
diff
changeset
|
2188 s->current_picture.motion_val[0][xy + wrap][0] = motion_for_x; |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1655
diff
changeset
|
2189 s->current_picture.motion_val[0][xy + wrap][1] = motion_for_y; |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1655
diff
changeset
|
2190 s->current_picture.motion_val[0][xy + 1 + wrap][0] = motion_for_x; |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1655
diff
changeset
|
2191 s->current_picture.motion_val[0][xy + 1 + wrap][1] = motion_for_y; |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1655
diff
changeset
|
2192 |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1655
diff
changeset
|
2193 if(s->pict_type != B_TYPE){ |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1655
diff
changeset
|
2194 motion_back_x = motion_back_y = 0; |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1655
diff
changeset
|
2195 } |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1655
diff
changeset
|
2196 |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1655
diff
changeset
|
2197 s->current_picture.motion_val[1][xy][0] = motion_back_x; |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1655
diff
changeset
|
2198 s->current_picture.motion_val[1][xy][1] = motion_back_y; |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1655
diff
changeset
|
2199 s->current_picture.motion_val[1][xy + 1][0] = motion_back_x; |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1655
diff
changeset
|
2200 s->current_picture.motion_val[1][xy + 1][1] = motion_back_y; |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1655
diff
changeset
|
2201 s->current_picture.motion_val[1][xy + wrap][0] = motion_back_x; |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1655
diff
changeset
|
2202 s->current_picture.motion_val[1][xy + wrap][1] = motion_back_y; |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1655
diff
changeset
|
2203 s->current_picture.motion_val[1][xy + 1 + wrap][0] = motion_back_x; |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1655
diff
changeset
|
2204 s->current_picture.motion_val[1][xy + 1 + wrap][1] = motion_back_y; |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
2205 } |
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1655
diff
changeset
|
2206 |
1389 | 2207 s->dest[0] += 16; |
2208 s->dest[1] += 8; | |
2209 s->dest[2] += 8; | |
2210 | |
716 | 2211 MPV_decode_mb(s, s->block); |
1389 | 2212 |
716 | 2213 if (++s->mb_x >= s->mb_width) { |
1380 | 2214 |
1370 | 2215 ff_draw_horiz_band(s, 16*s->mb_y, 16); |
716 | 2216 |
2217 s->mb_x = 0; | |
2218 s->mb_y++; | |
1289
57172377849a
fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents:
1285
diff
changeset
|
2219 |
57172377849a
fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents:
1285
diff
changeset
|
2220 if(s->mb_y<<field_pic >= s->mb_height){ |
57172377849a
fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents:
1285
diff
changeset
|
2221 int left= s->gb.size_in_bits - get_bits_count(&s->gb); |
57172377849a
fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents:
1285
diff
changeset
|
2222 |
57172377849a
fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents:
1285
diff
changeset
|
2223 if(left < 0 || (left && show_bits(&s->gb, FFMIN(left, 23))) |
57172377849a
fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents:
1285
diff
changeset
|
2224 || (avctx->error_resilience >= FF_ER_AGGRESSIVE && left>8)){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
2225 av_log(avctx, AV_LOG_ERROR, "end mismatch left=%d\n", left); |
1289
57172377849a
fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents:
1285
diff
changeset
|
2226 return -1; |
57172377849a
fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents:
1285
diff
changeset
|
2227 }else |
57172377849a
fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents:
1285
diff
changeset
|
2228 goto eos; |
57172377849a
fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents:
1285
diff
changeset
|
2229 } |
1389 | 2230 |
2231 ff_init_block_index(s); | |
716 | 2232 } |
2233 | |
2234 /* skip mb handling */ | |
1160 | 2235 if (s->mb_skip_run == -1) { |
716 | 2236 /* read again increment */ |
1160 | 2237 s->mb_skip_run = 0; |
716 | 2238 for(;;) { |
2239 int code = get_vlc2(&s->gb, mbincr_vlc.table, MBINCR_VLC_BITS, 2); | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
2240 if (code < 0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
2241 av_log(s->avctx, AV_LOG_ERROR, "mb incr damaged\n"); |
1181 | 2242 return -1; |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
2243 } |
716 | 2244 if (code >= 33) { |
2245 if (code == 33) { | |
1160 | 2246 s->mb_skip_run += 33; |
1181 | 2247 }else if(code == 35){ |
2248 if(s->mb_skip_run != 0 || show_bits(&s->gb, 15) != 0){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
2249 av_log(s->avctx, AV_LOG_ERROR, "slice mismatch\n"); |
1181 | 2250 return -1; |
2251 } | |
2252 goto eos; /* end of slice */ | |
716 | 2253 } |
2254 /* otherwise, stuffing, nothing to do */ | |
2255 } else { | |
1160 | 2256 s->mb_skip_run += code; |
716 | 2257 break; |
2258 } | |
2259 } | |
2260 } | |
0 | 2261 } |
1285 | 2262 eos: // end of slice |
2263 *buf += get_bits_count(&s->gb)/8 - 1; | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
2264 //printf("y %d %d %d %d\n", s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y); |
1285 | 2265 return 0; |
2266 } | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
2267 |
1285 | 2268 /** |
2269 * handles slice ends. | |
2270 * @return 1 if it seems to be the last slice of | |
2271 */ | |
2272 static int slice_end(AVCodecContext *avctx, AVFrame *pict) | |
2273 { | |
2274 Mpeg1Context *s1 = avctx->priv_data; | |
2275 MpegEncContext *s = &s1->mpeg_enc_ctx; | |
2276 | |
1402
f662e9c86cf2
* fixing a regression in mpeg encoder (not setting pix_fmt),
romansh
parents:
1389
diff
changeset
|
2277 if (!s1->mpeg_enc_ctx_allocated || !s->current_picture_ptr) |
1311
fc858abf6b10
fixed segfault if sequence header has not been found before slice decoding
bellard
parents:
1289
diff
changeset
|
2278 return 0; |
fc858abf6b10
fixed segfault if sequence header has not been found before slice decoding
bellard
parents:
1289
diff
changeset
|
2279 |
1381 | 2280 #ifdef HAVE_XVMC |
2281 if(s->avctx->xvmc_acceleration) | |
2282 XVMC_field_end(s); | |
2283 #endif | |
0 | 2284 /* end of slice reached */ |
1285 | 2285 if (/*s->mb_y<<field_pic == s->mb_height &&*/ !s->first_field) { |
0 | 2286 /* end of image */ |
903 | 2287 |
1421 | 2288 if(s->codec_id == CODEC_ID_MPEG2VIDEO){ |
1196 | 2289 s->current_picture_ptr->qscale_type= FF_QSCALE_TYPE_MPEG2; |
2290 }else | |
2291 s->current_picture_ptr->qscale_type= FF_QSCALE_TYPE_MPEG1; | |
2292 | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
2293 ff_er_frame_end(s); |
0 | 2294 |
2295 MPV_frame_end(s); | |
2296 | |
924 | 2297 if (s->pict_type == B_TYPE || s->low_delay) { |
1328 | 2298 *pict= *(AVFrame*)s->current_picture_ptr; |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
2299 ff_print_debug_info(s, s->current_picture_ptr); |
0 | 2300 } else { |
903 | 2301 s->picture_number++; |
0 | 2302 /* latency of 1 frame for I and P frames */ |
2303 /* XXX: use another variable than picture_number */ | |
1211 | 2304 if (s->last_picture_ptr != NULL) { |
1328 | 2305 *pict= *(AVFrame*)s->last_picture_ptr; |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
2306 ff_print_debug_info(s, s->last_picture_ptr); |
0 | 2307 } |
2308 } | |
1380 | 2309 |
1285 | 2310 return 1; |
0 | 2311 } else { |
1285 | 2312 return 0; |
0 | 2313 } |
2314 } | |
2315 | |
2316 static int mpeg1_decode_sequence(AVCodecContext *avctx, | |
1064 | 2317 uint8_t *buf, int buf_size) |
0 | 2318 { |
2319 Mpeg1Context *s1 = avctx->priv_data; | |
2320 MpegEncContext *s = &s1->mpeg_enc_ctx; | |
38
5bf15419d47e
changed quant matrix order (should fix mmx mpeg decoding bug)
glantau
parents:
21
diff
changeset
|
2321 int width, height, i, v, j; |
917 | 2322 float aspect; |
401
e20655449d4a
mpeg1/2 identifier - fixed frame rate for some bad mpeg1 streams
glantau
parents:
391
diff
changeset
|
2323 |
1025
1f9afd8b9131
GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents:
1021
diff
changeset
|
2324 init_get_bits(&s->gb, buf, buf_size*8); |
0 | 2325 |
2326 width = get_bits(&s->gb, 12); | |
2327 height = get_bits(&s->gb, 12); | |
917 | 2328 s->aspect_ratio_info= get_bits(&s->gb, 4); |
1674
835964e33ba2
fixed potential problem if aspect_ratio_info == 0 for MPEG stream - fixed aspect ratio problem if CODEC_ID_MPEG2VIDEO is used to decode an MPEG1 stream (which is the recommended codec id for mpeg video)
bellard
parents:
1673
diff
changeset
|
2329 if (s->aspect_ratio_info == 0) |
835964e33ba2
fixed potential problem if aspect_ratio_info == 0 for MPEG stream - fixed aspect ratio problem if CODEC_ID_MPEG2VIDEO is used to decode an MPEG1 stream (which is the recommended codec id for mpeg video)
bellard
parents:
1673
diff
changeset
|
2330 return -1; |
835964e33ba2
fixed potential problem if aspect_ratio_info == 0 for MPEG stream - fixed aspect ratio problem if CODEC_ID_MPEG2VIDEO is used to decode an MPEG1 stream (which is the recommended codec id for mpeg video)
bellard
parents:
1673
diff
changeset
|
2331 aspect= 1.0/mpeg1_aspect[s->aspect_ratio_info]; |
835964e33ba2
fixed potential problem if aspect_ratio_info == 0 for MPEG stream - fixed aspect ratio problem if CODEC_ID_MPEG2VIDEO is used to decode an MPEG1 stream (which is the recommended codec id for mpeg video)
bellard
parents:
1673
diff
changeset
|
2332 avctx->sample_aspect_ratio= av_d2q(aspect, 255); |
917 | 2333 |
0 | 2334 s->frame_rate_index = get_bits(&s->gb, 4); |
2335 if (s->frame_rate_index == 0) | |
2336 return -1; | |
2337 s->bit_rate = get_bits(&s->gb, 18) * 400; | |
21 | 2338 if (get_bits1(&s->gb) == 0) /* marker */ |
0 | 2339 return -1; |
2340 if (width <= 0 || height <= 0 || | |
2341 (width % 2) != 0 || (height % 2) != 0) | |
2342 return -1; | |
2343 if (width != s->width || | |
2344 height != s->height) { | |
2345 /* start new mpeg1 context decoding */ | |
2346 s->out_format = FMT_MPEG1; | |
2347 if (s1->mpeg_enc_ctx_allocated) { | |
2348 MPV_common_end(s); | |
2349 } | |
2350 s->width = width; | |
2351 s->height = height; | |
924 | 2352 avctx->has_b_frames= 1; |
69 | 2353 s->avctx = avctx; |
0 | 2354 avctx->width = width; |
2355 avctx->height = height; | |
1126
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
2356 av_reduce( |
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
2357 &avctx->frame_rate, |
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
2358 &avctx->frame_rate_base, |
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
2359 frame_rate_tab[s->frame_rate_index], |
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
2360 MPEG1_FRAME_RATE_BASE, //FIXME store in allready reduced form |
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
2361 1<<30 |
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
2362 ); |
0 | 2363 avctx->bit_rate = s->bit_rate; |
2364 | |
1381 | 2365 //get_format() or set_video(width,height,aspect,pix_fmt); |
2366 //until then pix_fmt may be changed right after codec init | |
2367 if( avctx->pix_fmt == PIX_FMT_XVMC_MPEG2_IDCT ) | |
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
2368 if( avctx->idct_algo == FF_IDCT_AUTO ) |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
2369 avctx->idct_algo = FF_IDCT_SIMPLE; |
1381 | 2370 |
0 | 2371 if (MPV_common_init(s) < 0) |
2372 return -1; | |
2373 s1->mpeg_enc_ctx_allocated = 1; | |
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
2374 s->swap_uv = 0;//just in case vcr2 and mpeg2 stream have been concatinated |
0 | 2375 } |
2376 | |
21 | 2377 skip_bits(&s->gb, 10); /* vbv_buffer_size */ |
2378 skip_bits(&s->gb, 1); | |
0 | 2379 |
2380 /* get matrix */ | |
21 | 2381 if (get_bits1(&s->gb)) { |
0 | 2382 for(i=0;i<64;i++) { |
2383 v = get_bits(&s->gb, 8); | |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
694
diff
changeset
|
2384 j = s->intra_scantable.permutated[i]; |
38
5bf15419d47e
changed quant matrix order (should fix mmx mpeg decoding bug)
glantau
parents:
21
diff
changeset
|
2385 s->intra_matrix[j] = v; |
5bf15419d47e
changed quant matrix order (should fix mmx mpeg decoding bug)
glantau
parents:
21
diff
changeset
|
2386 s->chroma_intra_matrix[j] = v; |
0 | 2387 } |
59
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
2388 #ifdef DEBUG |
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
2389 dprintf("intra matrix present\n"); |
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
2390 for(i=0;i<64;i++) |
710
97377ab86647
forgot zigzag_direct[] behind #ifdef DEBUG (found by Klaas-Pieter Vlieg <vlieg at eurescom dot de>)
michaelni
parents:
706
diff
changeset
|
2391 dprintf(" %d", s->intra_matrix[s->intra_scantable.permutated[i]]); |
59
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
2392 printf("\n"); |
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
2393 #endif |
0 | 2394 } else { |
2395 for(i=0;i<64;i++) { | |
1092 | 2396 int j= s->dsp.idct_permutation[i]; |
533
3c07cf9595de
adding ff prefix to avoid global name conficts with xvid (patch by Marko Kreen <marko at l-t.ee>)
michaelni
parents:
520
diff
changeset
|
2397 v = ff_mpeg1_default_intra_matrix[i]; |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
694
diff
changeset
|
2398 s->intra_matrix[j] = v; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
694
diff
changeset
|
2399 s->chroma_intra_matrix[j] = v; |
0 | 2400 } |
2401 } | |
21 | 2402 if (get_bits1(&s->gb)) { |
0 | 2403 for(i=0;i<64;i++) { |
2404 v = get_bits(&s->gb, 8); | |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
694
diff
changeset
|
2405 j = s->intra_scantable.permutated[i]; |
344 | 2406 s->inter_matrix[j] = v; |
2407 s->chroma_inter_matrix[j] = v; | |
0 | 2408 } |
59
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
2409 #ifdef DEBUG |
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
2410 dprintf("non intra matrix present\n"); |
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
2411 for(i=0;i<64;i++) |
710
97377ab86647
forgot zigzag_direct[] behind #ifdef DEBUG (found by Klaas-Pieter Vlieg <vlieg at eurescom dot de>)
michaelni
parents:
706
diff
changeset
|
2412 dprintf(" %d", s->inter_matrix[s->intra_scantable.permutated[i]]); |
59
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
2413 printf("\n"); |
efd3c19f6d62
fixed mpeg2 non intra dequant - fixed MPEG1 and 2 matrix parsing
glantau
parents:
58
diff
changeset
|
2414 #endif |
0 | 2415 } else { |
2416 for(i=0;i<64;i++) { | |
1092 | 2417 int j= s->dsp.idct_permutation[i]; |
533
3c07cf9595de
adding ff prefix to avoid global name conficts with xvid (patch by Marko Kreen <marko at l-t.ee>)
michaelni
parents:
520
diff
changeset
|
2418 v = ff_mpeg1_default_non_intra_matrix[i]; |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
694
diff
changeset
|
2419 s->inter_matrix[j] = v; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
694
diff
changeset
|
2420 s->chroma_inter_matrix[j] = v; |
0 | 2421 } |
2422 } | |
2423 | |
2424 /* we set mpeg2 parameters so that it emulates mpeg1 */ | |
2425 s->progressive_sequence = 1; | |
2426 s->progressive_frame = 1; | |
2427 s->picture_structure = PICT_FRAME; | |
2428 s->frame_pred_frame_dct = 1; | |
1421 | 2429 s->codec_id= s->avctx->codec_id= CODEC_ID_MPEG1VIDEO; |
401
e20655449d4a
mpeg1/2 identifier - fixed frame rate for some bad mpeg1 streams
glantau
parents:
391
diff
changeset
|
2430 avctx->sub_id = 1; /* indicates mpeg1 */ |
1672 | 2431 if(s->flags & CODEC_FLAG_LOW_DELAY) s->low_delay=1; |
0 | 2432 return 0; |
2433 } | |
2434 | |
1376 | 2435 static int vcr2_init_sequence(AVCodecContext *avctx) |
2436 { | |
2437 Mpeg1Context *s1 = avctx->priv_data; | |
2438 MpegEncContext *s = &s1->mpeg_enc_ctx; | |
1377 | 2439 int i, v; |
1376 | 2440 |
2441 /* start new mpeg1 context decoding */ | |
2442 s->out_format = FMT_MPEG1; | |
2443 if (s1->mpeg_enc_ctx_allocated) { | |
2444 MPV_common_end(s); | |
2445 } | |
2446 s->width = avctx->width; | |
2447 s->height = avctx->height; | |
2448 avctx->has_b_frames= 0; //true? | |
1380 | 2449 s->low_delay= 1; |
1376 | 2450 s->avctx = avctx; |
1381 | 2451 |
2452 //get_format() or set_video(width,height,aspect,pix_fmt); | |
2453 //until then pix_fmt may be changed right after codec init | |
2454 if( avctx->pix_fmt == PIX_FMT_XVMC_MPEG2_IDCT ) | |
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
2455 if( avctx->idct_algo == FF_IDCT_AUTO ) |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
2456 avctx->idct_algo = FF_IDCT_SIMPLE; |
1376 | 2457 |
2458 if (MPV_common_init(s) < 0) | |
2459 return -1; | |
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
2460 exchange_uv(s);//common init reset pblocks, so we swap them here |
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
2461 s->swap_uv = 1;// in case of xvmc we need to swap uv for each MB |
1376 | 2462 s1->mpeg_enc_ctx_allocated = 1; |
2463 | |
2464 for(i=0;i<64;i++) { | |
2465 int j= s->dsp.idct_permutation[i]; | |
2466 v = ff_mpeg1_default_intra_matrix[i]; | |
2467 s->intra_matrix[j] = v; | |
2468 s->chroma_intra_matrix[j] = v; | |
2469 | |
2470 v = ff_mpeg1_default_non_intra_matrix[i]; | |
2471 s->inter_matrix[j] = v; | |
2472 s->chroma_inter_matrix[j] = v; | |
2473 } | |
2474 | |
2475 s->progressive_sequence = 1; | |
2476 s->progressive_frame = 1; | |
2477 s->picture_structure = PICT_FRAME; | |
2478 s->frame_pred_frame_dct = 1; | |
1421 | 2479 s->codec_id= s->avctx->codec_id= CODEC_ID_MPEG2VIDEO; |
1377 | 2480 avctx->sub_id = 2; /* indicates mpeg2 */ |
1376 | 2481 return 0; |
2482 } | |
2483 | |
2484 | |
1084 | 2485 static void mpeg_decode_user_data(AVCodecContext *avctx, |
2486 const uint8_t *buf, int buf_size) | |
2487 { | |
2488 const uint8_t *p; | |
2489 int len, flags; | |
2490 p = buf; | |
2491 len = buf_size; | |
2492 | |
2493 /* we parse the DTG active format information */ | |
2494 if (len >= 5 && | |
2495 p[0] == 'D' && p[1] == 'T' && p[2] == 'G' && p[3] == '1') { | |
2496 flags = p[4]; | |
2497 p += 5; | |
2498 len -= 5; | |
2499 if (flags & 0x80) { | |
2500 /* skip event id */ | |
2501 if (len < 2) | |
2502 return; | |
2503 p += 2; | |
2504 len -= 2; | |
2505 } | |
2506 if (flags & 0x40) { | |
2507 if (len < 1) | |
2508 return; | |
2509 avctx->dtg_active_format = p[0] & 0x0f; | |
2510 } | |
2511 } | |
2512 } | |
2513 | |
1211 | 2514 /** |
2515 * finds the end of the current frame in the bitstream. | |
2516 * @return the position of the first byte of the next frame, or -1 | |
2517 */ | |
2518 static int mpeg1_find_frame_end(MpegEncContext *s, uint8_t *buf, int buf_size){ | |
2519 ParseContext *pc= &s->parse_context; | |
2520 int i; | |
2521 uint32_t state; | |
2522 | |
2523 state= pc->state; | |
2524 | |
2525 i=0; | |
2526 if(!pc->frame_start_found){ | |
2527 for(i=0; i<buf_size; i++){ | |
2528 state= (state<<8) | buf[i]; | |
2529 if(state >= SLICE_MIN_START_CODE && state <= SLICE_MAX_START_CODE){ | |
2530 i++; | |
2531 pc->frame_start_found=1; | |
2532 break; | |
2533 } | |
2534 } | |
2535 } | |
2536 | |
2537 if(pc->frame_start_found){ | |
2538 for(; i<buf_size; i++){ | |
2539 state= (state<<8) | buf[i]; | |
2540 if((state&0xFFFFFF00) == 0x100){ | |
2541 if(state < SLICE_MIN_START_CODE || state > SLICE_MAX_START_CODE){ | |
2542 pc->frame_start_found=0; | |
2543 pc->state=-1; | |
2544 return i-3; | |
2545 } | |
2546 } | |
2547 } | |
2548 } | |
2549 pc->state= state; | |
1218
358bbc952e27
10l (returning negative number of consumed bytes if the first startcode of a frame was split between 2 buffers)
michaelni
parents:
1211
diff
changeset
|
2550 return END_NOT_FOUND; |
1211 | 2551 } |
2552 | |
0 | 2553 /* handle buffering and image synchronisation */ |
2554 static int mpeg_decode_frame(AVCodecContext *avctx, | |
2555 void *data, int *data_size, | |
1064 | 2556 uint8_t *buf, int buf_size) |
0 | 2557 { |
2558 Mpeg1Context *s = avctx->priv_data; | |
1211 | 2559 uint8_t *buf_end, *buf_ptr; |
2560 int ret, start_code, input_size; | |
925 | 2561 AVFrame *picture = data; |
267
e10840e4f773
- Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents:
241
diff
changeset
|
2562 MpegEncContext *s2 = &s->mpeg_enc_ctx; |
0 | 2563 dprintf("fill_buffer\n"); |
2564 | |
2565 *data_size = 0; | |
344 | 2566 |
0 | 2567 /* special case for last picture */ |
1372 | 2568 if (buf_size == 0 && s2->low_delay==0 && s2->next_picture_ptr) { |
2569 *picture= *(AVFrame*)s2->next_picture_ptr; | |
2570 s2->next_picture_ptr= NULL; | |
903 | 2571 |
1372 | 2572 *data_size = sizeof(AVFrame); |
0 | 2573 return 0; |
2574 } | |
2575 | |
1211 | 2576 if(s2->flags&CODEC_FLAG_TRUNCATED){ |
1218
358bbc952e27
10l (returning negative number of consumed bytes if the first startcode of a frame was split between 2 buffers)
michaelni
parents:
1211
diff
changeset
|
2577 int next= mpeg1_find_frame_end(s2, buf, buf_size); |
1211 | 2578 |
2579 if( ff_combine_frame(s2, next, &buf, &buf_size) < 0 ) | |
2580 return buf_size; | |
2581 } | |
2582 | |
0 | 2583 buf_ptr = buf; |
2584 buf_end = buf + buf_size; | |
383
e6b64bc3bc87
- repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents:
377
diff
changeset
|
2585 |
e6b64bc3bc87
- repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents:
377
diff
changeset
|
2586 #if 0 |
e6b64bc3bc87
- repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents:
377
diff
changeset
|
2587 if (s->repeat_field % 2 == 1) { |
267
e10840e4f773
- Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents:
241
diff
changeset
|
2588 s->repeat_field++; |
e10840e4f773
- Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents:
241
diff
changeset
|
2589 //fprintf(stderr,"\nRepeating last frame: %d -> %d! pict: %d %d", avctx->frame_number-1, avctx->frame_number, |
383
e6b64bc3bc87
- repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents:
377
diff
changeset
|
2590 // s2->picture_number, s->repeat_field); |
e6b64bc3bc87
- repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents:
377
diff
changeset
|
2591 if (avctx->flags & CODEC_FLAG_REPEAT_FIELD) { |
e6b64bc3bc87
- repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents:
377
diff
changeset
|
2592 *data_size = sizeof(AVPicture); |
e6b64bc3bc87
- repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents:
377
diff
changeset
|
2593 goto the_end; |
e6b64bc3bc87
- repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents:
377
diff
changeset
|
2594 } |
267
e10840e4f773
- Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents:
241
diff
changeset
|
2595 } |
383
e6b64bc3bc87
- repeat_pict meaning changed, now it signals the extra delay for the
pulento
parents:
377
diff
changeset
|
2596 #endif |
1376 | 2597 |
2598 if(s->mpeg_enc_ctx_allocated==0 && avctx->codec_tag == ff_get_fourcc("VCR2")) | |
2599 vcr2_init_sequence(avctx); | |
2600 | |
1211 | 2601 for(;;) { |
0 | 2602 /* find start next code */ |
1211 | 2603 start_code = find_start_code(&buf_ptr, buf_end); |
1220 | 2604 if (start_code < 0){ |
1484 | 2605 if(s2->pict_type != B_TYPE || avctx->hurry_up==0){ |
2606 if (slice_end(avctx, picture)) { | |
1672 | 2607 if(s2->last_picture_ptr || s2->low_delay) //FIXME merge with the stuff in mpeg_decode_slice |
1484 | 2608 *data_size = sizeof(AVPicture); |
2609 } | |
1285 | 2610 } |
1220 | 2611 return FFMAX(0, buf_ptr - buf - s2->parse_context.last_index); |
0 | 2612 } |
1289
57172377849a
fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents:
1285
diff
changeset
|
2613 |
57172377849a
fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents:
1285
diff
changeset
|
2614 input_size = buf_end - buf_ptr; |
57172377849a
fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents:
1285
diff
changeset
|
2615 |
57172377849a
fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents:
1285
diff
changeset
|
2616 if(avctx->debug & FF_DEBUG_STARTCODE){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1587
diff
changeset
|
2617 av_log(avctx, AV_LOG_DEBUG, "%3X at %d left %d\n", start_code, buf_ptr-buf, input_size); |
1289
57172377849a
fix mpeg1/2 decoding if there are no 0 bytes after the bitstream
michaelni
parents:
1285
diff
changeset
|
2618 } |
1211 | 2619 |
0 | 2620 /* prepare data for next start code */ |
2621 switch(start_code) { | |
2622 case SEQ_START_CODE: | |
1211 | 2623 mpeg1_decode_sequence(avctx, buf_ptr, |
0 | 2624 input_size); |
2625 break; | |
2626 | |
2627 case PICTURE_START_CODE: | |
2628 /* we have a complete image : we try to decompress it */ | |
2629 mpeg1_decode_picture(avctx, | |
1211 | 2630 buf_ptr, input_size); |
0 | 2631 break; |
2632 case EXT_START_CODE: | |
2633 mpeg_decode_extension(avctx, | |
1211 | 2634 buf_ptr, input_size); |
0 | 2635 break; |
1084 | 2636 case USER_START_CODE: |
2637 mpeg_decode_user_data(avctx, | |
1211 | 2638 buf_ptr, input_size); |
1084 | 2639 break; |
1348 | 2640 case GOP_START_CODE: |
2641 s2->first_field=0; | |
2642 break; | |
0 | 2643 default: |
2644 if (start_code >= SLICE_MIN_START_CODE && | |
911 | 2645 start_code <= SLICE_MAX_START_CODE) { |
917 | 2646 |
2647 /* skip b frames if we dont have reference frames */ | |
1138 | 2648 if(s2->last_picture_ptr==NULL && s2->pict_type==B_TYPE) break; |
917 | 2649 /* skip b frames if we are in a hurry */ |
2650 if(avctx->hurry_up && s2->pict_type==B_TYPE) break; | |
2651 /* skip everything if we are in a hurry>=5 */ | |
2652 if(avctx->hurry_up>=5) break; | |
1211 | 2653 |
1182
38e8b8f331cb
some checks to avoid segfaults if the decoder is feeded with junk
michaelni
parents:
1181
diff
changeset
|
2654 if (!s->mpeg_enc_ctx_allocated) break; |
38e8b8f331cb
some checks to avoid segfaults if the decoder is feeded with junk
michaelni
parents:
1181
diff
changeset
|
2655 |
0 | 2656 ret = mpeg_decode_slice(avctx, picture, |
1211 | 2657 start_code, &buf_ptr, input_size); |
1285 | 2658 emms_c(); |
1096
5e6e505d8997
field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents:
1092
diff
changeset
|
2659 |
1285 | 2660 if(ret < 0){ |
2661 if(s2->resync_mb_x>=0 && s2->resync_mb_y>=0) | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1164
diff
changeset
|
2662 ff_er_add_slice(s2, s2->resync_mb_x, s2->resync_mb_y, s2->mb_x, s2->mb_y, AC_ERROR|DC_ERROR|MV_ERROR); |
1285 | 2663 if(ret==DECODE_SLICE_FATAL_ERROR) return -1; |
2664 }else{ | |
2665 ff_er_add_slice(s2, s2->resync_mb_x, s2->resync_mb_y, s2->mb_x-1, s2->mb_y, AC_END|DC_END|MV_END); | |
0 | 2666 } |
2667 } | |
2668 break; | |
2669 } | |
2670 } | |
2671 } | |
2672 | |
2673 static int mpeg_decode_end(AVCodecContext *avctx) | |
2674 { | |
2675 Mpeg1Context *s = avctx->priv_data; | |
2676 | |
2677 if (s->mpeg_enc_ctx_allocated) | |
2678 MPV_common_end(&s->mpeg_enc_ctx); | |
2679 return 0; | |
2680 } | |
2681 | |
1423 | 2682 AVCodec mpeg1video_decoder = { |
2683 "mpeg1video", | |
0 | 2684 CODEC_TYPE_VIDEO, |
2685 CODEC_ID_MPEG1VIDEO, | |
2686 sizeof(Mpeg1Context), | |
2687 mpeg_decode_init, | |
2688 NULL, | |
2689 mpeg_decode_end, | |
2690 mpeg_decode_frame, | |
842
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
826
diff
changeset
|
2691 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED, |
1368 | 2692 .flush= ff_mpeg_flush, |
0 | 2693 }; |
1381 | 2694 |
1423 | 2695 AVCodec mpeg2video_decoder = { |
2696 "mpeg2video", | |
2697 CODEC_TYPE_VIDEO, | |
2698 CODEC_ID_MPEG2VIDEO, | |
2699 sizeof(Mpeg1Context), | |
2700 mpeg_decode_init, | |
2701 NULL, | |
2702 mpeg_decode_end, | |
2703 mpeg_decode_frame, | |
2704 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED, | |
2705 .flush= ff_mpeg_flush, | |
2706 }; | |
2707 | |
1615 | 2708 //legacy decoder |
2709 AVCodec mpegvideo_decoder = { | |
2710 "mpegvideo", | |
2711 CODEC_TYPE_VIDEO, | |
2712 CODEC_ID_MPEG2VIDEO, | |
2713 sizeof(Mpeg1Context), | |
2714 mpeg_decode_init, | |
2715 NULL, | |
2716 mpeg_decode_end, | |
2717 mpeg_decode_frame, | |
2718 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED, | |
2719 .flush= ff_mpeg_flush, | |
2720 }; | |
2721 | |
1381 | 2722 #ifdef HAVE_XVMC |
2723 static int mpeg_mc_decode_init(AVCodecContext *avctx){ | |
2724 Mpeg1Context *s; | |
2725 | |
2726 if( !(avctx->slice_flags & SLICE_FLAG_CODED_ORDER) ) | |
2727 return -1; | |
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
2728 if( !(avctx->slice_flags & SLICE_FLAG_ALLOW_FIELD) ){ |
1381 | 2729 dprintf("mpeg12.c: XvMC decoder will work better if SLICE_FLAG_ALLOW_FIELD is set\n"); |
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
2730 } |
1381 | 2731 mpeg_decode_init(avctx); |
2732 s = avctx->priv_data; | |
2733 | |
2734 avctx->pix_fmt = PIX_FMT_XVMC_MPEG2_IDCT; | |
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1550
diff
changeset
|
2735 avctx->xvmc_acceleration = 2;//2 - the blocks are packed! |
1381 | 2736 |
2737 return 0; | |
2738 } | |
2739 | |
2740 AVCodec mpeg_xvmc_decoder = { | |
2741 "mpegvideo_xvmc", | |
2742 CODEC_TYPE_VIDEO, | |
2743 CODEC_ID_MPEG2VIDEO_XVMC, | |
2744 sizeof(Mpeg1Context), | |
2745 mpeg_mc_decode_init, | |
2746 NULL, | |
2747 mpeg_decode_end, | |
2748 mpeg_decode_frame, | |
2749 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED, | |
2750 }; | |
2751 | |
2752 #endif | |
1410
524c904a66b8
PSX MDEC decoder, based upon some code from Sebastian Jedruszkiewicz <elf at frogger dot rules dot pl>
michaelni
parents:
1409
diff
changeset
|
2753 |
524c904a66b8
PSX MDEC decoder, based upon some code from Sebastian Jedruszkiewicz <elf at frogger dot rules dot pl>
michaelni
parents:
1409
diff
changeset
|
2754 /* this is ugly i know, but the alternative is too make |
524c904a66b8
PSX MDEC decoder, based upon some code from Sebastian Jedruszkiewicz <elf at frogger dot rules dot pl>
michaelni
parents:
1409
diff
changeset
|
2755 hundreds of vars global and prefix them with ff_mpeg1_ |
524c904a66b8
PSX MDEC decoder, based upon some code from Sebastian Jedruszkiewicz <elf at frogger dot rules dot pl>
michaelni
parents:
1409
diff
changeset
|
2756 which is far uglier. */ |
524c904a66b8
PSX MDEC decoder, based upon some code from Sebastian Jedruszkiewicz <elf at frogger dot rules dot pl>
michaelni
parents:
1409
diff
changeset
|
2757 #include "mdec.c" |