comparison ra144.c @ 6968:50dd3a733f43 libavcodec

The function dec1() do two completly unrelated things. Split the rms calculation out of it.

6967:c3446faee506

            block);

    final(lpc_coefs, block, output_buffer, ractx->buffer, BLOCKSIZE);
}

static int dec1(int16_t *decsp, const int *data, const int *inp, int f)
{
    int i;

    for (i=0; i<30; i++)
        *(decsp++) = *(inp++);

    return rms(data, f);
}

/**
 * Evaluate the reflection coefficients from the filter coefficients.
 * Does the inverse of the eval_coefs() function.

        decsp[x] = (a * ractx->lpc_coef[x] + b * ractx->lpc_coef_old[x])>> 2;

    if (eval_refl(decsp, work)) {
        // The interpolated coefficients are unstable, copy either new or old
        // coefficients
        if (copynew)
            return dec1(decsp, ractx->lpc_refl, ractx->lpc_coef, f);
        else
            return dec1(decsp, ractx->lpc_refl_old, ractx->lpc_coef_old, f);
    } else {
        return rms(work, f);
    }
}

    refl_rms[0] = dec2(ractx, block_coefs[0], 0, 0, ractx->old_energy);
    refl_rms[1] = dec2(ractx, block_coefs[1], 1, energy > ractx->old_energy,
                    t_sqrt(energy*ractx->old_energy) >> 12);
    refl_rms[2] = dec2(ractx, block_coefs[2], 2, 1, energy);
    refl_rms[3] = dec1(block_coefs[3], ractx->lpc_refl, ractx->lpc_coef,
                       energy);

    /* do output */
    for (c=0; c<4; c++) {
        do_output_subblock(ractx, block_coefs[c], refl_rms[c], data, &gb);

6968:50dd3a733f43

            block);

    final(lpc_coefs, block, output_buffer, ractx->buffer, BLOCKSIZE);
}

static void dec1(int16_t *decsp, const int *inp)
{
    int i;

    for (i=0; i<30; i++)
        *(decsp++) = *(inp++);
}

/**
 * Evaluate the reflection coefficients from the filter coefficients.
 * Does the inverse of the eval_coefs() function.

        decsp[x] = (a * ractx->lpc_coef[x] + b * ractx->lpc_coef_old[x])>> 2;

    if (eval_refl(decsp, work)) {
        // The interpolated coefficients are unstable, copy either new or old
        // coefficients
        if (copynew) {
            dec1(decsp, ractx->lpc_coef);
            return rms(ractx->lpc_refl, f);
        } else {
            dec1(decsp, ractx->lpc_coef_old);
            return rms(ractx->lpc_refl_old, f);
        }
    } else {
        return rms(work, f);
    }
}

    refl_rms[0] = dec2(ractx, block_coefs[0], 0, 0, ractx->old_energy);
    refl_rms[1] = dec2(ractx, block_coefs[1], 1, energy > ractx->old_energy,
                    t_sqrt(energy*ractx->old_energy) >> 12);
    refl_rms[2] = dec2(ractx, block_coefs[2], 2, 1, energy);
    refl_rms[3] = rms(ractx->lpc_refl, energy);

    dec1(block_coefs[3], ractx->lpc_coef);

    /* do output */
    for (c=0; c<4; c++) {
        do_output_subblock(ractx, block_coefs[c], refl_rms[c], data, &gb);