Commit 97219014 authored by Ronald S. Bultje's avatar Ronald S. Bultje

adpcm: convert adpcm_ima_iss to bytestream2.

parent 1da95870
...@@ -777,14 +777,18 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, ...@@ -777,14 +777,18 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data,
case CODEC_ID_ADPCM_IMA_ISS: case CODEC_ID_ADPCM_IMA_ISS:
for (channel = 0; channel < avctx->channels; channel++) { for (channel = 0; channel < avctx->channels; channel++) {
cs = &c->status[channel]; cs = &c->status[channel];
cs->predictor = (int16_t)bytestream_get_le16(&src); cs->predictor = sign_extend(bytestream2_get_le16u(&gb), 16);
cs->step_index = av_clip(*src++, 0, 88); cs->step_index = sign_extend(bytestream2_get_le16u(&gb), 16);
src++; if (cs->step_index > 88u){
av_log(avctx, AV_LOG_ERROR, "ERROR: step_index[%d] = %i\n",
channel, cs->step_index);
return AVERROR_INVALIDDATA;
}
} }
for (n = nb_samples >> (1 - st); n > 0; n--, src++) { for (n = nb_samples >> (1 - st); n > 0; n--) {
uint8_t v1, v2; int v1, v2;
uint8_t v = *src; int v = bytestream2_get_byteu(&gb);
/* nibbles are swapped for mono */ /* nibbles are swapped for mono */
if (st) { if (st) {
v1 = v >> 4; v1 = v >> 4;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment