comparison dca.c @ 7737:d7ae1362a681 libavcodec

Get rid of the 512 sample memmove().

7736:968241bb5e88

    /* Subband samples history (for ADPCM) */
    float subband_samples_hist[DCA_PRIM_CHANNELS_MAX][DCA_SUBBANDS][4];
    float subband_fir_hist[DCA_PRIM_CHANNELS_MAX][512];
    float subband_fir_noidea[DCA_PRIM_CHANNELS_MAX][32];

    int output;                 ///< type of output
    int bias;                   ///< output bias

    DECLARE_ALIGNED_16(float, samples[1536]);  /* 6 * 256 = 1536, might only need 5 */

{
    const float *prCoeff;
    int i, j, k;
    float praXin[33], *raXin = &praXin[1];

    float *subband_fir_hist = s->subband_fir_hist[chans];
    float *subband_fir_hist2 = s->subband_fir_noidea[chans];

    int chindex = 0, subindex;

    praXin[0] = 0.0;

    else                        /* Perfect reconstruction */
        prCoeff = fir_32bands_perfect;

    /* Reconstructed channel sample index */
    for (subindex = 0; subindex < 8; subindex++) {
        /* Load in one sample from each subband and clear inactive subbands */
        for (i = 0; i < s->subband_activity[chans]; i++)
            raXin[i] = samples_in[i][subindex];
        for (; i < 32; i++)
            raXin[i] = 0.0;

        /* Multiply by filter coefficients */
        for (k = 31, i = 0; i < 32; i++, k--){
            float a= subband_fir_hist2[i];
            float b= 0;
            for (j = 0; j < 512; j += 64){
                a += prCoeff[i+j   ]*( subband_fir_hist[i+j] - subband_fir_hist[j+k]);
                b += prCoeff[i+j+32]*(-subband_fir_hist[i+j] - subband_fir_hist[j+k]);
            }
            samples_out[chindex++] = a * scale + bias;
            subband_fir_hist2[i] = b;
        }

        /* Update working arrays */
        memmove(&subband_fir_hist[32], &subband_fir_hist[0], (512 - 32) * sizeof(float));
    }
}

static void lfe_interpolation_fir(int decimation_select,
                                  int num_deci_sample, float *samples_in,
                                  float *samples_out, float scale,

7737:d7ae1362a681

    /* Subband samples history (for ADPCM) */
    float subband_samples_hist[DCA_PRIM_CHANNELS_MAX][DCA_SUBBANDS][4];
    float subband_fir_hist[DCA_PRIM_CHANNELS_MAX][512];
    float subband_fir_noidea[DCA_PRIM_CHANNELS_MAX][32];
    int hist_index[DCA_PRIM_CHANNELS_MAX];

    int output;                 ///< type of output
    int bias;                   ///< output bias

    DECLARE_ALIGNED_16(float, samples[1536]);  /* 6 * 256 = 1536, might only need 5 */

{
    const float *prCoeff;
    int i, j, k;
    float praXin[33], *raXin = &praXin[1];

    int hist_index= s->hist_index[chans];
    float *subband_fir_hist2 = s->subband_fir_noidea[chans];

    int chindex = 0, subindex;

    praXin[0] = 0.0;

    else                        /* Perfect reconstruction */
        prCoeff = fir_32bands_perfect;

    /* Reconstructed channel sample index */
    for (subindex = 0; subindex < 8; subindex++) {
        float *subband_fir_hist = s->subband_fir_hist[chans] + hist_index;
        /* Load in one sample from each subband and clear inactive subbands */
        for (i = 0; i < s->subband_activity[chans]; i++)
            raXin[i] = samples_in[i][subindex];
        for (; i < 32; i++)
            raXin[i] = 0.0;

        /* Multiply by filter coefficients */
        for (k = 31, i = 0; i < 32; i++, k--){
            float a= subband_fir_hist2[i];
            float b= 0;
            for (j = 0; j < 512-hist_index; j += 64){
                a += prCoeff[i+j   ]*( subband_fir_hist[i+j] - subband_fir_hist[j+k]);
                b += prCoeff[i+j+32]*(-subband_fir_hist[i+j] - subband_fir_hist[j+k]);
            }
            for (     ; j < 512; j += 64){
                a += prCoeff[i+j   ]*( subband_fir_hist[i+j-512] - subband_fir_hist[j+k-512]);
                b += prCoeff[i+j+32]*(-subband_fir_hist[i+j-512] - subband_fir_hist[j+k-512]);
            }
            samples_out[chindex++] = a * scale + bias;
            subband_fir_hist2[i] = b;
        }

        hist_index = (hist_index-32)&511;
    }
    s->hist_index[chans]= hist_index;
}

static void lfe_interpolation_fir(int decimation_select,
                                  int num_deci_sample, float *samples_in,
                                  float *samples_out, float scale,