Mercurial > libavcodec.hg
comparison mlpdec.c @ 9282:2f82384bbe05 libavcodec
mlpdec: whitespace cosmetics.
| author | ramiro |
|---|---|
| date | Mon, 30 Mar 2009 03:12:39 +0000 |
| parents | 19a7de05b1ae |
| children | a37db17a8283 |
comparison
equal
deleted
inserted
replaced
| 9281:19a7de05b1ae | 9282:2f82384bbe05 |
|---|---|
| 659 unsigned int filter_shift = fir->shift; | 659 unsigned int filter_shift = fir->shift; |
| 660 int32_t mask = MSB_MASK(s->quant_step_size[channel]); | 660 int32_t mask = MSB_MASK(s->quant_step_size[channel]); |
| 661 int index = MAX_BLOCKSIZE; | 661 int index = MAX_BLOCKSIZE; |
| 662 int i; | 662 int i; |
| 663 | 663 |
| 664 memcpy(&firbuf[index], fir->state, | 664 memcpy(&firbuf[index], fir->state, MAX_FIR_ORDER * sizeof(int32_t)); |
| 665 MAX_FIR_ORDER * sizeof(int32_t)); | 665 memcpy(&iirbuf[index], iir->state, MAX_IIR_ORDER * sizeof(int32_t)); |
| 666 memcpy(&iirbuf[index], iir->state, | |
| 667 MAX_IIR_ORDER * sizeof(int32_t)); | |
| 668 | 666 |
| 669 for (i = 0; i < s->blocksize; i++) { | 667 for (i = 0; i < s->blocksize; i++) { |
| 670 int32_t residual = m->sample_buffer[i + s->blockpos][channel]; | 668 int32_t residual = m->sample_buffer[i + s->blockpos][channel]; |
| 671 unsigned int order; | 669 unsigned int order; |
| 672 int64_t accum = 0; | 670 int64_t accum = 0; |
| 673 int32_t result; | 671 int32_t result; |
| 674 | 672 |
| 675 /* TODO: Move this code to DSPContext? */ | 673 /* TODO: Move this code to DSPContext? */ |
| 676 | 674 |
| 677 for (order = 0; order < fir->order; order++) | 675 for (order = 0; order < fir->order; order++) |
| 678 accum += (int64_t)firbuf[index + order] * | 676 accum += (int64_t) firbuf[index + order] * fir->coeff[order]; |
| 679 fir->coeff[order]; | |
| 680 for (order = 0; order < iir->order; order++) | 677 for (order = 0; order < iir->order; order++) |
| 681 accum += (int64_t)iirbuf[index + order] * | 678 accum += (int64_t) iirbuf[index + order] * iir->coeff[order]; |
| 682 iir->coeff[order]; | |
| 683 | 679 |
| 684 accum = accum >> filter_shift; | 680 accum = accum >> filter_shift; |
| 685 result = (accum + residual) & mask; | 681 result = (accum + residual) & mask; |
| 686 | 682 |
| 687 --index; | 683 --index; |
| 690 iirbuf[index] = result - accum; | 686 iirbuf[index] = result - accum; |
| 691 | 687 |
| 692 m->sample_buffer[i + s->blockpos][channel] = result; | 688 m->sample_buffer[i + s->blockpos][channel] = result; |
| 693 } | 689 } |
| 694 | 690 |
| 695 memcpy(fir->state, &firbuf[index], | 691 memcpy(fir->state, &firbuf[index], MAX_FIR_ORDER * sizeof(int32_t)); |
| 696 MAX_FIR_ORDER * sizeof(int32_t)); | 692 memcpy(iir->state, &iirbuf[index], MAX_IIR_ORDER * sizeof(int32_t)); |
| 697 memcpy(iir->state, &iirbuf[index], | |
| 698 MAX_IIR_ORDER * sizeof(int32_t)); | |
| 699 } | 693 } |
| 700 | 694 |
| 701 /** Read a block of PCM residual data (or actual if no filtering active). */ | 695 /** Read a block of PCM residual data (or actual if no filtering active). */ |
| 702 | 696 |
| 703 static int read_block_data(MLPDecodeContext *m, GetBitContext *gbp, | 697 static int read_block_data(MLPDecodeContext *m, GetBitContext *gbp, |