comparison mlpdec.c @ 7552:88ffd7c9c0ed libavcodec

mlpdec: Split filter parameters from context into their own struct.

7551:0a0208d7582f

    //! Running XOR of all output samples.
    int32_t     lossless_check_data;

} SubStream;

typedef struct MLPDecodeContext {
    AVCodecContext *avctx;

    //! Set if a valid major sync block has been read. Otherwise no decoding is possible.
    uint8_t     params_valid;

    //! next power of two above the number of samples in each frame
    int         access_unit_size_pow2;

    SubStream   substream[MAX_SUBSTREAMS];

    //@{
    /** filter data */
#define FIR 0
#define IIR 1
    //! number of taps in filter
    uint8_t     filter_order[MAX_CHANNELS][NUM_FILTERS];
    //! Right shift to apply to output of filter.
    uint8_t     filter_shift[MAX_CHANNELS][NUM_FILTERS];

    int32_t     filter_coeff[MAX_CHANNELS][NUM_FILTERS][MAX_FILTER_ORDER];
    int32_t     filter_state[MAX_CHANNELS][NUM_FILTERS][MAX_FILTER_ORDER];
    //@}

    //@{
    /** sample data coding information */
    //! Offset to apply to residual values.
    int16_t     huff_offset[MAX_CHANNELS];

    memset(s->output_shift   , 0, sizeof(s->output_shift   ));
    memset(s->quant_step_size, 0, sizeof(s->quant_step_size));

    for (ch = s->min_channel; ch <= s->max_channel; ch++) {
        m->filter_order[ch][FIR] = 0;
        m->filter_order[ch][IIR] = 0;
        m->filter_shift[ch][FIR] = 0;
        m->filter_shift[ch][IIR] = 0;

        /* Default audio coding is 24-bit raw PCM. */
        m->huff_offset     [ch] = 0;
        m->sign_huff_offset[ch] = (-1) << 23;
        m->codebook        [ch] = 0;

/** Read parameters for one of the prediction filters. */

static int read_filter_params(MLPDecodeContext *m, GetBitContext *gbp,
                              unsigned int channel, unsigned int filter)
{
    const char fchar = filter ? 'I' : 'F';
    int i, order;

    // Filter is 0 for FIR, 1 for IIR.
    assert(filter < 2);

        av_log(m->avctx, AV_LOG_ERROR,
               "%cIR filter order %d is greater than maximum %d.\n",
               fchar, order, MAX_FILTER_ORDER);
        return -1;
    }
    m->filter_order[channel][filter] = order;

    if (order > 0) {
        int coeff_bits, coeff_shift;

        m->filter_shift[channel][filter] = get_bits(gbp, 4);

        coeff_bits  = get_bits(gbp, 5);
        coeff_shift = get_bits(gbp, 3);
        if (coeff_bits < 1 || coeff_bits > 16) {
            av_log(m->avctx, AV_LOG_ERROR,

                   fchar);
            return -1;
        }

        for (i = 0; i < order; i++)
            m->filter_coeff[channel][filter][i] =
                    get_sbits(gbp, coeff_bits) << coeff_shift;

        if (get_bits1(gbp)) {
            int state_bits, state_shift;

            state_shift = get_bits(gbp, 4);

            /* TODO: Check validity of state data. */

            for (i = 0; i < order; i++)
                m->filter_state[channel][filter][i] =
                    get_sbits(gbp, state_bits) << state_shift;
        }
    }

    return 0;

                m->sign_huff_offset[ch] = calculate_sign_huff(m, substr, ch);
            }

    for (ch = s->min_channel; ch <= s->max_channel; ch++)
        if (get_bits1(gbp)) {
            if (s->param_presence_flags & PARAM_FIR)
                if (get_bits1(gbp))
                    if (read_filter_params(m, gbp, ch, FIR) < 0)
                        return -1;

            if (s->param_presence_flags & PARAM_IIR)
                if (get_bits1(gbp))
                    if (read_filter_params(m, gbp, ch, IIR) < 0)
                        return -1;

            if (m->filter_order[ch][FIR] && m->filter_order[ch][IIR] &&
                m->filter_shift[ch][FIR] != m->filter_shift[ch][IIR]) {
                av_log(m->avctx, AV_LOG_ERROR,
                       "FIR and IIR filters must use the same precision.\n");
                return -1;
            }
            /* The FIR and IIR filters must have the same precision.
             * To simplify the filtering code, only the precision of the
             * FIR filter is considered. If only the IIR filter is employed,
             * the FIR filter precision is set to that of the IIR filter, so
             * that the filtering code can use it. */
            if (!m->filter_order[ch][FIR] && m->filter_order[ch][IIR])
                m->filter_shift[ch][FIR] = m->filter_shift[ch][IIR];

            if (s->param_presence_flags & PARAM_HUFFOFFSET)
                if (get_bits1(gbp))
                    m->huff_offset[ch] = get_sbits(gbp, 15);

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_FILTER_ORDER];
    unsigned int filter_shift = m->filter_shift[channel][FIR];
    int32_t mask = MSB_MASK(s->quant_step_size[channel]);
    int index = MAX_BLOCKSIZE;
    int j, i;

    for (j = 0; j < NUM_FILTERS; j++) {
        memcpy(&   filter_state_buffer  [j][MAX_BLOCKSIZE],
               &m->filter_state[channel][j][0],
               MAX_FILTER_ORDER * sizeof(int32_t));
    }

    for (i = 0; i < s->blocksize; i++) {
        int32_t residual = m->sample_buffer[i + s->blockpos][channel];

        int32_t result;

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

        for (j = 0; j < NUM_FILTERS; j++)
            for (order = 0; order < m->filter_order[channel][j]; order++)
                accum += (int64_t)filter_state_buffer[j][index + order] *
                        m->filter_coeff[channel][j][order];

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

        --index;

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

    for (j = 0; j < NUM_FILTERS; j++) {
        memcpy(&m->filter_state[channel][j][0],
               &   filter_state_buffer  [j][index],
               MAX_FILTER_ORDER * sizeof(int32_t));
    }
}

7552:88ffd7c9c0ed

    //! Running XOR of all output samples.
    int32_t     lossless_check_data;

} SubStream;

#define FIR 0
#define IIR 1

/** filter data */
typedef struct {
    //! number of taps in filter
    uint8_t     order;
    //! Right shift to apply to output of filter.
    uint8_t     shift;

    int32_t     coeff[MAX_FILTER_ORDER];
    int32_t     state[MAX_FILTER_ORDER];
} FilterParams;

typedef struct MLPDecodeContext {
    AVCodecContext *avctx;

    //! Set if a valid major sync block has been read. Otherwise no decoding is possible.
    uint8_t     params_valid;

    //! next power of two above the number of samples in each frame
    int         access_unit_size_pow2;

    SubStream   substream[MAX_SUBSTREAMS];

    FilterParams filter_params[MAX_CHANNELS][NUM_FILTERS];

    //@{
    /** sample data coding information */
    //! Offset to apply to residual values.
    int16_t     huff_offset[MAX_CHANNELS];

    memset(s->output_shift   , 0, sizeof(s->output_shift   ));
    memset(s->quant_step_size, 0, sizeof(s->quant_step_size));

    for (ch = s->min_channel; ch <= s->max_channel; ch++) {
        m->filter_params[ch][FIR].order = 0;
        m->filter_params[ch][IIR].order = 0;
        m->filter_params[ch][FIR].shift = 0;
        m->filter_params[ch][IIR].shift = 0;

        /* Default audio coding is 24-bit raw PCM. */
        m->huff_offset     [ch] = 0;
        m->sign_huff_offset[ch] = (-1) << 23;
        m->codebook        [ch] = 0;

/** Read parameters for one of the prediction filters. */

static int read_filter_params(MLPDecodeContext *m, GetBitContext *gbp,
                              unsigned int channel, unsigned int filter)
{
    FilterParams *fp = &m->filter_params[channel][filter];
    const char fchar = filter ? 'I' : 'F';
    int i, order;

    // Filter is 0 for FIR, 1 for IIR.
    assert(filter < 2);

        av_log(m->avctx, AV_LOG_ERROR,
               "%cIR filter order %d is greater than maximum %d.\n",
               fchar, order, MAX_FILTER_ORDER);
        return -1;
    }
    fp->order = order;

    if (order > 0) {
        int coeff_bits, coeff_shift;

        fp->shift = get_bits(gbp, 4);

        coeff_bits  = get_bits(gbp, 5);
        coeff_shift = get_bits(gbp, 3);
        if (coeff_bits < 1 || coeff_bits > 16) {
            av_log(m->avctx, AV_LOG_ERROR,

                   fchar);
            return -1;
        }

        for (i = 0; i < order; i++)
            fp->coeff[i] =
                    get_sbits(gbp, coeff_bits) << coeff_shift;

        if (get_bits1(gbp)) {
            int state_bits, state_shift;

            state_shift = get_bits(gbp, 4);

            /* TODO: Check validity of state data. */

            for (i = 0; i < order; i++)
                fp->state[i] =
                    get_sbits(gbp, state_bits) << state_shift;
        }
    }

    return 0;

                m->sign_huff_offset[ch] = calculate_sign_huff(m, substr, ch);
            }

    for (ch = s->min_channel; ch <= s->max_channel; ch++)
        if (get_bits1(gbp)) {
            FilterParams *fir = &m->filter_params[ch][FIR];
            FilterParams *iir = &m->filter_params[ch][IIR];

            if (s->param_presence_flags & PARAM_FIR)
                if (get_bits1(gbp))
                    if (read_filter_params(m, gbp, ch, FIR) < 0)
                        return -1;

            if (s->param_presence_flags & PARAM_IIR)
                if (get_bits1(gbp))
                    if (read_filter_params(m, gbp, ch, IIR) < 0)
                        return -1;

            if (fir->order && iir->order &&
                fir->shift != iir->shift) {
                av_log(m->avctx, AV_LOG_ERROR,
                       "FIR and IIR filters must use the same precision.\n");
                return -1;
            }
            /* The FIR and IIR filters must have the same precision.
             * To simplify the filtering code, only the precision of the
             * FIR filter is considered. If only the IIR filter is employed,
             * the FIR filter precision is set to that of the IIR filter, so
             * that the filtering code can use it. */
            if (!fir->order && iir->order)
                fir->shift = iir->shift;

            if (s->param_presence_flags & PARAM_HUFFOFFSET)
                if (get_bits1(gbp))
                    m->huff_offset[ch] = get_sbits(gbp, 15);

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_FILTER_ORDER];
    FilterParams *fp[NUM_FILTERS] = { &m->filter_params[channel][FIR],
                                      &m->filter_params[channel][IIR], };
    unsigned int filter_shift = fp[FIR]->shift;
    int32_t mask = MSB_MASK(s->quant_step_size[channel]);
    int index = MAX_BLOCKSIZE;
    int j, i;

    for (j = 0; j < NUM_FILTERS; j++) {
        memcpy(&   filter_state_buffer  [j][MAX_BLOCKSIZE],
               &fp[j]->state[0],
               MAX_FILTER_ORDER * sizeof(int32_t));
    }

    for (i = 0; i < s->blocksize; i++) {
        int32_t residual = m->sample_buffer[i + s->blockpos][channel];

        int32_t result;

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

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

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

        --index;

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

    for (j = 0; j < NUM_FILTERS; j++) {
        memcpy(&fp[j]->state[0],
               &   filter_state_buffer  [j][index],
               MAX_FILTER_ORDER * sizeof(int32_t));
    }
}