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