comparison mace.c @ 7806:b90764c4f31a libavcodec

Remove output pointer from context

7805:d1ebbf1e4d50

    { 0x3E22, 0x7FFF, 0x8000, 0xC1DD, 0, 0, 0, 0 },  { 0x40E7, 0x7FFF, 0x8000, 0xBF18, 0, 0, 0, 0 },
};

typedef struct MACEContext {
    short index, lev, factor, prev2, previous, level;
    short *outPtr;
} MACEContext;

static void chomp3(MACEContext *ctx, uint8_t val, const uint16_t tab1[],
            const uint16_t tab2[][8], uint32_t numChannels)
{
    short current;

    current = (short) tab2[(ctx->index & 0x7f0) >> 4][val];

    else
        current += ctx->lev;

    ctx->lev = current - (current >> 3);
    //*ctx->outPtr++=current >> 8;
    *ctx->outPtr = current;
    ctx->outPtr += numChannels;
    if (( ctx->index += tab1[val]-(ctx->index >> 5) ) < 0)
        ctx->index = 0;
}

static void chomp6(MACEContext *ctx, uint8_t val, const uint16_t tab1[],
            const uint16_t tab2[][8], uint32_t numChannels)
{
    short current;

    current = (short)tab2[(ctx->index & 0x7f0) >> 4][val];

    ctx->level = ((current*ctx->factor) >> 15);
    current >>= 1;

//  *ctx->outPtr++=(ctx->previous+ctx->prev2-((ctx->prev2-current) >> 2)) >> 8;
//  *ctx->outPtr++=(ctx->previous+current+((ctx->prev2-current) >> 2)) >> 8;
    *ctx->outPtr = (ctx->previous + ctx->prev2 - ((ctx->prev2-current) >> 2));
    ctx->outPtr += numChannels;
    *ctx->outPtr = (ctx->previous + current + ((ctx->prev2-current) >> 2));
    ctx->outPtr += numChannels;
    ctx->prev2 = ctx->previous;
    ctx->previous = current;

    if ((ctx->index += tab1[val] - (ctx->index >> 5)) < 0)
        ctx->index = 0;

    short *samples = data;
    MACEContext *ctx = avctx->priv_data;
    int i, j, k;

    for(i = 0; i < avctx->channels; i++) {
        ctx->index = ctx->lev = 0;

        ctx->outPtr = samples + i;

        for (j=0; j < buf_size / 2 / avctx->channels; j++)
            for (k=0; k < 2; k++) {
                uint8_t pkt = buf[i*2 + j*2*avctx->channels + k];
                chomp3(ctx, pkt       &7, MACEtab1, MACEtab2, avctx->channels);
                chomp3(ctx,(pkt >> 3) &3, MACEtab3, MACEtab4, avctx->channels);
                chomp3(ctx, pkt >> 5    , MACEtab1, MACEtab2, avctx->channels);
            }
    }

    *data_size = 2 * 3 * buf_size;

    short *samples = data;
    MACEContext *ctx = avctx->priv_data;
    int i, j;

    for(i = 0; i < avctx->channels; i++) {
        ctx->previous = ctx->prev2 = ctx->index = ctx->level = ctx->factor = 0;

        ctx->outPtr = samples + i;

        for (j = 0; j < buf_size / avctx->channels; j++) {
            uint8_t pkt = buf[i + j*avctx->channels];

            chomp6(ctx, pkt >> 5     , MACEtab1, MACEtab2, avctx->channels);
            chomp6(ctx,(pkt >> 3) & 3, MACEtab3, MACEtab4, avctx->channels);
            chomp6(ctx, pkt       & 7, MACEtab1, MACEtab2, avctx->channels);
        }
    }

    *data_size = 2 * 6 * buf_size;

7806:b90764c4f31a

    { 0x3E22, 0x7FFF, 0x8000, 0xC1DD, 0, 0, 0, 0 },  { 0x40E7, 0x7FFF, 0x8000, 0xBF18, 0, 0, 0, 0 },
};

typedef struct MACEContext {
    short index, lev, factor, prev2, previous, level;
} MACEContext;

static void chomp3(MACEContext *ctx, int16_t *output, uint8_t val,
                   const uint16_t tab1[],
            const uint16_t tab2[][8], uint32_t numChannels)
{
    short current;

    current = (short) tab2[(ctx->index & 0x7f0) >> 4][val];

    else
        current += ctx->lev;

    ctx->lev = current - (current >> 3);
    //*ctx->outPtr++=current >> 8;
    *output = current;
    if (( ctx->index += tab1[val]-(ctx->index >> 5) ) < 0)
        ctx->index = 0;
}

static void chomp6(MACEContext *ctx, int16_t *output, uint8_t val,
                   const uint16_t tab1[],
            const uint16_t tab2[][8], uint32_t numChannels)
{
    short current;

    current = (short)tab2[(ctx->index & 0x7f0) >> 4][val];

    ctx->level = ((current*ctx->factor) >> 15);
    current >>= 1;

//  *ctx->outPtr++=(ctx->previous+ctx->prev2-((ctx->prev2-current) >> 2)) >> 8;
//  *ctx->outPtr++=(ctx->previous+current+((ctx->prev2-current) >> 2)) >> 8;
    output[0] = (ctx->previous + ctx->prev2 - ((ctx->prev2-current) >> 2));
    output[numChannels] = (ctx->previous + current + ((ctx->prev2-current) >> 2));
    ctx->prev2 = ctx->previous;
    ctx->previous = current;

    if ((ctx->index += tab1[val] - (ctx->index >> 5)) < 0)
        ctx->index = 0;

    short *samples = data;
    MACEContext *ctx = avctx->priv_data;
    int i, j, k;

    for(i = 0; i < avctx->channels; i++) {
        int16_t *output = samples + i;
        ctx->index = ctx->lev = 0;

        for (j=0; j < buf_size / 2 / avctx->channels; j++)
            for (k=0; k < 2; k++) {
                uint8_t pkt = buf[i*2 + j*2*avctx->channels + k];
                chomp3(ctx, output, pkt       &7, MACEtab1, MACEtab2, avctx->channels);
                output += avctx->channels;
                chomp3(ctx, output,(pkt >> 3) &3, MACEtab3, MACEtab4, avctx->channels);
                output += avctx->channels;
                chomp3(ctx, output, pkt >> 5    , MACEtab1, MACEtab2, avctx->channels);
                output += avctx->channels;
            }
    }

    *data_size = 2 * 3 * buf_size;

    short *samples = data;
    MACEContext *ctx = avctx->priv_data;
    int i, j;

    for(i = 0; i < avctx->channels; i++) {
        int16_t *output = samples + i;
        ctx->previous = ctx->prev2 = ctx->index = ctx->level = ctx->factor = 0;

        for (j = 0; j < buf_size / avctx->channels; j++) {
            uint8_t pkt = buf[i + j*avctx->channels];

            chomp6(ctx, output, pkt >> 5     , MACEtab1, MACEtab2, avctx->channels);
            output += avctx->channels << 1;
            chomp6(ctx, output,(pkt >> 3) & 3, MACEtab3, MACEtab4, avctx->channels);
            output += avctx->channels << 1;
            chomp6(ctx, output, pkt       & 7, MACEtab1, MACEtab2, avctx->channels);
            output += avctx->channels << 1;
        }
    }

    *data_size = 2 * 6 * buf_size;