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