opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-03 14:36:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cosmetics: rename vars s/ctx/chd/

Browse Source 
Originally committed as revision 15256 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Vitor Sessak
2008-09-07 20:18:18 +00:00
parent 97b93389af
commit d636f0cc39
1 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
libavcodec/mace.c
View File

@ -162,7 +162,7 @@ static inline int16_t mace_broken_clip_int16(int n)
return n; return n;
} }
static void chomp3(ChannelData *ctx, int16_t *output, uint8_t val, static void chomp3(ChannelData *chd, int16_t *output, uint8_t val,
const uint16_t tab1[], const uint16_t tab1[],
const int16_t *tab2, int tab2_stride, const int16_t *tab2, int tab2_stride,
uint32_t numChannels) uint32_t numChannels)
@ -170,19 +170,19 @@ static void chomp3(ChannelData *ctx, int16_t *output, uint8_t val,
int16_t current; int16_t current;
if (val < tab2_stride) if (val < tab2_stride)
current = tab2[((ctx->index & 0x7f0) >> 4)*tab2_stride + val]; current = tab2[((chd->index & 0x7f0) >> 4)*tab2_stride + val];
else else
current = - 1 - tab2[((ctx->index & 0x7f0) >> 4)*tab2_stride + 2*tab2_stride-val-1]; current = - 1 - tab2[((chd->index & 0x7f0) >> 4)*tab2_stride + 2*tab2_stride-val-1];
current = mace_broken_clip_int16(current + ctx->lev); current = mace_broken_clip_int16(current + chd->lev);
ctx->lev = current - (current >> 3); chd->lev = current - (current >> 3);
*output = QT_8S_2_16S(current); *output = QT_8S_2_16S(current);
if (( ctx->index += tab1[val]-(ctx->index >> 5) ) < 0) if (( chd->index += tab1[val]-(chd->index >> 5) ) < 0)
ctx->index = 0; chd->index = 0;
} }
static void chomp6(ChannelData *ctx, int16_t *output, uint8_t val, static void chomp6(ChannelData *chd, int16_t *output, uint8_t val,
const uint16_t tab1[], const uint16_t tab1[],
const int16_t *tab2, int tab2_stride, const int16_t *tab2, int tab2_stride,
uint32_t numChannels) uint32_t numChannels)
@ -190,33 +190,33 @@ static void chomp6(ChannelData *ctx, int16_t *output, uint8_t val,
int16_t current; int16_t current;
if (val < tab2_stride) if (val < tab2_stride)
current = tab2[((ctx->index & 0x7f0) >> 4)*tab2_stride + val]; current = tab2[((chd->index & 0x7f0) >> 4)*tab2_stride + val];
else else
current = - 1 - tab2[((ctx->index & 0x7f0) >> 4)*tab2_stride + 2*tab2_stride-val-1]; current = - 1 - tab2[((chd->index & 0x7f0) >> 4)*tab2_stride + 2*tab2_stride-val-1];
if ((ctx->previous ^ current) >= 0) { if ((chd->previous ^ current) >= 0) {
ctx->factor = FFMIN(ctx->factor + 506, 32767); chd->factor = FFMIN(chd->factor + 506, 32767);
} else { } else {
if (ctx->factor - 314 < -32768) if (chd->factor - 314 < -32768)
ctx->factor = -32767; chd->factor = -32767;
else else
ctx->factor -= 314; chd->factor -= 314;
} }
current = mace_broken_clip_int16(current + ctx->level); current = mace_broken_clip_int16(current + chd->level);
ctx->level = ((current*ctx->factor) >> 15); chd->level = ((current*chd->factor) >> 15);
current >>= 1; current >>= 1;
output[0] = QT_8S_2_16S(ctx->previous + ctx->prev2 - output[0] = QT_8S_2_16S(chd->previous + chd->prev2 -
((ctx->prev2-current) >> 2)); ((chd->prev2-current) >> 2));
output[numChannels] = QT_8S_2_16S(ctx->previous + current + output[numChannels] = QT_8S_2_16S(chd->previous + current +
((ctx->prev2-current) >> 2)); ((chd->prev2-current) >> 2));
ctx->prev2 = ctx->previous; chd->prev2 = chd->previous;
ctx->previous = current; chd->previous = current;
if ((ctx->index += tab1[val] - (ctx->index >> 5)) < 0) if ((chd->index += tab1[val] - (chd->index >> 5)) < 0)
ctx->index = 0; chd->index = 0;
} }
static av_cold int mace_decode_init(AVCodecContext * avctx) static av_cold int mace_decode_init(AVCodecContext * avctx)