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