From 3395ad48fa2f018bd3d33324f2e5a9c89af4357e Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Wed, 4 May 2016 00:33:48 +0200 Subject: [PATCH] avcodec/adpcm: replace char/short/long with int8_t/int16_t/int Signed-off-by: Paul B Mahol --- libavcodec/adpcm.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 5d8aa41ae9..791631751d 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -172,7 +172,7 @@ static av_cold int adpcm_decode_init(AVCodecContext * avctx) return 0; } -static inline short adpcm_ima_expand_nibble(ADPCMChannelStatus *c, char nibble, int shift) +static inline int16_t adpcm_ima_expand_nibble(ADPCMChannelStatus *c, int8_t nibble, int shift) { int step_index; int predictor; @@ -195,7 +195,7 @@ static inline short adpcm_ima_expand_nibble(ADPCMChannelStatus *c, char nibble, c->predictor = av_clip_int16(predictor); c->step_index = step_index; - return (short)c->predictor; + return (int16_t)c->predictor; } static inline int16_t adpcm_ima_wav_expand_nibble(ADPCMChannelStatus *c, GetBitContext *gb, int bps) @@ -247,7 +247,7 @@ static inline int adpcm_ima_qt_expand_nibble(ADPCMChannelStatus *c, int nibble, return c->predictor; } -static inline short adpcm_ms_expand_nibble(ADPCMChannelStatus *c, int nibble) +static inline int16_t adpcm_ms_expand_nibble(ADPCMChannelStatus *c, int nibble) { int predictor; @@ -266,7 +266,7 @@ static inline short adpcm_ms_expand_nibble(ADPCMChannelStatus *c, int nibble) return c->sample1; } -static inline short adpcm_ima_oki_expand_nibble(ADPCMChannelStatus *c, int nibble) +static inline int16_t adpcm_ima_oki_expand_nibble(ADPCMChannelStatus *c, int nibble) { int step_index, predictor, sign, delta, diff, step; @@ -287,7 +287,7 @@ static inline short adpcm_ima_oki_expand_nibble(ADPCMChannelStatus *c, int nibbl return c->predictor << 4; } -static inline short adpcm_ct_expand_nibble(ADPCMChannelStatus *c, char nibble) +static inline int16_t adpcm_ct_expand_nibble(ADPCMChannelStatus *c, int8_t nibble) { int sign, delta, diff; int new_step; @@ -305,10 +305,10 @@ static inline short adpcm_ct_expand_nibble(ADPCMChannelStatus *c, char nibble) new_step = (ff_adpcm_AdaptationTable[nibble & 7] * c->step) >> 8; c->step = av_clip(new_step, 511, 32767); - return (short)c->predictor; + return (int16_t)c->predictor; } -static inline short adpcm_sbpro_expand_nibble(ADPCMChannelStatus *c, char nibble, int size, int shift) +static inline int16_t adpcm_sbpro_expand_nibble(ADPCMChannelStatus *c, int8_t nibble, int size, int shift) { int sign, delta, diff; @@ -325,10 +325,10 @@ static inline short adpcm_sbpro_expand_nibble(ADPCMChannelStatus *c, char nibble else if (delta == 0 && c->step > 0) c->step--; - return (short) c->predictor; + return (int16_t) c->predictor; } -static inline short adpcm_yamaha_expand_nibble(ADPCMChannelStatus *c, unsigned char nibble) +static inline int16_t adpcm_yamaha_expand_nibble(ADPCMChannelStatus *c, uint8_t nibble) { if(!c->step) { c->predictor = 0; @@ -452,7 +452,7 @@ static void adpcm_swf_decode(AVCodecContext *avctx, const uint8_t *buf, int buf_ // similar to IMA adpcm int delta = get_bits(&gb, nb_bits); int step = ff_adpcm_step_table[c->status[i].step_index]; - long vpdiff = 0; // vpdiff = (delta+0.5)*step/4 + int vpdiff = 0; // vpdiff = (delta+0.5)*step/4 int k = k0; do { @@ -695,7 +695,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, ADPCMDecodeContext *c = avctx->priv_data; ADPCMChannelStatus *cs; int n, m, channel, i; - short *samples; + int16_t *samples; int16_t **samples_p; int st; /* stereo */ int count1, count2; @@ -713,7 +713,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, frame->nb_samples = nb_samples; if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) return ret; - samples = (short *)frame->data[0]; + samples = (int16_t *)frame->data[0]; samples_p = (int16_t **)frame->extended_data; /* use coded_samples when applicable */ -- 2.11.0