Mercurial > libavcodec.hg
comparison flacdec.c @ 8649:470a3af1bf4f libavcodec
flacdec: remove some unused code
author | jbr |
---|---|
date | Sat, 24 Jan 2009 15:46:19 +0000 |
parents | 178d5dfccad4 |
children | 035c970a12ac |
comparison
equal
deleted
inserted
replaced
8648:1612935d2e4d | 8649:470a3af1bf4f |
---|---|
424 { | 424 { |
425 av_log(s->avctx, AV_LOG_ERROR, "invalid subframe padding\n"); | 425 av_log(s->avctx, AV_LOG_ERROR, "invalid subframe padding\n"); |
426 return -1; | 426 return -1; |
427 } | 427 } |
428 type = get_bits(&s->gb, 6); | 428 type = get_bits(&s->gb, 6); |
429 // wasted = get_bits1(&s->gb); | 429 |
430 | |
431 // if (wasted) | |
432 // { | |
433 // while (!get_bits1(&s->gb)) | |
434 // wasted++; | |
435 // if (wasted) | |
436 // wasted++; | |
437 // s->curr_bps -= wasted; | |
438 // } | |
439 #if 0 | |
440 wasted= 16 - av_log2(show_bits(&s->gb, 17)); | |
441 skip_bits(&s->gb, wasted+1); | |
442 s->curr_bps -= wasted; | |
443 #else | |
444 if (get_bits1(&s->gb)) | 430 if (get_bits1(&s->gb)) |
445 { | 431 { |
446 wasted = 1; | 432 wasted = 1; |
447 while (!get_bits1(&s->gb)) | 433 while (!get_bits1(&s->gb)) |
448 wasted++; | 434 wasted++; |
449 s->curr_bps -= wasted; | 435 s->curr_bps -= wasted; |
450 av_log(s->avctx, AV_LOG_DEBUG, "%d wasted bits\n", wasted); | 436 av_log(s->avctx, AV_LOG_DEBUG, "%d wasted bits\n", wasted); |
451 } | 437 } |
452 #endif | 438 |
453 //FIXME use av_log2 for types | 439 //FIXME use av_log2 for types |
454 if (type == 0) | 440 if (type == 0) |
455 { | 441 { |
456 av_log(s->avctx, AV_LOG_DEBUG, "coding type: constant\n"); | 442 av_log(s->avctx, AV_LOG_DEBUG, "coding type: constant\n"); |
457 tmp = get_sbits(&s->gb, s->curr_bps); | 443 tmp = get_sbits(&s->gb, s->curr_bps); |
531 | 517 |
532 if(get_utf8(&s->gb) < 0){ | 518 if(get_utf8(&s->gb) < 0){ |
533 av_log(s->avctx, AV_LOG_ERROR, "utf8 fscked\n"); | 519 av_log(s->avctx, AV_LOG_ERROR, "utf8 fscked\n"); |
534 return -1; | 520 return -1; |
535 } | 521 } |
536 #if 0 | |
537 if (/*((blocksize_code == 6) || (blocksize_code == 7)) &&*/ | |
538 (s->min_blocksize != s->max_blocksize)){ | |
539 }else{ | |
540 } | |
541 #endif | |
542 | 522 |
543 if (blocksize_code == 0) | 523 if (blocksize_code == 0) |
544 blocksize = s->min_blocksize; | 524 blocksize = s->min_blocksize; |
545 else if (blocksize_code == 6) | 525 else if (blocksize_code == 6) |
546 blocksize = get_bits(&s->gb, 8)+1; | 526 blocksize = get_bits(&s->gb, 8)+1; |
664 s->bitstream_size=0; | 644 s->bitstream_size=0; |
665 s->bitstream_index=0; | 645 s->bitstream_index=0; |
666 return -1; | 646 return -1; |
667 } | 647 } |
668 | 648 |
669 | |
670 #if 0 | |
671 /* fix the channel order here */ | |
672 if (s->order == MID_SIDE) | |
673 { | |
674 short *left = samples; | |
675 short *right = samples + s->blocksize; | |
676 for (i = 0; i < s->blocksize; i += 2) | |
677 { | |
678 uint32_t x = s->decoded[0][i]; | |
679 uint32_t y = s->decoded[0][i+1]; | |
680 | |
681 right[i] = x - (y / 2); | |
682 left[i] = right[i] + y; | |
683 } | |
684 *data_size = 2 * s->blocksize; | |
685 } | |
686 else | |
687 { | |
688 for (i = 0; i < s->channels; i++) | |
689 { | |
690 switch(s->order) | |
691 { | |
692 case INDEPENDENT: | |
693 for (j = 0; j < s->blocksize; j++) | |
694 samples[(s->blocksize*i)+j] = s->decoded[i][j]; | |
695 break; | |
696 case LEFT_SIDE: | |
697 case RIGHT_SIDE: | |
698 if (i == 0) | |
699 for (j = 0; j < s->blocksize; j++) | |
700 samples[(s->blocksize*i)+j] = s->decoded[0][j]; | |
701 else | |
702 for (j = 0; j < s->blocksize; j++) | |
703 samples[(s->blocksize*i)+j] = s->decoded[0][j] - s->decoded[i][j]; | |
704 break; | |
705 // case MID_SIDE: | |
706 // av_log(s->avctx, AV_LOG_DEBUG, "mid-side unsupported\n"); | |
707 } | |
708 *data_size += s->blocksize; | |
709 } | |
710 } | |
711 #else | |
712 #define DECORRELATE(left, right)\ | 649 #define DECORRELATE(left, right)\ |
713 assert(s->channels == 2);\ | 650 assert(s->channels == 2);\ |
714 for (i = 0; i < s->blocksize; i++)\ | 651 for (i = 0; i < s->blocksize; i++)\ |
715 {\ | 652 {\ |
716 int a= s->decoded[0][i];\ | 653 int a= s->decoded[0][i];\ |
734 case RIGHT_SIDE: | 671 case RIGHT_SIDE: |
735 DECORRELATE(a+b,b) | 672 DECORRELATE(a+b,b) |
736 case MID_SIDE: | 673 case MID_SIDE: |
737 DECORRELATE( (a-=b>>1) + b, a) | 674 DECORRELATE( (a-=b>>1) + b, a) |
738 } | 675 } |
739 #endif | |
740 | 676 |
741 *data_size = (int8_t *)samples - (int8_t *)data; | 677 *data_size = (int8_t *)samples - (int8_t *)data; |
742 // av_log(s->avctx, AV_LOG_DEBUG, "data size: %d\n", *data_size); | 678 // av_log(s->avctx, AV_LOG_DEBUG, "data size: %d\n", *data_size); |
743 | 679 |
744 // s->last_blocksize = s->blocksize; | |
745 end: | 680 end: |
746 i= (get_bits_count(&s->gb)+7)/8; | 681 i= (get_bits_count(&s->gb)+7)/8; |
747 if(i > buf_size){ | 682 if(i > buf_size){ |
748 av_log(s->avctx, AV_LOG_ERROR, "overread: %d\n", i - buf_size); | 683 av_log(s->avctx, AV_LOG_ERROR, "overread: %d\n", i - buf_size); |
749 s->bitstream_size=0; | 684 s->bitstream_size=0; |