# HG changeset patch # User vitor # Date 1220780815 0 # Node ID 0acafe424d541c6ca812dcd1733d9dec41323963 # Parent 8c32b5606f830e71ac800c3b93768462bd88f5e1 Use the same 8 bit -> 16 bit conversion as QuickTime. diff -r 8c32b5606f83 -r 0acafe424d54 mace.c --- a/mace.c Sun Sep 07 09:42:57 2008 +0000 +++ b/mace.c Sun Sep 07 09:46:55 2008 +0000 @@ -234,6 +234,8 @@ { 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; @@ -259,7 +261,7 @@ ctx->lev = current - (current >> 3); //*ctx->outPtr++=current >> 8; - *output = current; + *output = QT_8S_2_16S(current); if (( ctx->index += tab1[val]-(ctx->index >> 5) ) < 0) ctx->index = 0; } @@ -296,8 +298,10 @@ // *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)); + 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;