comparison flacenc.c @ 5737:efa3c1f9259a libavcodec

sse2 version of compute_autocorr(). 4x faster than c (somehow, even though doubles only allow 2x simd). overal flac encoding: 15-50% faster on core2, 4-11% on k8, 3-13% on p4.

5736:810067f2c33d

 */

#include "avcodec.h"
#include "bitstream.h"
#include "crc.h"
#include "golomb.h"
#include "lls.h"

#define FLAC_MAX_CH  8
#define FLAC_MIN_BLOCKSIZE  16

    int max_framesize;
    uint32_t frame_count;
    FlacFrame frame;
    CompressionOptions options;
    AVCodecContext *avctx;
} FlacEncodeContext;

static const int flac_samplerates[16] = {
    0, 0, 0, 0,
    8000, 16000, 22050, 24000, 32000, 44100, 48000, 96000,

    FlacEncodeContext *s = avctx->priv_data;
    int i, level;
    uint8_t *streaminfo;

    s->avctx = avctx;

    if(avctx->sample_fmt != SAMPLE_FMT_S16) {
        return -1;
    }

/**
 * Calculates autocorrelation data from audio samples
 * A Welch window function is applied before calculation.
 */
static void compute_autocorr(const int32_t *data, int len, int lag,
                             double *autoc)
{
    int i, j;
    double tmp[len + lag + 1];
    double *data1= tmp + lag;

}

/**
 * Calculate LPC coefficients for multiple orders
 */
static int lpc_calc_coefs(const int32_t *samples, int blocksize, int max_order,
                          int precision, int32_t coefs[][MAX_LPC_ORDER],
                          int *shift, int use_lpc, int omethod)
{
    double autoc[MAX_LPC_ORDER+1];
    double ref[MAX_LPC_ORDER];

    int opt_order;

    assert(max_order >= MIN_LPC_ORDER && max_order <= MAX_LPC_ORDER);

    if(use_lpc == 1){
        compute_autocorr(samples, blocksize, max_order, autoc);

        compute_lpc_coefs(autoc, max_order, lpc, ref);
    }else{
        LLSModel m[2];
        double var[MAX_LPC_ORDER+1], eval, weight;

        }
        return bits[sub->order];
    }

    /* LPC */
    opt_order = lpc_calc_coefs(smp, n, max_order, precision, coefs, shift, ctx->options.use_lpc, omethod);

    if(omethod == ORDER_METHOD_2LEVEL ||
       omethod == ORDER_METHOD_4LEVEL ||
       omethod == ORDER_METHOD_8LEVEL) {
        int levels = 1 << omethod;

5737:efa3c1f9259a

 */

#include "avcodec.h"
#include "bitstream.h"
#include "crc.h"
#include "dsputil.h"
#include "golomb.h"
#include "lls.h"

#define FLAC_MAX_CH  8
#define FLAC_MIN_BLOCKSIZE  16

    int max_framesize;
    uint32_t frame_count;
    FlacFrame frame;
    CompressionOptions options;
    AVCodecContext *avctx;
    DSPContext dsp;
} FlacEncodeContext;

static const int flac_samplerates[16] = {
    0, 0, 0, 0,
    8000, 16000, 22050, 24000, 32000, 44100, 48000, 96000,

    FlacEncodeContext *s = avctx->priv_data;
    int i, level;
    uint8_t *streaminfo;

    s->avctx = avctx;

    dsputil_init(&s->dsp, avctx);

    if(avctx->sample_fmt != SAMPLE_FMT_S16) {
        return -1;
    }

/**
 * Calculates autocorrelation data from audio samples
 * A Welch window function is applied before calculation.
 */
void ff_flac_compute_autocorr(const int32_t *data, int len, int lag,
                              double *autoc)
{
    int i, j;
    double tmp[len + lag + 1];
    double *data1= tmp + lag;

}

/**
 * Calculate LPC coefficients for multiple orders
 */
static int lpc_calc_coefs(FlacEncodeContext *s,
                          const int32_t *samples, int blocksize, int max_order,
                          int precision, int32_t coefs[][MAX_LPC_ORDER],
                          int *shift, int use_lpc, int omethod)
{
    double autoc[MAX_LPC_ORDER+1];
    double ref[MAX_LPC_ORDER];

    int opt_order;

    assert(max_order >= MIN_LPC_ORDER && max_order <= MAX_LPC_ORDER);

    if(use_lpc == 1){
        s->dsp.flac_compute_autocorr(samples, blocksize, max_order, autoc);

        compute_lpc_coefs(autoc, max_order, lpc, ref);
    }else{
        LLSModel m[2];
        double var[MAX_LPC_ORDER+1], eval, weight;

        }
        return bits[sub->order];
    }

    /* LPC */
    opt_order = lpc_calc_coefs(ctx, smp, n, max_order, precision, coefs, shift, ctx->options.use_lpc, omethod);

    if(omethod == ORDER_METHOD_2LEVEL ||
       omethod == ORDER_METHOD_4LEVEL ||
       omethod == ORDER_METHOD_8LEVEL) {
        int levels = 1 << omethod;