comparison mace.c @ 7807:8c32b5606f83 libavcodec

Do not share context variables between channels and do not zero them at decode_frame(). This makes the output much closer to that of the binary decoder.

7806:b90764c4f31a

    { 0x342C, 0x7FFF, 0x8000, 0xCBD3, 0, 0, 0, 0 },  { 0x3681, 0x7FFF, 0x8000, 0xC97E, 0, 0, 0, 0 },
    { 0x38F0, 0x7FFF, 0x8000, 0xC70F, 0, 0, 0, 0 },  { 0x3B7A, 0x7FFF, 0x8000, 0xC485, 0, 0, 0, 0 },
    { 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;

    *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;

    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;

    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;

7807:8c32b5606f83

    { 0x342C, 0x7FFF, 0x8000, 0xCBD3, 0, 0, 0, 0 },  { 0x3681, 0x7FFF, 0x8000, 0xC97E, 0, 0, 0, 0 },
    { 0x38F0, 0x7FFF, 0x8000, 0xC70F, 0, 0, 0, 0 },  { 0x3B7A, 0x7FFF, 0x8000, 0xC485, 0, 0, 0, 0 },
    { 0x3E22, 0x7FFF, 0x8000, 0xC1DD, 0, 0, 0, 0 },  { 0x40E7, 0x7FFF, 0x8000, 0xBF18, 0, 0, 0, 0 },
};

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

typedef struct MACEContext {
    ChannelData chd[2];
} MACEContext;

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

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

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

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

    for(i = 0; i < avctx->channels; i++) {
        int16_t *output = 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->chd[i], output, pkt       &7, MACEtab1, MACEtab2, avctx->channels);
                output += avctx->channels;
                chomp3(&ctx->chd[i], output,(pkt >> 3) &3, MACEtab3, MACEtab4, avctx->channels);
                output += avctx->channels;
                chomp3(&ctx->chd[i], output, pkt >> 5    , MACEtab1, MACEtab2, avctx->channels);
                output += avctx->channels;
            }
    }

    *data_size = 2 * 3 * buf_size;

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

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

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

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

    *data_size = 2 * 6 * buf_size;