Mercurial > libavcodec.hg
annotate h263dec.c @ 704:9b35329086c7 libavcodec
An easy way to speed up encoding by 6%.
author | mellum |
---|---|
date | Sat, 28 Sep 2002 02:18:34 +0000 |
parents | 85b071dfc7e3 |
children | 6cba3b6196f0 |
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; |
701 | 147 |
454 | 148 s->workaround_bugs= avctx->workaround_bugs; |
701 | 149 if(s->avctx->fourcc == ff_get_fourcc("XVIX") && s->workaround_bugs==0) |
150 s->workaround_bugs=2; | |
151 | |
485 | 152 s->flags= avctx->flags; |
454 | 153 |
657 | 154 *data_size = 0; |
155 | |
156 /* no supplementary picture */ | |
0 | 157 if (buf_size == 0) { |
158 return 0; | |
159 } | |
160 | |
465 | 161 if(s->bitstream_buffer_size && buf_size<20){ //divx 5.01+ frame reorder |
333 | 162 init_get_bits(&s->gb, s->bitstream_buffer, s->bitstream_buffer_size); |
353 | 163 }else |
333 | 164 init_get_bits(&s->gb, buf, buf_size); |
465 | 165 s->bitstream_buffer_size=0; |
0 | 166 |
167 /* let's go :-) */ | |
168 if (s->h263_msmpeg4) { | |
169 ret = msmpeg4_decode_picture_header(s); | |
170 } else if (s->h263_pred) { | |
171 ret = mpeg4_decode_picture_header(s); | |
336 | 172 s->has_b_frames= !s->low_delay; |
0 | 173 } else if (s->h263_intel) { |
174 ret = intel_h263_decode_picture_header(s); | |
175 } else { | |
176 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
|
177 } |
556 | 178 avctx->has_b_frames= s->has_b_frames; |
585
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
179 #if 0 // dump bits per frame / qp / complexity |
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 static FILE *f=NULL; |
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
182 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
|
183 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
|
184 } |
86ebb02c6693
dump bits per frame / qp / frame complexity support
michaelni
parents:
562
diff
changeset
|
185 #endif |
553 | 186 |
274
d0c186bcf075
use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents:
273
diff
changeset
|
187 /* After H263 & mpeg4 header decode we have the height, width,*/ |
160 | 188 /* and other parameters. So then we could init the picture */ |
189 /* FIXME: By the way H263 decoder is evolving it should have */ | |
190 /* an H263EncContext */ | |
553 | 191 if (s->width != avctx->width || s->height != avctx->height) { |
192 /* H.263 could change picture size any time */ | |
193 MPV_common_end(s); | |
194 s->context_initialized=0; | |
195 } | |
274
d0c186bcf075
use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents:
273
diff
changeset
|
196 if (!s->context_initialized) { |
d0c186bcf075
use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents:
273
diff
changeset
|
197 avctx->width = s->width; |
d0c186bcf075
use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents:
273
diff
changeset
|
198 avctx->height = s->height; |
281
1fc96b02142e
mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents:
274
diff
changeset
|
199 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
|
200 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
|
201 { |
b4bddbde44f3
aspect (ext. par too) support for h263 and mpeg4 (inc. build becouse of new vars)
al3x
parents:
658
diff
changeset
|
202 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
|
203 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
|
204 } |
274
d0c186bcf075
use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents:
273
diff
changeset
|
205 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
|
206 return -1; |
0 | 207 } |
274
d0c186bcf075
use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents:
273
diff
changeset
|
208 |
655 | 209 if(ret==FRAME_SKIPED) return get_consumed_bytes(s, buf_size); |
454 | 210 /* skip if the header was thrashed */ |
498 | 211 if (ret < 0){ |
212 fprintf(stderr, "header damaged\n"); | |
0 | 213 return -1; |
498 | 214 } |
341 | 215 /* skip b frames if we dont have reference frames */ |
655 | 216 if(s->num_available_buffers<2 && s->pict_type==B_TYPE) return get_consumed_bytes(s, buf_size); |
345 | 217 /* skip b frames if we are in a hurry */ |
655 | 218 if(s->hurry_up && s->pict_type==B_TYPE) return get_consumed_bytes(s, buf_size); |
454 | 219 |
220 if(s->next_p_frame_damaged){ | |
221 if(s->pict_type==B_TYPE) | |
655 | 222 return get_consumed_bytes(s, buf_size); |
454 | 223 else |
224 s->next_p_frame_damaged=0; | |
225 } | |
226 | |
553 | 227 MPV_frame_start(s, avctx); |
0 | 228 |
229 #ifdef DEBUG | |
230 printf("qscale=%d\n", s->qscale); | |
231 #endif | |
232 | |
454 | 233 /* init resync/ error resilience specific variables */ |
234 s->next_resync_qscale= s->qscale; | |
235 s->next_resync_gb= s->gb; | |
236 if(s->resync_marker) s->mb_num_left= 0; | |
237 else s->mb_num_left= s->mb_num; | |
238 | |
0 | 239 /* decode each macroblock */ |
266 | 240 s->block_wrap[0]= |
241 s->block_wrap[1]= | |
242 s->block_wrap[2]= | |
243 s->block_wrap[3]= s->mb_width*2 + 2; | |
244 s->block_wrap[4]= | |
245 s->block_wrap[5]= s->mb_width + 2; | |
0 | 246 for(s->mb_y=0; s->mb_y < s->mb_height; s->mb_y++) { |
162 | 247 /* Check for GOB headers on H.263 */ |
248 /* FIXME: In the future H.263+ will have intra prediction */ | |
249 /* and we are gonna need another way to detect MPEG4 */ | |
250 if (s->mb_y && !s->h263_pred) { | |
454 | 251 s->first_slice_line = h263_decode_gob_header(s); |
252 } | |
253 | |
254 if(s->msmpeg4_version==1){ | |
255 s->last_dc[0]= | |
256 s->last_dc[1]= | |
257 s->last_dc[2]= 128; | |
162 | 258 } |
296 | 259 |
498 | 260 s->y_dc_scale= s->y_dc_scale_table[ s->qscale ]; |
261 s->c_dc_scale= s->c_dc_scale_table[ s->qscale ]; | |
262 | |
266 | 263 s->block_index[0]= s->block_wrap[0]*(s->mb_y*2 + 1) - 1; |
264 s->block_index[1]= s->block_wrap[0]*(s->mb_y*2 + 1); | |
265 s->block_index[2]= s->block_wrap[0]*(s->mb_y*2 + 2) - 1; | |
266 s->block_index[3]= s->block_wrap[0]*(s->mb_y*2 + 2); | |
267 s->block_index[4]= s->block_wrap[4]*(s->mb_y + 1) + s->block_wrap[0]*(s->mb_height*2 + 2); | |
268 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 | 269 for(s->mb_x=0; s->mb_x < s->mb_width; s->mb_x++) { |
266 | 270 s->block_index[0]+=2; |
271 s->block_index[1]+=2; | |
272 s->block_index[2]+=2; | |
273 s->block_index[3]+=2; | |
274 s->block_index[4]++; | |
275 s->block_index[5]++; | |
0 | 276 #ifdef DEBUG |
277 printf("**mb x=%d y=%d\n", s->mb_x, s->mb_y); | |
278 #endif | |
454 | 279 |
280 if(s->resync_marker){ | |
281 if(s->mb_num_left<=0){ | |
282 /* except the first block */ | |
283 if(s->mb_x!=0 || s->mb_y!=0){ | |
284 /* did we miss the next resync marker without noticing an error yet */ | |
285 if(((get_bits_count(&s->gb)+8)&(~7)) != s->next_resync_pos && s->decoding_error==0){ | |
286 fprintf(stderr, "slice end missmatch x:%d y:%d %d %d\n", | |
287 s->mb_x, s->mb_y, get_bits_count(&s->gb), s->next_resync_pos); | |
288 ff_conceal_past_errors(s, 1); | |
289 } | |
290 } | |
291 s->qscale= s->next_resync_qscale; | |
498 | 292 s->y_dc_scale= s->y_dc_scale_table[ s->qscale ]; |
293 s->c_dc_scale= s->c_dc_scale_table[ s->qscale ]; | |
294 | |
454 | 295 s->gb= s->next_resync_gb; |
296 s->resync_mb_x= s->mb_x; //we know that the marker is here cuz mb_num_left was the distance to it | |
297 s->resync_mb_y= s->mb_y; | |
298 s->first_slice_line=1; | |
299 | |
300 if(s->codec_id==CODEC_ID_MPEG4){ | |
301 ff_mpeg4_clean_buffers(s); | |
302 ff_mpeg4_resync(s); | |
303 } | |
304 } | |
305 | |
306 if( s->resync_mb_x==s->mb_x | |
307 && s->resync_mb_y==s->mb_y && s->decoding_error!=0){ | |
308 fprintf(stderr, "resynced at %d %d\n", s->mb_x, s->mb_y); | |
309 s->decoding_error= 0; | |
310 } | |
311 } | |
312 | |
144 | 313 //fprintf(stderr,"\nFrame: %d\tMB: %d",avctx->frame_number, (s->mb_y * s->mb_width) + s->mb_x); |
0 | 314 /* DCT & quantize */ |
454 | 315 if(s->decoding_error!=DECODING_DESYNC){ |
316 int last_error= s->decoding_error; | |
317 clear_blocks(s->block[0]); | |
296 | 318 |
454 | 319 s->mv_dir = MV_DIR_FORWARD; |
320 s->mv_type = MV_TYPE_16X16; | |
321 if (s->h263_msmpeg4) { | |
322 if (msmpeg4_decode_mb(s, s->block) < 0) { | |
323 fprintf(stderr,"Error at MB: %d\n", (s->mb_y * s->mb_width) + s->mb_x); | |
324 s->decoding_error=DECODING_DESYNC; | |
325 } | |
326 } else { | |
327 if (h263_decode_mb(s, s->block) < 0) { | |
328 fprintf(stderr,"Error at MB: %d\n", (s->mb_y * s->mb_width) + s->mb_x); | |
329 s->decoding_error=DECODING_DESYNC; | |
330 } | |
331 } | |
332 | |
333 if(s->decoding_error!=last_error){ | |
334 ff_conceal_past_errors(s, 0); | |
161 | 335 } |
0 | 336 } |
454 | 337 |
338 /* conceal errors */ | |
339 if( s->decoding_error==DECODING_DESYNC | |
340 || (s->decoding_error==DECODING_ACDC_LOST && s->mb_intra)){ | |
341 s->mv_dir = MV_DIR_FORWARD; | |
342 s->mv_type = MV_TYPE_16X16; | |
343 s->mb_skiped=0; | |
344 s->mb_intra=0; | |
345 s->mv[0][0][0]=0; //FIXME this is not optimal | |
346 s->mv[0][0][1]=0; | |
347 clear_blocks(s->block[0]); | |
348 }else if(s->decoding_error && !s->mb_intra){ | |
349 clear_blocks(s->block[0]); | |
350 } | |
351 //FIXME remove AC for intra | |
352 | |
12
4d50c7d89e0f
use block[] in structure to have it aligned on 8 bytes for mmx optimizations
glantau
parents:
0
diff
changeset
|
353 MPV_decode_mb(s, s->block); |
454 | 354 |
355 s->mb_num_left--; | |
0 | 356 } |
341 | 357 if ( avctx->draw_horiz_band |
358 && (s->num_available_buffers>=1 || (!s->has_b_frames)) ) { | |
67 | 359 UINT8 *src_ptr[3]; |
360 int y, h, offset; | |
361 y = s->mb_y * 16; | |
362 h = s->height - y; | |
363 if (h > 16) | |
364 h = 16; | |
365 offset = y * s->linesize; | |
308 | 366 if(s->pict_type==B_TYPE || (!s->has_b_frames)){ |
367 src_ptr[0] = s->current_picture[0] + offset; | |
368 src_ptr[1] = s->current_picture[1] + (offset >> 2); | |
369 src_ptr[2] = s->current_picture[2] + (offset >> 2); | |
370 } else { | |
371 src_ptr[0] = s->last_picture[0] + offset; | |
372 src_ptr[1] = s->last_picture[1] + (offset >> 2); | |
373 src_ptr[2] = s->last_picture[2] + (offset >> 2); | |
374 } | |
67 | 375 avctx->draw_horiz_band(avctx, src_ptr, s->linesize, |
376 y, s->width, h); | |
377 } | |
0 | 378 } |
208 | 379 |
311 | 380 if (s->h263_msmpeg4 && s->msmpeg4_version<4 && s->pict_type==I_TYPE) |
208 | 381 if(msmpeg4_decode_ext_header(s, buf_size) < 0) return -1; |
333 | 382 |
383 /* divx 5.01+ bistream reorder stuff */ | |
655 | 384 if(s->codec_id==CODEC_ID_MPEG4 && s->bitstream_buffer_size==0 && s->divx_version>=500){ |
454 | 385 int current_pos= get_bits_count(&s->gb)>>3; |
386 | |
333 | 387 if( buf_size - current_pos > 5 |
388 && buf_size - current_pos < BITSTREAM_BUFFER_SIZE){ | |
454 | 389 int i; |
390 int startcode_found=0; | |
655 | 391 for(i=current_pos; i<buf_size-3; i++){ |
454 | 392 if(buf[i]==0 && buf[i+1]==0 && buf[i+2]==1 && buf[i+3]==0xB6){ |
393 startcode_found=1; | |
394 break; | |
395 } | |
396 } | |
397 if(startcode_found){ | |
398 memcpy(s->bitstream_buffer, buf + current_pos, buf_size - current_pos); | |
399 s->bitstream_buffer_size= buf_size - current_pos; | |
400 } | |
401 } | |
402 } | |
403 | |
404 if(s->bitstream_buffer_size==0 && s->error_resilience>0){ | |
405 int left= s->gb.size*8 - get_bits_count(&s->gb); | |
406 int max_extra=8; | |
407 | |
408 if(s->codec_id==CODEC_ID_MPEG4) max_extra+=32; | |
409 | |
410 if(left>max_extra){ | |
411 fprintf(stderr, "discarding %d junk bits at end, next would be %X\n", left, show_bits(&s->gb, 24)); | |
412 if(s->decoding_error==0) | |
413 ff_conceal_past_errors(s, 1); | |
414 } | |
415 if(left<0){ | |
416 fprintf(stderr, "overreading %d bits\n", -left); | |
417 if(s->decoding_error==0) | |
418 ff_conceal_past_errors(s, 1); | |
333 | 419 } |
353 | 420 } |
333 | 421 |
0 | 422 MPV_frame_end(s); |
361 | 423 #if 0 //dirty show MVs, we should export the MV tables and write a filter to show them |
424 { | |
425 int mb_y; | |
426 s->has_b_frames=1; | |
427 for(mb_y=0; mb_y<s->mb_height; mb_y++){ | |
428 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
|
429 int y= mb_y*16 + 8; |
361 | 430 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
|
431 int x= mb_x*16 + 8; |
361 | 432 uint8_t *ptr= s->last_picture[0]; |
433 int xy= 1 + mb_x*2 + (mb_y*2 + 1)*(s->mb_width*2 + 2); | |
434 int mx= (s->motion_val[xy][0]>>1) + x; | |
435 int my= (s->motion_val[xy][1]>>1) + y; | |
436 int i; | |
437 int max; | |
438 | |
439 if(mx<0) mx=0; | |
440 if(my<0) my=0; | |
441 if(mx>=s->width) mx= s->width -1; | |
442 if(my>=s->height) my= s->height-1; | |
443 max= ABS(mx-x); | |
444 if(ABS(my-y) > max) max= ABS(my-y); | |
445 /* the ugliest linedrawing routine ... */ | |
446 for(i=0; i<max; i++){ | |
447 int x1= x + (mx-x)*i/max; | |
448 int y1= y + (my-y)*i/max; | |
449 ptr[y1*s->linesize + x1]+=100; | |
450 } | |
411
5c8b3a717929
workaround dc_scale bug in old ffmpeg msmpeg4v3 encoder (set workaround_bugs=1 for this)
michaelni
parents:
396
diff
changeset
|
451 ptr[y*s->linesize + x]+=100; |
361 | 452 s->mbskip_table[mb_x + mb_y*s->mb_width]=0; |
453 } | |
454 } | |
455 | |
456 } | |
457 #endif | |
273
34f40a0fc840
msmpeg4 bugfix (wrong frame displayed if some frames are skipped)
michaelni
parents:
266
diff
changeset
|
458 if(s->pict_type==B_TYPE || (!s->has_b_frames)){ |
262 | 459 pict->data[0] = s->current_picture[0]; |
460 pict->data[1] = s->current_picture[1]; | |
461 pict->data[2] = s->current_picture[2]; | |
462 } else { | |
463 pict->data[0] = s->last_picture[0]; | |
464 pict->data[1] = s->last_picture[1]; | |
465 pict->data[2] = s->last_picture[2]; | |
466 } | |
0 | 467 pict->linesize[0] = s->linesize; |
556 | 468 pict->linesize[1] = s->uvlinesize; |
469 pict->linesize[2] = s->uvlinesize; | |
0 | 470 |
471 avctx->quality = s->qscale; | |
231 | 472 |
473 /* Return the Picture timestamp as the frame number */ | |
474 /* we substract 1 because it is added on utils.c */ | |
475 avctx->frame_number = s->picture_number - 1; | |
476 | |
341 | 477 /* dont output the last pic after seeking |
478 note we allready added +1 for the current pix in MPV_frame_end(s) */ | |
479 if(s->num_available_buffers>=2 || (!s->has_b_frames)) | |
480 *data_size = sizeof(AVPicture); | |
384 | 481 #ifdef PRINT_FRAME_TIME |
482 printf("%Ld\n", rdtsc()-time); | |
483 #endif | |
655 | 484 return get_consumed_bytes(s, buf_size); |
0 | 485 } |
486 | |
67 | 487 AVCodec mpeg4_decoder = { |
488 "mpeg4", | |
0 | 489 CODEC_TYPE_VIDEO, |
67 | 490 CODEC_ID_MPEG4, |
0 | 491 sizeof(MpegEncContext), |
492 h263_decode_init, | |
493 NULL, | |
494 h263_decode_end, | |
495 h263_decode_frame, | |
553 | 496 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
0 | 497 }; |
498 | |
499 AVCodec h263_decoder = { | |
500 "h263", | |
501 CODEC_TYPE_VIDEO, | |
502 CODEC_ID_H263, | |
503 sizeof(MpegEncContext), | |
504 h263_decode_init, | |
505 NULL, | |
506 h263_decode_end, | |
507 h263_decode_frame, | |
553 | 508 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
0 | 509 }; |
510 | |
307 | 511 AVCodec msmpeg4v1_decoder = { |
512 "msmpeg4v1", | |
513 CODEC_TYPE_VIDEO, | |
514 CODEC_ID_MSMPEG4V1, | |
515 sizeof(MpegEncContext), | |
516 h263_decode_init, | |
517 NULL, | |
518 h263_decode_end, | |
519 h263_decode_frame, | |
553 | 520 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
307 | 521 }; |
522 | |
523 AVCodec msmpeg4v2_decoder = { | |
524 "msmpeg4v2", | |
525 CODEC_TYPE_VIDEO, | |
526 CODEC_ID_MSMPEG4V2, | |
527 sizeof(MpegEncContext), | |
528 h263_decode_init, | |
529 NULL, | |
530 h263_decode_end, | |
531 h263_decode_frame, | |
553 | 532 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
307 | 533 }; |
534 | |
535 AVCodec msmpeg4v3_decoder = { | |
0 | 536 "msmpeg4", |
537 CODEC_TYPE_VIDEO, | |
307 | 538 CODEC_ID_MSMPEG4V3, |
0 | 539 sizeof(MpegEncContext), |
540 h263_decode_init, | |
541 NULL, | |
542 h263_decode_end, | |
543 h263_decode_frame, | |
553 | 544 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
0 | 545 }; |
546 | |
311 | 547 AVCodec wmv1_decoder = { |
548 "wmv1", | |
549 CODEC_TYPE_VIDEO, | |
550 CODEC_ID_WMV1, | |
551 sizeof(MpegEncContext), | |
552 h263_decode_init, | |
553 NULL, | |
554 h263_decode_end, | |
555 h263_decode_frame, | |
553 | 556 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
311 | 557 }; |
558 | |
498 | 559 AVCodec wmv2_decoder = { |
560 "wmv2", | |
561 CODEC_TYPE_VIDEO, | |
562 CODEC_ID_WMV2, | |
563 sizeof(MpegEncContext), | |
564 h263_decode_init, | |
565 NULL, | |
566 h263_decode_end, | |
567 h263_decode_frame, | |
553 | 568 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
498 | 569 }; |
570 | |
0 | 571 AVCodec h263i_decoder = { |
572 "h263i", | |
573 CODEC_TYPE_VIDEO, | |
574 CODEC_ID_H263I, | |
575 sizeof(MpegEncContext), | |
576 h263_decode_init, | |
577 NULL, | |
578 h263_decode_end, | |
579 h263_decode_frame, | |
553 | 580 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, |
0 | 581 }; |
582 |