comparison ra288.c @ 7442:2ccb81f932f0 libavcodec

Remove the now useless phase variable from context

7441:a09e82b2f875

#include "ra288.h"

typedef struct {
    float sp_lpc[36];      ///< LPC coefficients for speech data (spec: A)
    float gain_lpc[10];    ///< LPC coefficients for gain (spec: GB)
    int   phase;

    float sp_hist[111];    ///< Speech data history (spec: SB)

    /** Speech part of the gain autocorrelation (spec: REXP) */
    float sp_rec[37];

    init_get_bits(&gb, buf, avctx->block_align * 8);

    for (x=0; x < 32; x++) {
        float gain = amptable[get_bits(&gb, 3)];
        int cb_coef = get_bits(&gb, 6 + (x&1));
        ractx->phase = (x + 4) & 7;
        decode(ractx, gain, cb_coef);

        for (y=0; y < 5; y++)
            *(out++) = 8 * ractx->sp_block[4 - y];

        if (ractx->phase == 7)
            backward_filter(ractx);
    }

    *data_size = (char *)out - (char *)data;
    return avctx->block_align;

7442:2ccb81f932f0

#include "ra288.h"

typedef struct {
    float sp_lpc[36];      ///< LPC coefficients for speech data (spec: A)
    float gain_lpc[10];    ///< LPC coefficients for gain (spec: GB)

    float sp_hist[111];    ///< Speech data history (spec: SB)

    /** Speech part of the gain autocorrelation (spec: REXP) */
    float sp_rec[37];

    init_get_bits(&gb, buf, avctx->block_align * 8);

    for (x=0; x < 32; x++) {
        float gain = amptable[get_bits(&gb, 3)];
        int cb_coef = get_bits(&gb, 6 + (x&1));
        decode(ractx, gain, cb_coef);

        for (y=0; y < 5; y++)
            *(out++) = 8 * ractx->sp_block[4 - y];

        if ((x & 7) == 3)
            backward_filter(ractx);
    }

    *data_size = (char *)out - (char *)data;
    return avctx->block_align;