comparison mlpdec.c @ 9280:e3eff8a463ec libavcodec

mlpdec: Split filter_state_buffer into [fi]irbuf and fp to [fi]ir.

9279:b65ab36734f8

static void filter_channel(MLPDecodeContext *m, unsigned int substr,
                           unsigned int channel)
{
    SubStream *s = &m->substream[substr];
    int32_t filter_state_buffer[NUM_FILTERS][MAX_BLOCKSIZE + MAX_FIR_ORDER];
    FilterParams *fp[NUM_FILTERS] = { &m->channel_params[channel].filter_params[FIR],
                                      &m->channel_params[channel].filter_params[IIR], };
    unsigned int filter_shift = fp[FIR]->shift;
    int32_t mask = MSB_MASK(s->quant_step_size[channel]);
    int index = MAX_BLOCKSIZE;
    int i;

    memcpy(&filter_state_buffer[FIR][MAX_BLOCKSIZE], &fp[FIR]->state[0],
            MAX_FIR_ORDER * sizeof(int32_t));
    memcpy(&filter_state_buffer[IIR][MAX_BLOCKSIZE], &fp[IIR]->state[0],
            MAX_IIR_ORDER * sizeof(int32_t));

    for (i = 0; i < s->blocksize; i++) {
        int32_t residual = m->sample_buffer[i + s->blockpos][channel];
        unsigned int order;
        int64_t accum = 0;
        int32_t result;

        /* TODO: Move this code to DSPContext? */

        for (order = 0; order < fp[FIR]->order; order++)
            accum += (int64_t)filter_state_buffer[FIR][index + order] *
                                fp[FIR]->coeff[order];
        for (order = 0; order < fp[IIR]->order; order++)
            accum += (int64_t)filter_state_buffer[IIR][index + order] *
                                fp[IIR]->coeff[order];

        accum  = accum >> filter_shift;
        result = (accum + residual) & mask;

        --index;

        filter_state_buffer[FIR][index] = result;
        filter_state_buffer[IIR][index] = result - accum;

        m->sample_buffer[i + s->blockpos][channel] = result;
    }

    memcpy(&fp[FIR]->state[0], &filter_state_buffer[FIR][index],
            MAX_FIR_ORDER * sizeof(int32_t));
    memcpy(&fp[IIR]->state[0], &filter_state_buffer[IIR][index],
            MAX_IIR_ORDER * sizeof(int32_t));
}

/** Read a block of PCM residual data (or actual if no filtering active). */

9280:e3eff8a463ec

static void filter_channel(MLPDecodeContext *m, unsigned int substr,
                           unsigned int channel)
{
    SubStream *s = &m->substream[substr];
    int32_t firbuf[MAX_BLOCKSIZE + MAX_FIR_ORDER];
    int32_t iirbuf[MAX_BLOCKSIZE + MAX_IIR_ORDER];
    FilterParams *fir = &m->channel_params[channel].filter_params[FIR];
    FilterParams *iir = &m->channel_params[channel].filter_params[IIR];
    unsigned int filter_shift = fir->shift;
    int32_t mask = MSB_MASK(s->quant_step_size[channel]);
    int index = MAX_BLOCKSIZE;
    int i;

    memcpy(&firbuf[MAX_BLOCKSIZE], &fir->state[0],
            MAX_FIR_ORDER * sizeof(int32_t));
    memcpy(&iirbuf[MAX_BLOCKSIZE], &iir->state[0],
            MAX_IIR_ORDER * sizeof(int32_t));

    for (i = 0; i < s->blocksize; i++) {
        int32_t residual = m->sample_buffer[i + s->blockpos][channel];
        unsigned int order;
        int64_t accum = 0;
        int32_t result;

        /* TODO: Move this code to DSPContext? */

        for (order = 0; order < fir->order; order++)
            accum += (int64_t)firbuf[index + order] *
                                fir->coeff[order];
        for (order = 0; order < iir->order; order++)
            accum += (int64_t)iirbuf[index + order] *
                                iir->coeff[order];

        accum  = accum >> filter_shift;
        result = (accum + residual) & mask;

        --index;

        firbuf[index] = result;
        iirbuf[index] = result - accum;

        m->sample_buffer[i + s->blockpos][channel] = result;
    }

    memcpy(&fir->state[0], &firbuf[index],
            MAX_FIR_ORDER * sizeof(int32_t));
    memcpy(&iir->state[0], &iirbuf[index],
            MAX_IIR_ORDER * sizeof(int32_t));
}

/** Read a block of PCM residual data (or actual if no filtering active). */