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