comparison h263dec.c @ 311:ac677a84d5df libavcodec

wmv1 header parser (unfinished)
author michaelni
date Sat, 06 Apr 2002 22:29:37 +0000
parents 072c4ff05e62
children 8aa87f1dfc52
comparison
equal deleted inserted replaced
310:49e73229a5e6 311:ac677a84d5df
59 break; 59 break;
60 case CODEC_ID_MSMPEG4V3: 60 case CODEC_ID_MSMPEG4V3:
61 s->h263_msmpeg4 = 1; 61 s->h263_msmpeg4 = 1;
62 s->h263_pred = 1; 62 s->h263_pred = 1;
63 s->msmpeg4_version=3; 63 s->msmpeg4_version=3;
64 break;
65 case CODEC_ID_WMV1:
66 s->h263_msmpeg4 = 1;
67 s->h263_pred = 1;
68 s->msmpeg4_version=4;
64 break; 69 break;
65 case CODEC_ID_H263I: 70 case CODEC_ID_H263I:
66 s->h263_intel = 1; 71 s->h263_intel = 1;
67 break; 72 break;
68 default: 73 default:
232 avctx->draw_horiz_band(avctx, src_ptr, s->linesize, 237 avctx->draw_horiz_band(avctx, src_ptr, s->linesize,
233 y, s->width, h); 238 y, s->width, h);
234 } 239 }
235 } 240 }
236 241
237 if (s->h263_msmpeg4 && s->pict_type==I_TYPE) 242 if (s->h263_msmpeg4 && s->msmpeg4_version<4 && s->pict_type==I_TYPE)
238 if(msmpeg4_decode_ext_header(s, buf_size) < 0) return -1; 243 if(msmpeg4_decode_ext_header(s, buf_size) < 0) return -1;
239 244
240 MPV_frame_end(s); 245 MPV_frame_end(s);
241 246
242 if(s->pict_type==B_TYPE || (!s->has_b_frames)){ 247 if(s->pict_type==B_TYPE || (!s->has_b_frames)){
320 h263_decode_end, 325 h263_decode_end,
321 h263_decode_frame, 326 h263_decode_frame,
322 CODEC_CAP_DRAW_HORIZ_BAND, 327 CODEC_CAP_DRAW_HORIZ_BAND,
323 }; 328 };
324 329
330 AVCodec wmv1_decoder = {
331 "wmv1",
332 CODEC_TYPE_VIDEO,
333 CODEC_ID_WMV1,
334 sizeof(MpegEncContext),
335 h263_decode_init,
336 NULL,
337 h263_decode_end,
338 h263_decode_frame,
339 CODEC_CAP_DRAW_HORIZ_BAND,
340 };
341
325 AVCodec h263i_decoder = { 342 AVCodec h263i_decoder = {
326 "h263i", 343 "h263i",
327 CODEC_TYPE_VIDEO, 344 CODEC_TYPE_VIDEO,
328 CODEC_ID_H263I, 345 CODEC_ID_H263I,
329 sizeof(MpegEncContext), 346 sizeof(MpegEncContext),