Mercurial > libavcodec.hg
comparison rv10.c @ 10008:5eb52cc093e2 libavcodec
Remove commented-out cruft.
author | diego |
---|---|
date | Sun, 02 Aug 2009 15:10:03 +0000 |
parents | 7b2e5c91104e |
children | fef7b43f0d22 |
comparison
equal
deleted
inserted
replaced
10007:fa6d4d315f4c | 10008:5eb52cc093e2 |
---|---|
271 | 271 |
272 put_bits(&s->pb, 1, s->no_rounding); | 272 put_bits(&s->pb, 1, s->no_rounding); |
273 | 273 |
274 assert(s->f_code == 1); | 274 assert(s->f_code == 1); |
275 assert(s->unrestricted_mv == 1); | 275 assert(s->unrestricted_mv == 1); |
276 // assert(s->h263_aic== (s->pict_type == FF_I_TYPE)); | |
277 assert(s->alt_inter_vlc == 0); | 276 assert(s->alt_inter_vlc == 0); |
278 assert(s->umvplus == 0); | 277 assert(s->umvplus == 0); |
279 assert(s->modified_quant==1); | 278 assert(s->modified_quant==1); |
280 assert(s->loop_filter==1); | 279 assert(s->loop_filter==1); |
281 | 280 |
294 /* read RV 1.0 compatible frame header */ | 293 /* read RV 1.0 compatible frame header */ |
295 static int rv10_decode_picture_header(MpegEncContext *s) | 294 static int rv10_decode_picture_header(MpegEncContext *s) |
296 { | 295 { |
297 int mb_count, pb_frame, marker, unk, mb_xy; | 296 int mb_count, pb_frame, marker, unk, mb_xy; |
298 | 297 |
299 //printf("ff:%d\n", full_frame); | |
300 marker = get_bits1(&s->gb); | 298 marker = get_bits1(&s->gb); |
301 | 299 |
302 if (get_bits1(&s->gb)) | 300 if (get_bits1(&s->gb)) |
303 s->pict_type = FF_P_TYPE; | 301 s->pict_type = FF_P_TYPE; |
304 else | 302 else |
305 s->pict_type = FF_I_TYPE; | 303 s->pict_type = FF_I_TYPE; |
306 //printf("h:%X ver:%d\n",h,s->rv10_version); | |
307 if(!marker) av_log(s->avctx, AV_LOG_ERROR, "marker missing\n"); | 304 if(!marker) av_log(s->avctx, AV_LOG_ERROR, "marker missing\n"); |
308 pb_frame = get_bits1(&s->gb); | 305 pb_frame = get_bits1(&s->gb); |
309 | 306 |
310 dprintf(s->avctx, "pict_type=%d pb_frame=%d\n", s->pict_type, pb_frame); | 307 dprintf(s->avctx, "pict_type=%d pb_frame=%d\n", s->pict_type, pb_frame); |
311 | 308 |
342 s->mb_x = 0; | 339 s->mb_x = 0; |
343 s->mb_y = 0; | 340 s->mb_y = 0; |
344 mb_count = s->mb_width * s->mb_height; | 341 mb_count = s->mb_width * s->mb_height; |
345 } | 342 } |
346 unk= get_bits(&s->gb, 3); /* ignored */ | 343 unk= get_bits(&s->gb, 3); /* ignored */ |
347 //printf("%d\n", unk); | |
348 s->f_code = 1; | 344 s->f_code = 1; |
349 s->unrestricted_mv = 1; | 345 s->unrestricted_mv = 1; |
350 | 346 |
351 return mb_count; | 347 return mb_count; |
352 } | 348 } |
416 int f, new_w, new_h; | 412 int f, new_w, new_h; |
417 int v= s->avctx->extradata_size >= 4 ? 7&((uint8_t*)s->avctx->extradata)[1] : 0; | 413 int v= s->avctx->extradata_size >= 4 ? 7&((uint8_t*)s->avctx->extradata)[1] : 0; |
418 | 414 |
419 if (get_bits1(&s->gb)){ | 415 if (get_bits1(&s->gb)){ |
420 av_log(s->avctx, AV_LOG_ERROR, "unknown bit3 set\n"); | 416 av_log(s->avctx, AV_LOG_ERROR, "unknown bit3 set\n"); |
421 // return -1; | |
422 } | 417 } |
423 seq= get_bits(&s->gb, 13)<<2; | 418 seq= get_bits(&s->gb, 13)<<2; |
424 | 419 |
425 f= get_bits(&s->gb, av_log2(v)+1); | 420 f= get_bits(&s->gb, av_log2(v)+1); |
426 | 421 |
609 left = s->mb_width * s->mb_height - mb_pos; | 604 left = s->mb_width * s->mb_height - mb_pos; |
610 if (mb_count > left) { | 605 if (mb_count > left) { |
611 av_log(s->avctx, AV_LOG_ERROR, "COUNT ERROR\n"); | 606 av_log(s->avctx, AV_LOG_ERROR, "COUNT ERROR\n"); |
612 return -1; | 607 return -1; |
613 } | 608 } |
614 //if(s->pict_type == FF_P_TYPE) return 0; | |
615 | 609 |
616 if ((s->mb_x == 0 && s->mb_y == 0) || s->current_picture_ptr==NULL) { | 610 if ((s->mb_x == 0 && s->mb_y == 0) || s->current_picture_ptr==NULL) { |
617 if(s->current_picture_ptr){ //FIXME write parser so we always have complete frames? | 611 if(s->current_picture_ptr){ //FIXME write parser so we always have complete frames? |
618 ff_er_frame_end(s); | 612 ff_er_frame_end(s); |
619 MPV_frame_end(s); | 613 MPV_frame_end(s); |
649 ff_set_qscale(s, s->qscale); | 643 ff_set_qscale(s, s->qscale); |
650 | 644 |
651 s->rv10_first_dc_coded[0] = 0; | 645 s->rv10_first_dc_coded[0] = 0; |
652 s->rv10_first_dc_coded[1] = 0; | 646 s->rv10_first_dc_coded[1] = 0; |
653 s->rv10_first_dc_coded[2] = 0; | 647 s->rv10_first_dc_coded[2] = 0; |
654 //printf("%d %X %X\n", s->pict_type, s->current_picture.motion_val[0], s->current_picture.motion_val[1]); | |
655 s->block_wrap[0]= | 648 s->block_wrap[0]= |
656 s->block_wrap[1]= | 649 s->block_wrap[1]= |
657 s->block_wrap[2]= | 650 s->block_wrap[2]= |
658 s->block_wrap[3]= s->b8_stride; | 651 s->block_wrap[3]= s->b8_stride; |
659 s->block_wrap[4]= | 652 s->block_wrap[4]= |