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