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