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