comparison mace.c @ 7840:38dd4fd9f107 libavcodec

Remove ChannelData.lev var and use ChannelData.level instead

7839:e6348a5656e0

};

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

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

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

    if (val < tab2_stride)
        current = tab2[((chd->index & 0x7f0) >> 4)*tab2_stride + val];
    else
        current = - 1 - tab2[((chd->index & 0x7f0) >> 4)*tab2_stride + 2*tab2_stride-val-1];

    current = mace_broken_clip_int16(current + chd->lev);

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

7840:38dd4fd9f107

};

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

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

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

    if (val < tab2_stride)
        current = tab2[((chd->index & 0x7f0) >> 4)*tab2_stride + val];
    else
        current = - 1 - tab2[((chd->index & 0x7f0) >> 4)*tab2_stride + 2*tab2_stride-val-1];

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

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