comparison mace.c @ 7810:06d3f6968b90 libavcodec

Factorize broken clipping in its own function and document it.

7809:74a7ac273231

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;

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

    if (current + ctx->lev > 32767)
        current = 32767;
    else if (current + ctx->lev < -32768)
        current = -32767;
    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->factor = -32767;
        else
            ctx->factor -= 314;
    }

    if (current + ctx->level > 32767)
        current = 32767;
    else if (current + ctx->level < -32768)
        current = -32767;
    else
        current += ctx->level;

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

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

7810:06d3f6968b90

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

/**
 * MACE version of av_clip_int16(). We have to do this to keep binary
 * identical output to the binary decoder.
 */
static inline int16_t mace_broken_clip_int16(int n)
{
    if (n > 32767)
        return 32767;
    else if (n < -32768)
        return -32767;
    else
        return n;
}

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;

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

    current = mace_broken_clip_int16(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->factor = -32767;
        else
            ctx->factor -= 314;
    }

    current = mace_broken_clip_int16(current + ctx->level);

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

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