comparison mace.c @ 7808:0acafe424d54 libavcodec

Use the same 8 bit -> 16 bit conversion as QuickTime.

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 {

    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(ChannelData *ctx, int16_t *output, uint8_t 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;

7808:0acafe424d54

    { 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 },
};

#define QT_8S_2_16S(x) (((x) & 0xFF00) | (((x) >> 8) & 0xFF))

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

typedef struct MACEContext {

    else
        current += ctx->lev;

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

static void chomp6(ChannelData *ctx, int16_t *output, uint8_t 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] = QT_8S_2_16S(ctx->previous + ctx->prev2 -
                            ((ctx->prev2-current) >> 2));
    output[numChannels] = QT_8S_2_16S(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;