Commit b615dd20 authored by ramiro's avatar ramiro

mlpdec: whitespace cosmetics.

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18234 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 42d0efb7
...@@ -661,10 +661,8 @@ static void filter_channel(MLPDecodeContext *m, unsigned int substr, ...@@ -661,10 +661,8 @@ static void filter_channel(MLPDecodeContext *m, unsigned int substr,
int index = MAX_BLOCKSIZE; int index = MAX_BLOCKSIZE;
int i; int i;
memcpy(&firbuf[index], fir->state, memcpy(&firbuf[index], fir->state, MAX_FIR_ORDER * sizeof(int32_t));
MAX_FIR_ORDER * sizeof(int32_t)); memcpy(&iirbuf[index], iir->state, MAX_IIR_ORDER * sizeof(int32_t));
memcpy(&iirbuf[index], iir->state,
MAX_IIR_ORDER * sizeof(int32_t));
for (i = 0; i < s->blocksize; i++) { for (i = 0; i < s->blocksize; i++) {
int32_t residual = m->sample_buffer[i + s->blockpos][channel]; int32_t residual = m->sample_buffer[i + s->blockpos][channel];
...@@ -675,11 +673,9 @@ static void filter_channel(MLPDecodeContext *m, unsigned int substr, ...@@ -675,11 +673,9 @@ static void filter_channel(MLPDecodeContext *m, unsigned int substr,
/* TODO: Move this code to DSPContext? */ /* TODO: Move this code to DSPContext? */
for (order = 0; order < fir->order; order++) for (order = 0; order < fir->order; order++)
accum += (int64_t)firbuf[index + order] * accum += (int64_t) firbuf[index + order] * fir->coeff[order];
fir->coeff[order];
for (order = 0; order < iir->order; order++) for (order = 0; order < iir->order; order++)
accum += (int64_t)iirbuf[index + order] * accum += (int64_t) iirbuf[index + order] * iir->coeff[order];
iir->coeff[order];
accum = accum >> filter_shift; accum = accum >> filter_shift;
result = (accum + residual) & mask; result = (accum + residual) & mask;
...@@ -692,10 +688,8 @@ static void filter_channel(MLPDecodeContext *m, unsigned int substr, ...@@ -692,10 +688,8 @@ static void filter_channel(MLPDecodeContext *m, unsigned int substr,
m->sample_buffer[i + s->blockpos][channel] = result; m->sample_buffer[i + s->blockpos][channel] = result;
} }
memcpy(fir->state, &firbuf[index], memcpy(fir->state, &firbuf[index], MAX_FIR_ORDER * sizeof(int32_t));
MAX_FIR_ORDER * sizeof(int32_t)); memcpy(iir->state, &iirbuf[index], MAX_IIR_ORDER * sizeof(int32_t));
memcpy(iir->state, &iirbuf[index],
MAX_IIR_ORDER * sizeof(int32_t));
} }
/** Read a block of PCM residual data (or actual if no filtering active). */ /** Read a block of PCM residual data (or actual if no filtering active). */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment