[FFmpeg-cvslog] avcodec/adpcm: remove unused shift parameter from adpcm_ima_qt_expand_nibble()
Zane van Iperen
git at videolan.org
Sat Apr 11 18:01:30 EEST 2020
ffmpeg | branch: master | Zane van Iperen <zane at zanevaniperen.com> | Sat Apr 11 08:12:40 2020 +0000| [67c4405fac3f227126a6233daab629f322abe4d2] | committer: Carl Eugen Hoyos
avcodec/adpcm: remove unused shift parameter from adpcm_ima_qt_expand_nibble()
Signed-off-by: Zane van Iperen <zane at zanevaniperen.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=67c4405fac3f227126a6233daab629f322abe4d2
---
libavcodec/adpcm.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index e9abddc43c..ee18875579 100644
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@ -348,7 +348,7 @@ static inline int16_t adpcm_ima_wav_expand_nibble(ADPCMChannelStatus *c, GetBitC
return (int16_t)c->predictor;
}
-static inline int adpcm_ima_qt_expand_nibble(ADPCMChannelStatus *c, int nibble, int shift)
+static inline int adpcm_ima_qt_expand_nibble(ADPCMChannelStatus *c, int nibble)
{
int step_index;
int predictor;
@@ -969,8 +969,8 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data,
for (m = 0; m < 64; m += 2) {
int byte = bytestream2_get_byteu(&gb);
- samples[m ] = adpcm_ima_qt_expand_nibble(cs, byte & 0x0F, 3);
- samples[m + 1] = adpcm_ima_qt_expand_nibble(cs, byte >> 4 , 3);
+ samples[m ] = adpcm_ima_qt_expand_nibble(cs, byte & 0x0F);
+ samples[m + 1] = adpcm_ima_qt_expand_nibble(cs, byte >> 4 );
}
}
break;
@@ -1280,16 +1280,16 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data,
case AV_CODEC_ID_ADPCM_IMA_SSI:
while (bytestream2_get_bytes_left(&gb) > 0) {
int v = bytestream2_get_byteu(&gb);
- *samples++ = adpcm_ima_qt_expand_nibble(&c->status[0], v >> 4 , 3);
- *samples++ = adpcm_ima_qt_expand_nibble(&c->status[st], v & 0x0F, 3);
+ *samples++ = adpcm_ima_qt_expand_nibble(&c->status[0], v >> 4 );
+ *samples++ = adpcm_ima_qt_expand_nibble(&c->status[st], v & 0x0F);
}
break;
case AV_CODEC_ID_ADPCM_IMA_APM:
for (n = nb_samples / 2; n > 0; n--) {
for (channel = 0; channel < avctx->channels; channel++) {
int v = bytestream2_get_byteu(&gb);
- *samples++ = adpcm_ima_qt_expand_nibble(&c->status[channel], v >> 4 , 3);
- samples[st] = adpcm_ima_qt_expand_nibble(&c->status[channel], v & 0x0F, 3);
+ *samples++ = adpcm_ima_qt_expand_nibble(&c->status[channel], v >> 4 );
+ samples[st] = adpcm_ima_qt_expand_nibble(&c->status[channel], v & 0x0F);
}
samples += avctx->channels;
}
@@ -1640,8 +1640,8 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data,
for (n = nb_samples >> (1 - st); n > 0; n--) {
int v = bytestream2_get_byteu(&gb);
- *samples++ = adpcm_ima_qt_expand_nibble(&c->status[0 ], v >> 4, 3);
- *samples++ = adpcm_ima_qt_expand_nibble(&c->status[st], v & 0xf, 3);
+ *samples++ = adpcm_ima_qt_expand_nibble(&c->status[0 ], v >> 4 );
+ *samples++ = adpcm_ima_qt_expand_nibble(&c->status[st], v & 0xf);
}
break;
case AV_CODEC_ID_ADPCM_CT:
More information about the ffmpeg-cvslog
mailing list