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