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