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