Mercurial > libavcodec.hg
annotate h263dec.c @ 677:0ed44dd02bbf libavcodec
fixing memalign
author | michaelni |
---|---|
date | Sun, 15 Sep 2002 10:02:15 +0000 |
parents | b4bddbde44f3 |
children | 85b071dfc7e3 |
rev | line source |
---|---|
0 | 1 /* |
2 * H263 decoder | |
429 | 3 * Copyright (c) 2001 Fabrice Bellard. |
0 | 4 * |
429 | 5 * This library is free software; you can redistribute it and/or |
6 * modify it under the terms of the GNU Lesser General Public | |
7 * License as published by the Free Software Foundation; either | |
8 * version 2 of the License, or (at your option) any later version. | |
0 | 9 * |
429 | 10 * This library is distributed in the hope that it will be useful, |
0 | 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
429 | 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 * Lesser General Public License for more details. | |
0 | 14 * |
429 | 15 * You should have received a copy of the GNU Lesser General Public |
16 * License along with this library; if not, write to the Free Software | |
17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
0 | 18 */ |
396
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
384
diff
changeset
|
19 #include "avcodec.h" |
0 | 20 #include "dsputil.h" |
21 #include "mpegvideo.h" | |
22 | |
23 //#define DEBUG | |
384 | 24 //#define PRINT_FRAME_TIME |
25 #ifdef PRINT_FRAME_TIME | |
26 static inline long long rdtsc() | |
27 { | |
28 long long l; | |
29 asm volatile( "rdtsc\n\t" | |
30 : "=A" (l) | |
31 ); | |
32 // printf("%d\n", int(l/1000)); | |
33 return l; | |
34 } | |
35 #endif | |
0 | 36 |
37 static int h263_decode_init(AVCodecContext *avctx) | |
38 { | |
39 MpegEncContext *s = avctx->priv_data; | |
60 | 40 |
67 | 41 s->avctx = avctx; |
0 | 42 s->out_format = FMT_H263; |
43 | |
44 s->width = avctx->width; | |
45 s->height = avctx->height; | |
411
5c8b3a717929
workaround dc_scale bug in old ffmpeg msmpeg4v3 encoder (set workaround_bugs=1 for this)
michaelni
parents:
396
diff
changeset
|
46 s->workaround_bugs= avctx->workaround_bugs; |
0 | 47 |
48 /* select sub codec */ | |
49 switch(avctx->codec->id) { | |
50 case CODEC_ID_H263: | |
154
f914f710b8d0
- Fixed a bug on H.263 MV prediction for MB on GOBs limits.
pulento
parents:
144
diff
changeset
|
51 s->gob_number = 0; |
454 | 52 s->first_slice_line = 0; |
0 | 53 break; |
67 | 54 case CODEC_ID_MPEG4: |
0 | 55 s->time_increment_bits = 4; /* default value for broken headers */ |
56 s->h263_pred = 1; | |
336 | 57 s->has_b_frames = 1; //default, might be overriden in the vol header during header parsing |
0 | 58 break; |
307 | 59 case CODEC_ID_MSMPEG4V1: |
0 | 60 s->h263_msmpeg4 = 1; |
61 s->h263_pred = 1; | |
307 | 62 s->msmpeg4_version=1; |
63 break; | |
64 case CODEC_ID_MSMPEG4V2: | |
65 s->h263_msmpeg4 = 1; | |
66 s->h263_pred = 1; | |
67 s->msmpeg4_version=2; | |
68 break; | |
69 case CODEC_ID_MSMPEG4V3: | |
70 s->h263_msmpeg4 = 1; | |
71 s->h263_pred = 1; | |
72 s->msmpeg4_version=3; | |
0 | 73 break; |
311 | 74 case CODEC_ID_WMV1: |
75 s->h263_msmpeg4 = 1; | |
76 s->h263_pred = 1; | |
77 s->msmpeg4_version=4; | |
78 break; | |
498 | 79 case CODEC_ID_WMV2: |
80 s->h263_msmpeg4 = 1; | |
81 s->h263_pred = 1; | |
82 s->msmpeg4_version=5; | |
83 break; | |
0 | 84 case CODEC_ID_H263I: |
85 s->h263_intel = 1; | |
86 break; | |
87 default: | |
88 return -1; | |
89 } | |
344 | 90 s->codec_id= avctx->codec->id; |
553 | 91 |
0 | 92 /* for h263, we allocate the images after having read the header */ |
274
d0c186bcf075
use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents:
273
diff
changeset
|
93 if (avctx->codec->id != CODEC_ID_H263 && avctx->codec->id != CODEC_ID_MPEG4) |
144 | 94 if (MPV_common_init(s) < 0) |
95 return -1; | |
0 | 96 |
97 if (s->h263_msmpeg4) | |
498 | 98 ff_msmpeg4_decode_init(s); |
0 | 99 else |
100 h263_decode_init_vlc(s); | |
101 | |
102 return 0; | |
103 } | |
104 | |
105 static int h263_decode_end(AVCodecContext *avctx) | |
106 { | |
107 MpegEncContext *s = avctx->priv_data; | |
108 | |
109 MPV_common_end(s); | |
110 return 0; | |
111 } | |
112 | |
655 | 113 /** |
114 * retunrs the number of bytes consumed for building the current frame | |
115 */ | |
116 static int get_consumed_bytes(MpegEncContext *s, int buf_size){ | |
117 int pos= (get_bits_count(&s->gb)+7)>>3; | |
118 | |
119 if(s->divx_version>=500){ | |
120 //we would have to scan through the whole buf to handle the weird reordering ... | |
121 return buf_size; | |
122 }else{ | |
123 if(pos==0) pos=1; //avoid infinite loops (i doubt thats needed but ...) | |
658 | 124 if(pos+10>buf_size) pos=buf_size; // oops ;) |
655 | 125 |
126 return pos; | |
127 } | |
128 } | |
129 | |
0 | 130 static int h263_decode_frame(AVCodecContext *avctx, |
131 void *data, int *data_size, | |
132 UINT8 *buf, int buf_size) | |
133 { | |
134 MpegEncContext *s = avctx->priv_data; | |
135 int ret; | |
136 AVPicture *pict = data; | |
384 | 137 #ifdef PRINT_FRAME_TIME |
138 uint64_t time= rdtsc(); | |
139 #endif | |
0 | 140 #ifdef DEBUG |
141 printf("*****frame %d size=%d\n", avctx->frame_number, buf_size); | |
142 printf("bytes=%x %x %x %x\n", buf[0], buf[1], buf[2], buf[3]); | |
143 #endif | |
345 | 144 |
145 s->hurry_up= avctx->hurry_up; | |
454 | 146 s->error_resilience= avctx->error_resilience; |
147 s->workaround_bugs= avctx->workaround_bugs; | |
485 | 148 s->flags= avctx->flags; |
454 | 149 |
657 | 150 *data_size = 0; |
151 | |
152 /* no supplementary picture */ | |
0 | 153 if (buf_size == 0) { |
154 return 0; | |
155 } | |
156 | |
465 | 157 if(s->bitstream_buffer_size && buf_size<20){ //divx 5.01+ frame reorder |
333 | 158 init_get_bits(&s->gb, s->bitstream_buffer, s->bitstream_buffer_size); |
353 | 159 }else |
333 | 160 init_get_bits(&s->gb, buf, buf_size); |
465 | 161 s->bitstream_buffer_size=0; |
0 | 162 |
163 /* let's go :-) */ | |
164 if (s->h263_msmpeg4) { | |
165 ret = msmpeg4_decode_picture_header(s); | |
166 } else if (s->h263_pred) { | |
167 ret = mpeg4_decode_picture_header(s); | |
336 | 168 s->has_b_frames= !s->low_delay; |
0 | 169 } else if (s->h263_intel) { |
170 ret = intel_h263_decode_picture_header(s); | |
171 } else { | |
172 ret = h263_decode_picture_header(s); | |
274
d0c186bcf075
use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents:
273
diff
changeset
|
173 } |
556 | 174 avctx->has_b_frames= s->has_b_frames; |
585
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
175 #if 0 // dump bits per frame / qp / complexity |
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
176 { |
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
177 static FILE *f=NULL; |
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
178 if(!f) f=fopen("rate_qp_cplx.txt", "w"); |
589
507e688d57b2
10l found by R«±mi Guyomarch <rguyom at pobox dot com>
michaelni
parents:
585
diff
changeset
|
179 fprintf(f, "%d %d %f\n", buf_size, s->qscale, buf_size*(double)s->qscale); |
585
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
180 } |
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
181 #endif |
553 | 182 |
274
d0c186bcf075
use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents:
273
diff
changeset
|
183 /* After H263 & mpeg4 header decode we have the height, width,*/ |
160 | 184 /* and other parameters. So then we could init the picture */ |
185 /* FIXME: By the way H263 decoder is evolving it should have */ | |
186 /* an H263EncContext */ | |
553 | 187 if (s->width != avctx->width || s->height != avctx->height) { |
188 /* H.263 could change picture size any time */ | |
189 MPV_common_end(s); | |
190 s->context_initialized=0; | |
191 } | |
274
d0c186bcf075
use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents:
273
diff
changeset
|
192 if (!s->context_initialized) { |
d0c186bcf075
use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents:
273
diff
changeset
|
193 avctx->width = s->width; |
d0c186bcf075
use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents:
273
diff
changeset
|
194 avctx->height = s->height; |
281
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
274
diff
changeset
|
195 avctx->aspect_ratio_info= s->aspect_ratio_info; |
669
b4bddbde44f3
aspect (ext. par too) support for h263 and mpeg4 (inc. build becouse of new vars)
al3x
parents:
658
diff
changeset
|
196 if (s->aspect_ratio_info == FF_ASPECT_EXTENDED) |
b4bddbde44f3
aspect (ext. par too) support for h263 and mpeg4 (inc. build becouse of new vars)
al3x
parents:
658
diff
changeset
|
197 { |
b4bddbde44f3
aspect (ext. par too) support for h263 and mpeg4 (inc. build becouse of new vars)
al3x
parents:
658
diff
changeset
|
198 avctx->aspected_width = s->aspected_width; |
b4bddbde44f3
aspect (ext. par too) support for h263 and mpeg4 (inc. build becouse of new vars)
al3x
parents:
658
diff
changeset
|
199 avctx->aspected_height = s->aspected_height; |
b4bddbde44f3
aspect (ext. par too) support for h263 and mpeg4 (inc. build becouse of new vars)
al3x
parents:
658
diff
changeset
|
200 } |
274
d0c186bcf075
use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents:
273
diff
changeset
|
201 if (MPV_common_init(s) < 0) |
d0c186bcf075
use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents:
273
diff
changeset
|
202 return -1; |
0 | 203 } |
274
d0c186bcf075
use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents:
273
diff
changeset
|
204 |
655 | 205 if(ret==FRAME_SKIPED) return get_consumed_bytes(s, buf_size); |
454 | 206 /* skip if the header was thrashed */ |
498 | 207 if (ret < 0){ |
208 fprintf(stderr, "header damaged\n"); | |
0 | 209 return -1; |
498 | 210 } |
341 | 211 /* skip b frames if we dont have reference frames */ |
655 | 212 if(s->num_available_buffers<2 && s->pict_type==B_TYPE) return get_consumed_bytes(s, buf_size); |
345 | 213 /* skip b frames if we are in a hurry */ |
655 | 214 if(s->hurry_up && s->pict_type==B_TYPE) return get_consumed_bytes(s, buf_size); |
454 | 215 |
216 if(s->next_p_frame_damaged){ | |
217 if(s->pict_type==B_TYPE) | |
655 | 218 return get_consumed_bytes(s, buf_size); |
454 | 219 else |
220 s->next_p_frame_damaged=0; | |
221 } | |
222 | |
553 | 223 MPV_frame_start(s, avctx); |
0 | 224 |
225 #ifdef DEBUG | |
226 printf("qscale=%d\n", s->qscale); | |
227 #endif | |
228 | |
454 | 229 /* init resync/ error resilience specific variables */ |
230 s->next_resync_qscale= s->qscale; | |
231 s->next_resync_gb= s->gb; | |
232 if(s->resync_marker) s->mb_num_left= 0; | |
233 else s->mb_num_left= s->mb_num; | |
234 | |
0 | 235 /* decode each macroblock */ |
266 | 236 s->block_wrap[0]= |
237 s->block_wrap[1]= | |
238 s->block_wrap[2]= | |
239 s->block_wrap[3]= s->mb_width*2 + 2; | |
240 s->block_wrap[4]= | |
241 s->block_wrap[5]= s->mb_width + 2; | |
0 | 242 for(s->mb_y=0; s->mb_y < s->mb_height; s->mb_y++) { |
162 | 243 /* Check for GOB headers on H.263 */ |
244 /* FIXME: In the future H.263+ will have intra prediction */ | |
245 /* and we are gonna need another way to detect MPEG4 */ | |
246 if (s->mb_y && !s->h263_pred) { | |
454 | 247 s->first_slice_line = h263_decode_gob_header(s); |
248 } | |
249 | |
250 if(s->msmpeg4_version==1){ | |
251 s->last_dc[0]= | |
252 s->last_dc[1]= | |
253 s->last_dc[2]= 128; | |
162 | 254 } |
296 | 255 |
498 | 256 s->y_dc_scale= s->y_dc_scale_table[ s->qscale ]; |
257 s->c_dc_scale= s->c_dc_scale_table[ s->qscale ]; | |
258 | |
266 | 259 s->block_index[0]= s->block_wrap[0]*(s->mb_y*2 + 1) - 1; |
260 s->block_index[1]= s->block_wrap[0]*(s->mb_y*2 + 1); | |
261 s->block_index[2]= s->block_wrap[0]*(s->mb_y*2 + 2) - 1; | |
262 s->block_index[3]= s->block_wrap[0]*(s->mb_y*2 + 2); | |
263 s->block_index[4]= s->block_wrap[4]*(s->mb_y + 1) + s->block_wrap[0]*(s->mb_height*2 + 2); | |
264 s->block_index[5]= s->block_wrap[4]*(s->mb_y + 1 + s->mb_height + 2) + s->block_wrap[0]*(s->mb_height*2 + 2); | |
0 | 265 for(s->mb_x=0; s->mb_x < s->mb_width; s->mb_x++) { |
266 | 266 s->block_index[0]+=2; |
267 s->block_index[1]+=2; | |
268 s->block_index[2]+=2; | |
269 s->block_index[3]+=2; | |
270 s->block_index[4]++; | |
271 s->block_index[5]++; | |
0 | 272 #ifdef DEBUG |
273 printf("**mb x=%d y=%d\n", s->mb_x, s->mb_y); | |
274 #endif | |
454 | 275 |
276 if(s->resync_marker){ | |
277 if(s->mb_num_left<=0){ | |
278 /* except the first block */ | |
279 if(s->mb_x!=0 || s->mb_y!=0){ | |
280 /* did we miss the next resync marker without noticing an error yet */ | |
281 if(((get_bits_count(&s->gb)+8)&(~7)) != s->next_resync_pos && s->decoding_error==0){ | |
282 fprintf(stderr, "slice end missmatch x:%d y:%d %d %d\n", | |
283 s->mb_x, s->mb_y, get_bits_count(&s->gb), s->next_resync_pos); | |
284 ff_conceal_past_errors(s, 1); | |
285 } | |
286 } | |
287 s->qscale= s->next_resync_qscale; | |
498 | 288 s->y_dc_scale= s->y_dc_scale_table[ s->qscale ]; |
289 s->c_dc_scale= s->c_dc_scale_table[ s->qscale ]; | |
290 | |
454 | 291 s->gb= s->next_resync_gb; |
292 s->resync_mb_x= s->mb_x; //we know that the marker is here cuz mb_num_left was the distance to it | |
293 s->resync_mb_y= s->mb_y; | |
294 s->first_slice_line=1; | |
295 | |
296 if(s->codec_id==CODEC_ID_MPEG4){ | |
297 ff_mpeg4_clean_buffers(s); | |
298 ff_mpeg4_resync(s); | |
299 } | |
300 } | |
301 | |
302 if( s->resync_mb_x==s->mb_x | |
303 && s->resync_mb_y==s->mb_y && s->decoding_error!=0){ | |
304 fprintf(stderr, "resynced at %d %d\n", s->mb_x, s->mb_y); | |
305 s->decoding_error= 0; | |
306 } | |
307 } | |
308 | |
144 | 309 //fprintf(stderr,"\nFrame: %d\tMB: %d",avctx->frame_number, (s->mb_y * s->mb_width) + s->mb_x); |
0 | 310 /* DCT & quantize */ |
454 | 311 if(s->decoding_error!=DECODING_DESYNC){ |
312 int last_error= s->decoding_error; | |
313 clear_blocks(s->block[0]); | |
296 | 314 |
454 | 315 s->mv_dir = MV_DIR_FORWARD; |
316 s->mv_type = MV_TYPE_16X16; | |
317 if (s->h263_msmpeg4) { | |
318 if (msmpeg4_decode_mb(s, s->block) < 0) { | |
319 fprintf(stderr,"Error at MB: %d\n", (s->mb_y * s->mb_width) + s->mb_x); | |
320 s->decoding_error=DECODING_DESYNC; | |
321 } | |
322 } else { | |
323 if (h263_decode_mb(s, s->block) < 0) { | |
324 fprintf(stderr,"Error at MB: %d\n", (s->mb_y * s->mb_width) + s->mb_x); | |
325 s->decoding_error=DECODING_DESYNC; | |
326 } | |
327 } | |
328 | |
329 if(s->decoding_error!=last_error){ | |
330 ff_conceal_past_errors(s, 0); | |
161 | 331 } |
0 | 332 } |
454 | 333 |
334 /* conceal errors */ | |
335 if( s->decoding_error==DECODING_DESYNC | |
336 || (s->decoding_error==DECODING_ACDC_LOST && s->mb_intra)){ | |
337 s->mv_dir = MV_DIR_FORWARD; | |
338 s->mv_type = MV_TYPE_16X16; | |
339 s->mb_skiped=0; | |
340 s->mb_intra=0; | |
341 s->mv[0][0][0]=0; //FIXME this is not optimal | |
342 s->mv[0][0][1]=0; | |
343 clear_blocks(s->block[0]); | |
344 }else if(s->decoding_error && !s->mb_intra){ | |
345 clear_blocks(s->block[0]); | |
346 } | |
347 //FIXME remove AC for intra | |
348 | |
12
4d50c7d89e0f
use block[] in structure to have it aligned on 8 bytes for mmx optimizations
glantau
parents:
0
diff
changeset
|
349 MPV_decode_mb(s, s->block); |
454 | 350 |
351 s->mb_num_left--; | |
0 | 352 } |
341 | 353 if ( avctx->draw_horiz_band |
354 && (s->num_available_buffers>=1 || (!s->has_b_frames)) ) { | |
67 | 355 UINT8 *src_ptr[3]; |
356 int y, h, offset; | |
357 y = s->mb_y * 16; | |
358 h = s->height - y; | |
359 if (h > 16) | |
360 h = 16; | |
361 offset = y * s->linesize; | |
308 | 362 if(s->pict_type==B_TYPE || (!s->has_b_frames)){ |
363 src_ptr[0] = s->current_picture[0] + offset; | |
364 src_ptr[1] = s->current_picture[1] + (offset >> 2); | |
365 src_ptr[2] = s->current_picture[2] + (offset >> 2); | |
366 } else { | |
367 src_ptr[0] = s->last_picture[0] + offset; | |
368 src_ptr[1] = s->last_picture[1] + (offset >> 2); | |
369 src_ptr[2] = s->last_picture[2] + (offset >> 2); | |
370 } | |
67 | 371 avctx->draw_horiz_band(avctx, src_ptr, s->linesize, |
372 y, s->width, h); | |
373 } | |
0 | 374 } |
208 | 375 |
311 | 376 if (s->h263_msmpeg4 && s->msmpeg4_version<4 && s->pict_type==I_TYPE) |
208 | 377 if(msmpeg4_decode_ext_header(s, buf_size) < 0) return -1; |
333 | 378 |
379 /* divx 5.01+ bistream reorder stuff */ | |
655 | 380 if(s->codec_id==CODEC_ID_MPEG4 && s->bitstream_buffer_size==0 && s->divx_version>=500){ |
454 | 381 int current_pos= get_bits_count(&s->gb)>>3; |
382 | |
333 | 383 if( buf_size - current_pos > 5 |
384 && buf_size - current_pos < BITSTREAM_BUFFER_SIZE){ | |
454 | 385 int i; |
386 int startcode_found=0; | |
655 | 387 for(i=current_pos; i<buf_size-3; i++){ |
454 | 388 if(buf[i]==0 && buf[i+1]==0 && buf[i+2]==1 && buf[i+3]==0xB6){ |
389 startcode_found=1; | |
390 break; | |
391 } | |
392 } | |
393 if(startcode_found){ | |
394 memcpy(s->bitstream_buffer, buf + current_pos, buf_size - current_pos); | |
395 s->bitstream_buffer_size= buf_size - current_pos; | |
396 } | |
397 } | |
398 } | |
399 | |
400 if(s->bitstream_buffer_size==0 && s->error_resilience>0){ | |
401 int left= s->gb.size*8 - get_bits_count(&s->gb); | |
402 int max_extra=8; | |
403 | |
404 if(s->codec_id==CODEC_ID_MPEG4) max_extra+=32; | |
405 | |
406 if(left>max_extra){ | |
407 fprintf(stderr, "discarding %d junk bits at end, next would be %X\n", left, show_bits(&s->gb, 24)); | |
408 if(s->decoding_error==0) | |
409 ff_conceal_past_errors(s, 1); | |
410 } | |
411 if(left<0){ | |
412 fprintf(stderr, "overreading %d bits\n", -left); | |
413 if(s->decoding_error==0) | |
414 ff_conceal_past_errors(s, 1); | |
333 | 415 } |
353 | 416 } |
333 | 417 |
0 | 418 MPV_frame_end(s); |
361 | 419 #if 0 //dirty show MVs, we should export the MV tables and write a filter to show them |
420 { | |
421 int mb_y; | |
422 s->has_b_frames=1; | |
423 for(mb_y=0; mb_y<s->mb_height; mb_y++){ | |
424 int mb_x; | |
411
5c8b3a717929
workaround dc_scale bug in old ffmpeg msmpeg4v3 encoder (set workaround_bugs=1 for this)
michaelni
parents:
396
diff
changeset
|
425 int y= mb_y*16 + 8; |
361 | 426 for(mb_x=0; mb_x<s->mb_width; mb_x++){ |
411
5c8b3a717929
workaround dc_scale bug in old ffmpeg msmpeg4v3 encoder (set workaround_bugs=1 for this)
michaelni
parents:
396
diff
changeset
|
427 int x= mb_x*16 + 8; |
361 | 428 uint8_t *ptr= s->last_picture[0]; |
429 int xy= 1 + mb_x*2 + (mb_y*2 + 1)*(s->mb_width*2 + 2); | |
430 int mx= (s->motion_val[xy][0]>>1) + x; | |
431 int my= (s->motion_val[xy][1]>>1) + y; | |
432 int i; | |
433 int max; | |
434 | |
435 if(mx<0) mx=0; | |
436 if(my<0) my=0; | |
437 if(mx>=s->width) mx= s->width -1; | |
438 if(my>=s->height) my= s->height-1; | |
439 max= ABS(mx-x); | |
440 if(ABS(my-y) > max) max= ABS(my-y); | |
441 /* the ugliest linedrawing routine ... */ | |
442 for(i=0; i<max; i++){ | |
443 int x1= x + (mx-x)*i/max; | |
444 int y1= y + (my-y)*i/max; | |
445 ptr[y1*s->linesize + x1]+=100; | |
446 } | |
411
5c8b3a717929
workaround dc_scale bug in old ffmpeg msmpeg4v3 encoder (set workaround_bugs=1 for this)
michaelni
parents:
396
diff
changeset
|
447 ptr[y*s->linesize + x]+=100; |
361 | 448 s->mbskip_table[mb_x + mb_y*s->mb_width]=0; |
449 } | |
450 } | |
451 | |
452 } | |
453 #endif | |
273
34f40a0fc840
msmpeg4 bugfix (wrong frame displayed if some frames are skipped)
michaelni
parents:
266
diff
changeset
|
454 if(s->pict_type==B_TYPE || (!s->has_b_frames)){ |
262 | 455 pict->data[0] = s->current_picture[0]; |
456 pict->data[1] = s->current_picture[1]; | |
457 pict->data[2] = s->current_picture[2]; | |
458 } else { | |
459 pict->data[0] = s->last_picture[0]; | |
460 pict->data[1] = s->last_picture[1]; | |
461 pict->data[2] = s->last_picture[2]; | |
462 } | |
0 | 463 pict->linesize[0] = s->linesize; |
556 | 464 pict->linesize[1] = s->uvlinesize; |
465 pict->linesize[2] = s->uvlinesize; | |
0 | 466 |
467 avctx->quality = s->qscale; | |
231 | 468 |
469 /* Return the Picture timestamp as the frame number */ | |
470 /* we substract 1 because it is added on utils.c */ | |
471 avctx->frame_number = s->picture_number - 1; | |
472 | |
341 | 473 /* dont output the last pic after seeking |
474 note we allready added +1 for the current pix in MPV_frame_end(s) */ | |
475 if(s->num_available_buffers>=2 || (!s->has_b_frames)) | |
476 *data_size = sizeof(AVPicture); | |
384 | 477 #ifdef PRINT_FRAME_TIME |
478 printf("%Ld\n", rdtsc()-time); | |
479 #endif | |
655 | 480 return get_consumed_bytes(s, buf_size); |
0 | 481 } |
482 | |
67 | 483 AVCodec mpeg4_decoder = { |
484 "mpeg4", | |
0 | 485 CODEC_TYPE_VIDEO, |
67 | 486 CODEC_ID_MPEG4, |
0 | 487 sizeof(MpegEncContext), |
488 h263_decode_init, | |
489 NULL, | |
490 h263_decode_end, | |
491 h263_decode_frame, | |
553 | 492 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
0 | 493 }; |
494 | |
495 AVCodec h263_decoder = { | |
496 "h263", | |
497 CODEC_TYPE_VIDEO, | |
498 CODEC_ID_H263, | |
499 sizeof(MpegEncContext), | |
500 h263_decode_init, | |
501 NULL, | |
502 h263_decode_end, | |
503 h263_decode_frame, | |
553 | 504 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
0 | 505 }; |
506 | |
307 | 507 AVCodec msmpeg4v1_decoder = { |
508 "msmpeg4v1", | |
509 CODEC_TYPE_VIDEO, | |
510 CODEC_ID_MSMPEG4V1, | |
511 sizeof(MpegEncContext), | |
512 h263_decode_init, | |
513 NULL, | |
514 h263_decode_end, | |
515 h263_decode_frame, | |
553 | 516 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
307 | 517 }; |
518 | |
519 AVCodec msmpeg4v2_decoder = { | |
520 "msmpeg4v2", | |
521 CODEC_TYPE_VIDEO, | |
522 CODEC_ID_MSMPEG4V2, | |
523 sizeof(MpegEncContext), | |
524 h263_decode_init, | |
525 NULL, | |
526 h263_decode_end, | |
527 h263_decode_frame, | |
553 | 528 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
307 | 529 }; |
530 | |
531 AVCodec msmpeg4v3_decoder = { | |
0 | 532 "msmpeg4", |
533 CODEC_TYPE_VIDEO, | |
307 | 534 CODEC_ID_MSMPEG4V3, |
0 | 535 sizeof(MpegEncContext), |
536 h263_decode_init, | |
537 NULL, | |
538 h263_decode_end, | |
539 h263_decode_frame, | |
553 | 540 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
0 | 541 }; |
542 | |
311 | 543 AVCodec wmv1_decoder = { |
544 "wmv1", | |
545 CODEC_TYPE_VIDEO, | |
546 CODEC_ID_WMV1, | |
547 sizeof(MpegEncContext), | |
548 h263_decode_init, | |
549 NULL, | |
550 h263_decode_end, | |
551 h263_decode_frame, | |
553 | 552 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
311 | 553 }; |
554 | |
498 | 555 AVCodec wmv2_decoder = { |
556 "wmv2", | |
557 CODEC_TYPE_VIDEO, | |
558 CODEC_ID_WMV2, | |
559 sizeof(MpegEncContext), | |
560 h263_decode_init, | |
561 NULL, | |
562 h263_decode_end, | |
563 h263_decode_frame, | |
553 | 564 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
498 | 565 }; |
566 | |
0 | 567 AVCodec h263i_decoder = { |
568 "h263i", | |
569 CODEC_TYPE_VIDEO, | |
570 CODEC_ID_H263I, | |
571 sizeof(MpegEncContext), | |
572 h263_decode_init, | |
573 NULL, | |
574 h263_decode_end, | |
575 h263_decode_frame, | |
553 | 576 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
0 | 577 }; |
578 |