Mercurial > libavcodec.hg
comparison rv10.c @ 2630:026c1600b532 libavcodec
fixing broken_rv20_1mb_.rm
| author | michael |
|---|---|
| date | Sun, 24 Apr 2005 22:08:31 +0000 |
| parents | 511e3afc43e1 |
| children | c49619ee4c35 |
comparison
equal
deleted
inserted
replaced
| 2629:202cd69d8d2e | 2630:026c1600b532 |
|---|---|
| 438 av_log(s->avctx, AV_LOG_ERROR, "unknown bit3 set\n"); | 438 av_log(s->avctx, AV_LOG_ERROR, "unknown bit3 set\n"); |
| 439 // return -1; | 439 // return -1; |
| 440 } | 440 } |
| 441 seq= get_bits(&s->gb, 14)<<1; | 441 seq= get_bits(&s->gb, 14)<<1; |
| 442 | 442 |
| 443 if(v>1 || (s->avctx->sub_id < 0x20201002 && v>0)){ | 443 if(v) |
| 444 f= get_bits(&s->gb, av_log2(v-1)+1); | 444 f= get_bits(&s->gb, av_log2(v)); |
| 445 } | 445 |
| 446 | |
| 447 if(s->avctx->debug & FF_DEBUG_PICT_INFO){ | 446 if(s->avctx->debug & FF_DEBUG_PICT_INFO){ |
| 448 av_log(s->avctx, AV_LOG_DEBUG, "F %d/%d\n", f, v); | 447 av_log(s->avctx, AV_LOG_DEBUG, "F %d/%d\n", f, v); |
| 449 } | 448 } |
| 450 | 449 }else{ |
| 450 seq= get_bits(&s->gb, 8)*128; | |
| 451 } | |
| 452 | |
| 453 // if(s->avctx->sub_id <= 0x20201002){ //0x20201002 definitely needs this | |
| 454 mb_pos= ff_h263_decode_mba(s); | |
| 455 /* }else{ | |
| 451 mb_pos= get_bits(&s->gb, av_log2(s->mb_num-1)+1); | 456 mb_pos= get_bits(&s->gb, av_log2(s->mb_num-1)+1); |
| 452 s->mb_x= mb_pos % s->mb_width; | 457 s->mb_x= mb_pos % s->mb_width; |
| 453 s->mb_y= mb_pos / s->mb_width; | 458 s->mb_y= mb_pos / s->mb_width; |
| 454 }else{ | 459 }*/ |
| 455 seq= get_bits(&s->gb, 8)*128; | |
| 456 mb_pos= ff_h263_decode_mba(s); | |
| 457 } | |
| 458 //av_log(s->avctx, AV_LOG_DEBUG, "%d\n", seq); | 460 //av_log(s->avctx, AV_LOG_DEBUG, "%d\n", seq); |
| 459 seq |= s->time &~0x7FFF; | 461 seq |= s->time &~0x7FFF; |
| 460 if(seq - s->time > 0x4000) seq -= 0x8000; | 462 if(seq - s->time > 0x4000) seq -= 0x8000; |
| 461 if(seq - s->time < -0x4000) seq += 0x8000; | 463 if(seq - s->time < -0x4000) seq += 0x8000; |
| 462 if(seq != s->time){ | 464 if(seq != s->time){ |