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