diff options
Diffstat (limited to 'libavcodec/adpcm.c')
| -rw-r--r-- | libavcodec/adpcm.c | 657 |
1 files changed, 339 insertions, 318 deletions
diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index dec23a37e4..3e0c76a5ae 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -150,8 +150,7 @@ static inline short adpcm_ima_expand_nibble(ADPCMChannelStatus *c, char nibble, step = ff_adpcm_step_table[c->step_index]; step_index = c->step_index + ff_adpcm_index_table[(unsigned)nibble]; - if (step_index < 0) step_index = 0; - else if (step_index > 88) step_index = 88; + step_index = av_clip(step_index, 0, 88); sign = nibble & 8; delta = nibble & 7; @@ -195,12 +194,12 @@ static inline int adpcm_ima_qt_expand_nibble(ADPCMChannelStatus *c, int nibble, return c->predictor; } -static inline short adpcm_ms_expand_nibble(ADPCMChannelStatus *c, char nibble) +static inline short adpcm_ms_expand_nibble(ADPCMChannelStatus *c, int nibble) { int predictor; predictor = (((c->sample1) * (c->coeff1)) + ((c->sample2) * (c->coeff2))) / 64; - predictor += (signed)((nibble & 0x08)?(nibble - 0x10):(nibble)) * c->idelta; + predictor += ((nibble & 0x08)?(nibble - 0x10):(nibble)) * c->idelta; c->sample2 = c->sample1; c->sample1 = av_clip_int16(predictor); @@ -291,7 +290,7 @@ static int xa_decode(AVCodecContext *avctx, for(j=0;j<28;j++) { d = in[16+i+j*4]; - t = (signed char)(d<<4)>>4; + t = sign_extend(d, 4); s = ( t<<shift ) + ((s_1*f0 + s_2*f1+32)>>6); s_2 = s_1; s_1 = av_clip_int16(s); @@ -320,7 +319,7 @@ static int xa_decode(AVCodecContext *avctx, for(j=0;j<28;j++) { d = in[16+i+j*4]; - t = (signed char)d >> 4; + t = sign_extend(d >> 4, 4); s = ( t<<shift ) + ((s_1*f0 + s_2*f1+32)>>6); s_2 = s_1; s_1 = av_clip_int16(s); @@ -341,6 +340,64 @@ static int xa_decode(AVCodecContext *avctx, return 0; } +static void adpcm_swf_decode(AVCodecContext *avctx, const uint8_t *buf, int buf_size, int16_t *samples) +{ + ADPCMDecodeContext *c = avctx->priv_data; + GetBitContext gb; + const int *table; + int k0, signmask, nb_bits, count; + int size = buf_size*8; + int i; + + init_get_bits(&gb, buf, size); + + //read bits & initial values + nb_bits = get_bits(&gb, 2)+2; + //av_log(NULL,AV_LOG_INFO,"nb_bits: %d\n", nb_bits); + table = swf_index_tables[nb_bits-2]; + k0 = 1 << (nb_bits-2); + signmask = 1 << (nb_bits-1); + + while (get_bits_count(&gb) <= size - 22*avctx->channels) { + for (i = 0; i < avctx->channels; i++) { + *samples++ = c->status[i].predictor = get_sbits(&gb, 16); + c->status[i].step_index = get_bits(&gb, 6); + } + + for (count = 0; get_bits_count(&gb) <= size - nb_bits*avctx->channels && count < 4095; count++) { + int i; + + for (i = 0; i < avctx->channels; i++) { + // 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 k = k0; + + do { + if (delta & k) + vpdiff += step; + step >>= 1; + k >>= 1; + } while(k); + vpdiff += step; + + if (delta & signmask) + c->status[i].predictor -= vpdiff; + else + c->status[i].predictor += vpdiff; + + c->status[i].step_index += table[delta & (~signmask)]; + + c->status[i].step_index = av_clip(c->status[i].step_index, 0, 88); + c->status[i].predictor = av_clip_int16(c->status[i].predictor); + + *samples++ = c->status[i].predictor; + } + } + } +} + /** * Get the number of samples that will be decoded from the packet. * In one case, this is actually the maximum number of samples possible to @@ -350,7 +407,7 @@ static int xa_decode(AVCodecContext *avctx, * packet, or 0 if the codec does not encode the * number of samples in each frame. */ -static int get_nb_samples(AVCodecContext *avctx, const uint8_t *buf, +static int get_nb_samples(AVCodecContext *avctx, GetByteContext *gb, int buf_size, int *coded_samples) { ADPCMDecodeContext *s = avctx->priv_data; @@ -403,21 +460,17 @@ static int get_nb_samples(AVCodecContext *avctx, const uint8_t *buf, switch (avctx->codec->id) { case CODEC_ID_ADPCM_EA: has_coded_samples = 1; - if (buf_size < 4) - return 0; - *coded_samples = AV_RL32(buf); + *coded_samples = bytestream2_get_le32(gb); *coded_samples -= *coded_samples % 28; nb_samples = (buf_size - 12) / 30 * 28; break; case CODEC_ID_ADPCM_IMA_EA_EACS: has_coded_samples = 1; - if (buf_size < 4) - return 0; - *coded_samples = AV_RL32(buf); + *coded_samples = bytestream2_get_le32(gb); nb_samples = (buf_size - (4 + 8 * ch)) * 2 / ch; break; case CODEC_ID_ADPCM_EA_MAXIS_XA: - nb_samples = ((buf_size - ch) / (2 * ch)) * 2 * ch; + nb_samples = (buf_size - ch) / ch * 2; break; case CODEC_ID_ADPCM_EA_R1: case CODEC_ID_ADPCM_EA_R2: @@ -425,20 +478,18 @@ static int get_nb_samples(AVCodecContext *avctx, const uint8_t *buf, /* maximum number of samples */ /* has internal offsets and a per-frame switch to signal raw 16-bit */ has_coded_samples = 1; - if (buf_size < 4) - return 0; switch (avctx->codec->id) { case CODEC_ID_ADPCM_EA_R1: header_size = 4 + 9 * ch; - *coded_samples = AV_RL32(buf); + *coded_samples = bytestream2_get_le32(gb); break; case CODEC_ID_ADPCM_EA_R2: header_size = 4 + 5 * ch; - *coded_samples = AV_RL32(buf); + *coded_samples = bytestream2_get_le32(gb); break; case CODEC_ID_ADPCM_EA_R3: header_size = 4 + 5 * ch; - *coded_samples = AV_RB32(buf); + *coded_samples = bytestream2_get_be32(gb); break; } *coded_samples -= *coded_samples % 28; @@ -448,9 +499,11 @@ static int get_nb_samples(AVCodecContext *avctx, const uint8_t *buf, case CODEC_ID_ADPCM_IMA_DK3: if (avctx->block_align > 0) buf_size = FFMIN(buf_size, avctx->block_align); - nb_samples = ((buf_size - 16) * 8 / 3) / ch; + nb_samples = ((buf_size - 16) * 2 / 3 * 4) / ch; break; case CODEC_ID_ADPCM_IMA_DK4: + if (avctx->block_align > 0) + buf_size = FFMIN(buf_size, avctx->block_align); nb_samples = 1 + (buf_size - 4 * ch) * 2 / ch; break; case CODEC_ID_ADPCM_IMA_WAV: @@ -483,7 +536,7 @@ static int get_nb_samples(AVCodecContext *avctx, const uint8_t *buf, case CODEC_ID_ADPCM_SWF: { int buf_bits = buf_size * 8 - 2; - int nbits = (buf[0] >> 6) + 2; + int nbits = (bytestream2_get_byte(gb) >> 6) + 2; int block_hdr_size = 22 * ch; int block_size = block_hdr_size + nbits * ch * 4095; int nblocks = buf_bits / block_size; @@ -495,9 +548,8 @@ static int get_nb_samples(AVCodecContext *avctx, const uint8_t *buf, } case CODEC_ID_ADPCM_THP: has_coded_samples = 1; - if (buf_size < 8) - return 0; - *coded_samples = AV_RB32(&buf[4]); + bytestream2_skip(gb, 4); // channel size + *coded_samples = bytestream2_get_be32(gb); *coded_samples -= *coded_samples % 14; nb_samples = (buf_size - 80) / (8 * ch) * 14; break; @@ -513,24 +565,6 @@ static int get_nb_samples(AVCodecContext *avctx, const uint8_t *buf, return nb_samples; } -/* DK3 ADPCM support macro */ -#define DK3_GET_NEXT_NIBBLE() \ - if (decode_top_nibble_next) \ - { \ - nibble = last_byte >> 4; \ - decode_top_nibble_next = 0; \ - } \ - else \ - { \ - if (end_of_packet) \ - break; \ - last_byte = *src++; \ - if (src >= buf + buf_size) \ - end_of_packet = 1; \ - nibble = last_byte & 0x0F; \ - decode_top_nibble_next = 1; \ - } - static int adpcm_decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr, AVPacket *avpkt) { @@ -540,12 +574,13 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, ADPCMChannelStatus *cs; int n, m, channel, i; short *samples; - const uint8_t *src; int st; /* stereo */ int count1, count2; int nb_samples, coded_samples, ret; + GetByteContext gb; - nb_samples = get_nb_samples(avctx, buf, buf_size, &coded_samples); + bytestream2_init(&gb, buf, buf_size); + nb_samples = get_nb_samples(avctx, &gb, buf_size, &coded_samples); if (nb_samples <= 0) { av_log(avctx, AV_LOG_ERROR, "invalid number of samples in packet\n"); return AVERROR_INVALIDDATA; @@ -567,8 +602,6 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, c->frame.nb_samples = nb_samples = coded_samples; } - src = buf; - st = avctx->channels == 2 ? 1 : 0; switch(avctx->codec->id) { @@ -576,20 +609,18 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, /* In QuickTime, IMA is encoded by chunks of 34 bytes (=64 samples). Channel data is interleaved per-chunk. */ for (channel = 0; channel < avctx->channels; channel++) { - int16_t predictor; + int predictor; int step_index; cs = &(c->status[channel]); /* (pppppp) (piiiiiii) */ /* Bits 15-7 are the _top_ 9 bits of the 16-bit initial predictor value */ - predictor = AV_RB16(src); + predictor = sign_extend(bytestream2_get_be16u(&gb), 16); step_index = predictor & 0x7F; - predictor &= 0xFF80; - - src += 2; + predictor &= ~0x7F; if (cs->step_index == step_index) { - int diff = (int)predictor - cs->predictor; + int diff = predictor - cs->predictor; if (diff < 0) diff = - diff; if (diff > 0x7f) @@ -600,43 +631,41 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, cs->predictor = predictor; } - if (cs->step_index > 88){ - av_log(avctx, AV_LOG_ERROR, "ERROR: step_index = %i\n", cs->step_index); - cs->step_index = 88; + if (cs->step_index > 88u){ + av_log(avctx, AV_LOG_ERROR, "ERROR: step_index[%d] = %i\n", + channel, cs->step_index); + return AVERROR_INVALIDDATA; } samples = (short *)c->frame.data[0] + channel; for (m = 0; m < 32; m++) { - *samples = adpcm_ima_qt_expand_nibble(cs, src[0] & 0x0F, 3); + int byte = bytestream2_get_byteu(&gb); + *samples = adpcm_ima_qt_expand_nibble(cs, byte & 0x0F, 3); samples += avctx->channels; - *samples = adpcm_ima_qt_expand_nibble(cs, src[0] >> 4 , 3); + *samples = adpcm_ima_qt_expand_nibble(cs, byte >> 4 , 3); samples += avctx->channels; - src ++; } } break; case CODEC_ID_ADPCM_IMA_WAV: - if (avctx->block_align != 0 && buf_size > avctx->block_align) - buf_size = avctx->block_align; - for(i=0; i<avctx->channels; i++){ cs = &(c->status[i]); - cs->predictor = *samples++ = (int16_t)bytestream_get_le16(&src); + cs->predictor = *samples++ = sign_extend(bytestream2_get_le16u(&gb), 16); - cs->step_index = *src++; - if (cs->step_index > 88){ - av_log(avctx, AV_LOG_ERROR, "ERROR: step_index = %i\n", cs->step_index); - cs->step_index = 88; + cs->step_index = sign_extend(bytestream2_get_le16u(&gb), 16); + if (cs->step_index > 88u){ + av_log(avctx, AV_LOG_ERROR, "ERROR: step_index[%d] = %i\n", + i, cs->step_index); + return AVERROR_INVALIDDATA; } - if (*src++) av_log(avctx, AV_LOG_ERROR, "unused byte should be null but is %d!!\n", src[-1]); /* unused */ } for (n = (nb_samples - 1) / 8; n > 0; n--) { for (i = 0; i < avctx->channels; i++) { cs = &c->status[i]; for (m = 0; m < 4; m++) { - uint8_t v = *src++; + int v = bytestream2_get_byteu(&gb); *samples = adpcm_ima_expand_nibble(cs, v & 0x0F, 3); samples += avctx->channels; *samples = adpcm_ima_expand_nibble(cs, v >> 4 , 3); @@ -649,18 +678,22 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, break; case CODEC_ID_ADPCM_4XM: for (i = 0; i < avctx->channels; i++) - c->status[i].predictor= (int16_t)bytestream_get_le16(&src); + c->status[i].predictor = sign_extend(bytestream2_get_le16u(&gb), 16); for (i = 0; i < avctx->channels; i++) { - c->status[i].step_index= (int16_t)bytestream_get_le16(&src); - c->status[i].step_index = av_clip(c->status[i].step_index, 0, 88); + c->status[i].step_index = sign_extend(bytestream2_get_le16u(&gb), 16); + if (c->status[i].step_index > 88u) { + av_log(avctx, AV_LOG_ERROR, "ERROR: step_index[%d] = %i\n", + i, c->status[i].step_index); + return AVERROR_INVALIDDATA; + } } for (i = 0; i < avctx->channels; i++) { samples = (short *)c->frame.data[0] + i; cs = &c->status[i]; - for (n = nb_samples >> 1; n > 0; n--, src++) { - uint8_t v = *src; + for (n = nb_samples >> 1; n > 0; n--) { + int v = bytestream2_get_byteu(&gb); *samples = adpcm_ima_expand_nibble(cs, v & 0x0F, 4); samples += avctx->channels; *samples = adpcm_ima_expand_nibble(cs, v >> 4 , 4); @@ -672,76 +705,95 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, { int block_predictor; - if (avctx->block_align != 0 && buf_size > avctx->block_align) - buf_size = avctx->block_align; - - block_predictor = av_clip(*src++, 0, 6); + block_predictor = bytestream2_get_byteu(&gb); + if (block_predictor > 6) { + av_log(avctx, AV_LOG_ERROR, "ERROR: block_predictor[0] = %d\n", + block_predictor); + return AVERROR_INVALIDDATA; + } c->status[0].coeff1 = ff_adpcm_AdaptCoeff1[block_predictor]; c->status[0].coeff2 = ff_adpcm_AdaptCoeff2[block_predictor]; if (st) { - block_predictor = av_clip(*src++, 0, 6); + block_predictor = bytestream2_get_byteu(&gb); + if (block_predictor > 6) { + av_log(avctx, AV_LOG_ERROR, "ERROR: block_predictor[1] = %d\n", + block_predictor); + return AVERROR_INVALIDDATA; + } c->status[1].coeff1 = ff_adpcm_AdaptCoeff1[block_predictor]; c->status[1].coeff2 = ff_adpcm_AdaptCoeff2[block_predictor]; } - c->status[0].idelta = (int16_t)bytestream_get_le16(&src); + c->status[0].idelta = sign_extend(bytestream2_get_le16u(&gb), 16); if (st){ - c->status[1].idelta = (int16_t)bytestream_get_le16(&src); + c->status[1].idelta = sign_extend(bytestream2_get_le16u(&gb), 16); } - c->status[0].sample1 = bytestream_get_le16(&src); - if (st) c->status[1].sample1 = bytestream_get_le16(&src); - c->status[0].sample2 = bytestream_get_le16(&src); - if (st) c->status[1].sample2 = bytestream_get_le16(&src); + c->status[0].sample1 = sign_extend(bytestream2_get_le16u(&gb), 16); + if (st) c->status[1].sample1 = sign_extend(bytestream2_get_le16u(&gb), 16); + c->status[0].sample2 = sign_extend(bytestream2_get_le16u(&gb), 16); + if (st) c->status[1].sample2 = sign_extend(bytestream2_get_le16u(&gb), 16); *samples++ = c->status[0].sample2; if (st) *samples++ = c->status[1].sample2; *samples++ = c->status[0].sample1; if (st) *samples++ = c->status[1].sample1; - for(n = (nb_samples - 2) >> (1 - st); n > 0; n--, src++) { - *samples++ = adpcm_ms_expand_nibble(&c->status[0 ], src[0] >> 4 ); - *samples++ = adpcm_ms_expand_nibble(&c->status[st], src[0] & 0x0F); + for(n = (nb_samples - 2) >> (1 - st); n > 0; n--) { + int byte = bytestream2_get_byteu(&gb); + *samples++ = adpcm_ms_expand_nibble(&c->status[0 ], byte >> 4 ); + *samples++ = adpcm_ms_expand_nibble(&c->status[st], byte & 0x0F); } break; } case CODEC_ID_ADPCM_IMA_DK4: - if (avctx->block_align != 0 && buf_size > avctx->block_align) - buf_size = avctx->block_align; - for (channel = 0; channel < avctx->channels; channel++) { cs = &c->status[channel]; - cs->predictor = (int16_t)bytestream_get_le16(&src); - cs->step_index = av_clip(*src++, 0, 88); - src++; - *samples++ = cs->predictor; + cs->predictor = *samples++ = sign_extend(bytestream2_get_le16u(&gb), 16); + cs->step_index = sign_extend(bytestream2_get_le16u(&gb), 16); + 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++) { - uint8_t v = *src; + for (n = nb_samples >> (1 - st); n > 0; n--) { + int v = bytestream2_get_byteu(&gb); *samples++ = adpcm_ima_expand_nibble(&c->status[0 ], v >> 4 , 3); *samples++ = adpcm_ima_expand_nibble(&c->status[st], v & 0x0F, 3); } break; case CODEC_ID_ADPCM_IMA_DK3: { - unsigned char last_byte = 0; - unsigned char nibble; + int last_byte = 0; + int nibble; int decode_top_nibble_next = 0; - int end_of_packet = 0; int diff_channel; - - if (avctx->block_align != 0 && buf_size > avctx->block_align) - buf_size = avctx->block_align; - - c->status[0].predictor = (int16_t)AV_RL16(src + 10); - c->status[1].predictor = (int16_t)AV_RL16(src + 12); - c->status[0].step_index = av_clip(src[14], 0, 88); - c->status[1].step_index = av_clip(src[15], 0, 88); + const int16_t *samples_end = samples + avctx->channels * nb_samples; + + bytestream2_skipu(&gb, 10); + c->status[0].predictor = sign_extend(bytestream2_get_le16u(&gb), 16); + c->status[1].predictor = sign_extend(bytestream2_get_le16u(&gb), 16); + c->status[0].step_index = bytestream2_get_byteu(&gb); + c->status[1].step_index = bytestream2_get_byteu(&gb); + if (c->status[0].step_index > 88u || c->status[1].step_index > 88u){ + av_log(avctx, AV_LOG_ERROR, "ERROR: step_index = %i/%i\n", + c->status[0].step_index, c->status[1].step_index); + return AVERROR_INVALIDDATA; + } /* sign extend the predictors */ - src += 16; diff_channel = c->status[1].predictor; - /* the DK3_GET_NEXT_NIBBLE macro issues the break statement when - * the buffer is consumed */ - while (1) { + /* DK3 ADPCM support macro */ +#define DK3_GET_NEXT_NIBBLE() \ + if (decode_top_nibble_next) { \ + nibble = last_byte >> 4; \ + decode_top_nibble_next = 0; \ + } else { \ + last_byte = bytestream2_get_byteu(&gb); \ + nibble = last_byte & 0x0F; \ + decode_top_nibble_next = 1; \ + } + + while (samples < samples_end) { /* for this algorithm, c->status[0] is the sum channel and * c->status[1] is the diff channel */ @@ -773,14 +825,18 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, case CODEC_ID_ADPCM_IMA_ISS: for (channel = 0; channel < avctx->channels; channel++) { cs = &c->status[channel]; - cs->predictor = (int16_t)bytestream_get_le16(&src); - cs->step_index = av_clip(*src++, 0, 88); - src++; + cs->predictor = sign_extend(bytestream2_get_le16u(&gb), 16); + cs->step_index = sign_extend(bytestream2_get_le16u(&gb), 16); + 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++) { - uint8_t v1, v2; - uint8_t v = *src; + for (n = nb_samples >> (1 - st); n > 0; n--) { + int v1, v2; + int v = bytestream2_get_byteu(&gb); /* nibbles are swapped for mono */ if (st) { v1 = v >> 4; @@ -794,72 +850,78 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, } break; case CODEC_ID_ADPCM_IMA_APC: - while (src < buf + buf_size) { - uint8_t v = *src++; + while (bytestream2_get_bytes_left(&gb) > 0) { + int v = bytestream2_get_byteu(&gb); *samples++ = adpcm_ima_expand_nibble(&c->status[0], v >> 4 , 3); *samples++ = adpcm_ima_expand_nibble(&c->status[st], v & 0x0F, 3); } break; case CODEC_ID_ADPCM_IMA_WS: - for (channel = 0; channel < avctx->channels; channel++) { - const uint8_t *src0; - int src_stride; - int16_t *smp = samples + channel; - - if (c->vqa_version == 3) { - src0 = src + channel * buf_size / 2; - src_stride = 1; - } else { - src0 = src + channel; - src_stride = avctx->channels; + if (c->vqa_version == 3) { + for (channel = 0; channel < avctx->channels; channel++) { + int16_t *smp = samples + channel; + + for (n = nb_samples / 2; n > 0; n--) { + int v = bytestream2_get_byteu(&gb); + *smp = adpcm_ima_expand_nibble(&c->status[channel], v >> 4 , 3); + smp += avctx->channels; + *smp = adpcm_ima_expand_nibble(&c->status[channel], v & 0x0F, 3); + smp += avctx->channels; + } } + } else { for (n = nb_samples / 2; n > 0; n--) { - uint8_t v = *src0; - src0 += src_stride; - *smp = adpcm_ima_expand_nibble(&c->status[channel], v >> 4 , 3); - smp += avctx->channels; - *smp = adpcm_ima_expand_nibble(&c->status[channel], v & 0x0F, 3); - smp += avctx->channels; + for (channel = 0; channel < avctx->channels; channel++) { + int v = bytestream2_get_byteu(&gb); + *samples++ = adpcm_ima_expand_nibble(&c->status[channel], v >> 4 , 3); + samples[st] = adpcm_ima_expand_nibble(&c->status[channel], v & 0x0F, 3); + } + samples += avctx->channels; } } - src = buf + buf_size; + bytestream2_seek(&gb, 0, SEEK_END); break; case CODEC_ID_ADPCM_XA: - while (buf_size >= 128) { - if ((ret = xa_decode(avctx, samples, src, &c->status[0], + while (bytestream2_get_bytes_left(&gb) >= 128) { + if ((ret = xa_decode(avctx, samples, buf + bytestream2_tell(&gb), &c->status[0], &c->status[1], avctx->channels)) < 0) return ret; - src += 128; + bytestream2_skipu(&gb, 128); samples += 28 * 8; - buf_size -= 128; } break; case CODEC_ID_ADPCM_IMA_EA_EACS: - src += 4; // skip sample count (already read) - - for (i=0; i<=st; i++) - c->status[i].step_index = av_clip(bytestream_get_le32(&src), 0, 88); + for (i=0; i<=st; i++) { + c->status[i].step_index = bytestream2_get_le32u(&gb); + if (c->status[i].step_index > 88u) { + av_log(avctx, AV_LOG_ERROR, "ERROR: step_index[%d] = %i\n", + i, c->status[i].step_index); + return AVERROR_INVALIDDATA; + } + } for (i=0; i<=st; i++) - c->status[i].predictor = bytestream_get_le32(&src); + c->status[i].predictor = bytestream2_get_le32u(&gb); - for (n = nb_samples >> (1 - st); n > 0; n--, src++) { - *samples++ = adpcm_ima_expand_nibble(&c->status[0], *src>>4, 3); - *samples++ = adpcm_ima_expand_nibble(&c->status[st], *src&0x0F, 3); + for (n = nb_samples >> (1 - st); n > 0; n--) { + int byte = bytestream2_get_byteu(&gb); + *samples++ = adpcm_ima_expand_nibble(&c->status[0], byte >> 4, 3); + *samples++ = adpcm_ima_expand_nibble(&c->status[st], byte & 0x0F, 3); } break; case CODEC_ID_ADPCM_IMA_EA_SEAD: - for (n = nb_samples >> (1 - st); n > 0; n--, src++) { - *samples++ = adpcm_ima_expand_nibble(&c->status[0], src[0] >> 4, 6); - *samples++ = adpcm_ima_expand_nibble(&c->status[st],src[0]&0x0F, 6); + for (n = nb_samples >> (1 - st); n > 0; n--) { + int byte = bytestream2_get_byteu(&gb); + *samples++ = adpcm_ima_expand_nibble(&c->status[0], byte >> 4, 6); + *samples++ = adpcm_ima_expand_nibble(&c->status[st], byte & 0x0F, 6); } break; case CODEC_ID_ADPCM_EA: { - int32_t previous_left_sample, previous_right_sample; - int32_t current_left_sample, current_right_sample; - int32_t next_left_sample, next_right_sample; - int32_t coeff1l, coeff2l, coeff1r, coeff2r; - uint8_t shift_left, shift_right; + int previous_left_sample, previous_right_sample; + int current_left_sample, current_right_sample; + int next_left_sample, next_right_sample; + int coeff1l, coeff2l, coeff1r, coeff2r; + int shift_left, shift_right; /* Each EA ADPCM frame has a 12-byte header followed by 30-byte pieces, each coding 28 stereo samples. */ @@ -867,28 +929,26 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, if(avctx->channels != 2) return AVERROR_INVALIDDATA; - src += 4; // skip sample count (already read) - - current_left_sample = (int16_t)bytestream_get_le16(&src); - previous_left_sample = (int16_t)bytestream_get_le16(&src); - current_right_sample = (int16_t)bytestream_get_le16(&src); - previous_right_sample = (int16_t)bytestream_get_le16(&src); + current_left_sample = sign_extend(bytestream2_get_le16u(&gb), 16); + previous_left_sample = sign_extend(bytestream2_get_le16u(&gb), 16); + current_right_sample = sign_extend(bytestream2_get_le16u(&gb), 16); + previous_right_sample = sign_extend(bytestream2_get_le16u(&gb), 16); for (count1 = 0; count1 < nb_samples / 28; count1++) { - coeff1l = ea_adpcm_table[ *src >> 4 ]; - coeff2l = ea_adpcm_table[(*src >> 4 ) + 4]; - coeff1r = ea_adpcm_table[*src & 0x0F]; - coeff2r = ea_adpcm_table[(*src & 0x0F) + 4]; - src++; + int byte = bytestream2_get_byteu(&gb); + coeff1l = ea_adpcm_table[ byte >> 4 ]; + coeff2l = ea_adpcm_table[(byte >> 4 ) + 4]; + coeff1r = ea_adpcm_table[ byte & 0x0F]; + coeff2r = ea_adpcm_table[(byte & 0x0F) + 4]; - shift_left = 20 - (*src >> 4); - shift_right = 20 - (*src & 0x0F); - src++; + byte = bytestream2_get_byteu(&gb); + shift_left = 20 - (byte >> 4); + shift_right = 20 - (byte & 0x0F); for (count2 = 0; count2 < 28; count2++) { - next_left_sample = sign_extend(*src >> 4, 4) << shift_left; - next_right_sample = sign_extend(*src, 4) << shift_right; - src++; + byte = bytestream2_get_byteu(&gb); + next_left_sample = sign_extend(byte >> 4, 4) << shift_left; + next_right_sample = sign_extend(byte, 4) << shift_right; next_left_sample = (next_left_sample + (current_left_sample * coeff1l) + @@ -901,13 +961,12 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, current_left_sample = av_clip_int16(next_left_sample); previous_right_sample = current_right_sample; current_right_sample = av_clip_int16(next_right_sample); - *samples++ = (unsigned short)current_left_sample; - *samples++ = (unsigned short)current_right_sample; + *samples++ = current_left_sample; + *samples++ = current_right_sample; } } - if (src - buf == buf_size - 2) - src += 2; // Skip terminating 0x0000 + bytestream2_skip(&gb, 2); // Skip terminating 0x0000 break; } @@ -916,15 +975,19 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, int coeff[2][2], shift[2]; for(channel = 0; channel < avctx->channels; channel++) { + int byte = bytestream2_get_byteu(&gb); for (i=0; i<2; i++) - coeff[channel][i] = ea_adpcm_table[(*src >> 4) + 4*i]; - shift[channel] = 20 - (*src & 0x0F); - src++; + coeff[channel][i] = ea_adpcm_table[(byte >> 4) + 4*i]; + shift[channel] = 20 - (byte & 0x0F); } for (count1 = 0; count1 < nb_samples / 2; count1++) { + int byte[2]; + + byte[0] = bytestream2_get_byteu(&gb); + if (st) byte[1] = bytestream2_get_byteu(&gb); for(i = 4; i >= 0; i-=4) { /* Pairwise samples LL RR (st) or LL LL (mono) */ for(channel = 0; channel < avctx->channels; channel++) { - int32_t sample = sign_extend(src[channel] >> i, 4) << shift[channel]; + int sample = sign_extend(byte[channel] >> i, 4) << shift[channel]; sample = (sample + c->status[channel].sample1 * coeff[channel][0] + c->status[channel].sample2 * coeff[channel][1] + 0x80) >> 8; @@ -933,10 +996,8 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, *samples++ = c->status[channel].sample1; } } - src+=avctx->channels; } - /* consume whole packet */ - src = buf + buf_size; + bytestream2_seek(&gb, 0, SEEK_END); break; } case CODEC_ID_ADPCM_EA_R1: @@ -947,56 +1008,53 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, 4chan: 0=fl, 1=rl, 2=fr, 3=rr 6chan: 0=fl, 1=c, 2=fr, 3=rl, 4=rr, 5=sub */ const int big_endian = avctx->codec->id == CODEC_ID_ADPCM_EA_R3; - int32_t previous_sample, current_sample, next_sample; - int32_t coeff1, coeff2; - uint8_t shift; + int previous_sample, current_sample, next_sample; + int coeff1, coeff2; + int shift; unsigned int channel; uint16_t *samplesC; - const uint8_t *srcC; - const uint8_t *src_end = buf + buf_size; int count = 0; + int offsets[6]; - src += 4; // skip sample count (already read) + for (channel=0; channel<avctx->channels; channel++) + offsets[channel] = (big_endian ? bytestream2_get_be32(&gb) : + bytestream2_get_le32(&gb)) + + (avctx->channels + 1) * 4; for (channel=0; channel<avctx->channels; channel++) { - int32_t offset = (big_endian ? bytestream_get_be32(&src) - : bytestream_get_le32(&src)) - + (avctx->channels-channel-1) * 4; - - if ((offset < 0) || (offset >= src_end - src - 4)) break; - srcC = src + offset; + bytestream2_seek(&gb, offsets[channel], SEEK_SET); samplesC = samples + channel; if (avctx->codec->id == CODEC_ID_ADPCM_EA_R1) { - current_sample = (int16_t)bytestream_get_le16(&srcC); - previous_sample = (int16_t)bytestream_get_le16(&srcC); + current_sample = sign_extend(bytestream2_get_le16(&gb), 16); + previous_sample = sign_extend(bytestream2_get_le16(&gb), 16); } else { current_sample = c->status[channel].predictor; previous_sample = c->status[channel].prev_sample; } for (count1 = 0; count1 < nb_samples / 28; count1++) { - if (*srcC == 0xEE) { /* only seen in R2 and R3 */ - srcC++; - if (srcC > src_end - 30*2) break; - current_sample = (int16_t)bytestream_get_be16(&srcC); - previous_sample = (int16_t)bytestream_get_be16(&srcC); + int byte = bytestream2_get_byte(&gb); + if (byte == 0xEE) { /* only seen in R2 and R3 */ + current_sample = sign_extend(bytestream2_get_be16(&gb), 16); + previous_sample = sign_extend(bytestream2_get_be16(&gb), 16); for (count2=0; count2<28; count2++) { - *samplesC = (int16_t)bytestream_get_be16(&srcC); + *samplesC = sign_extend(bytestream2_get_be16(&gb), 16); samplesC += avctx->channels; } } else { - coeff1 = ea_adpcm_table[ *srcC>>4 ]; - coeff2 = ea_adpcm_table[(*srcC>>4) + 4]; - shift = 20 - (*srcC++ & 0x0F); + coeff1 = ea_adpcm_table[ byte >> 4 ]; + coeff2 = ea_adpcm_table[(byte >> 4) + 4]; + shift = 20 - (byte & 0x0F); - if (srcC > src_end - 14) break; for (count2=0; count2<28; count2++) { if (count2 & 1) - next_sample = sign_extend(*srcC++, 4) << shift; - else - next_sample = sign_extend(*srcC >> 4, 4) << shift; + next_sample = sign_extend(byte, 4) << shift; + else { + byte = bytestream2_get_byte(&gb); + next_sample = sign_extend(byte >> 4, 4) << shift; + } next_sample += (current_sample * coeff1) + (previous_sample * coeff2); @@ -1023,7 +1081,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, } c->frame.nb_samples = count * 28; - src = src_end; + bytestream2_seek(&gb, 0, SEEK_END); break; } case CODEC_ID_ADPCM_EA_XAS: @@ -1031,18 +1089,22 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, int coeff[2][4], shift[4]; short *s2, *s = &samples[channel]; for (n=0; n<4; n++, s+=32*avctx->channels) { + int val = sign_extend(bytestream2_get_le16u(&gb), 16); for (i=0; i<2; i++) - coeff[i][n] = ea_adpcm_table[(src[0]&0x0F)+4*i]; - shift[n] = 20 - (src[2] & 0x0F); - for (s2=s, i=0; i<2; i++, src+=2, s2+=avctx->channels) - s2[0] = (src[0]&0xF0) + (src[1]<<8); + coeff[i][n] = ea_adpcm_table[(val&0x0F)+4*i]; + s[0] = val & ~0x0F; + + val = sign_extend(bytestream2_get_le16u(&gb), 16); + shift[n] = 20 - (val & 0x0F); + s[avctx->channels] = val & ~0x0F; } for (m=2; m<32; m+=2) { s = &samples[m*avctx->channels + channel]; - for (n=0; n<4; n++, src++, s+=32*avctx->channels) { + for (n=0; n<4; n++, s+=32*avctx->channels) { + int byte = bytestream2_get_byteu(&gb); for (s2=s, i=0; i<8; i+=4, s2+=avctx->channels) { - int level = sign_extend(*src >> (4 - i), 4) << shift[n]; + int level = sign_extend(byte >> (4 - i), 4) << shift[n]; int pred = s2[-1*avctx->channels] * coeff[0][n] + s2[-2*avctx->channels] * coeff[1][n]; s2[0] = av_clip_int16((level + pred + 0x80) >> 8); @@ -1054,32 +1116,38 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, case CODEC_ID_ADPCM_IMA_AMV: case CODEC_ID_ADPCM_IMA_SMJPEG: if (avctx->codec->id == CODEC_ID_ADPCM_IMA_AMV) { - c->status[0].predictor = sign_extend(bytestream_get_le16(&src), 16); - c->status[0].step_index = av_clip(bytestream_get_le16(&src), 0, 88); - src += 4; + c->status[0].predictor = sign_extend(bytestream2_get_le16u(&gb), 16); + c->status[0].step_index = bytestream2_get_le16u(&gb); + bytestream2_skipu(&gb, 4); } else { - c->status[0].predictor = sign_extend(bytestream_get_be16(&src), 16); - c->status[0].step_index = av_clip(bytestream_get_byte(&src), 0, 88); - src += 1; + c->status[0].predictor = sign_extend(bytestream2_get_be16u(&gb), 16); + c->status[0].step_index = bytestream2_get_byteu(&gb); + bytestream2_skipu(&gb, 1); + } + if (c->status[0].step_index > 88u) { + av_log(avctx, AV_LOG_ERROR, "ERROR: step_index = %i\n", + c->status[0].step_index); + return AVERROR_INVALIDDATA; } - for (n = nb_samples >> (1 - st); n > 0; n--, src++) { - char hi, lo; - lo = *src & 0x0F; - hi = *src >> 4; + for (n = nb_samples >> (1 - st); n > 0; n--) { + int hi, lo, v = bytestream2_get_byteu(&gb); - if (avctx->codec->id == CODEC_ID_ADPCM_IMA_AMV) - FFSWAP(char, hi, lo); + if (avctx->codec->id == CODEC_ID_ADPCM_IMA_AMV) { + hi = v & 0x0F; + lo = v >> 4; + } else { + lo = v & 0x0F; + hi = v >> 4; + } - *samples++ = adpcm_ima_expand_nibble(&c->status[0], - lo, 3); - *samples++ = adpcm_ima_expand_nibble(&c->status[0], - hi, 3); + *samples++ = adpcm_ima_expand_nibble(&c->status[0], lo, 3); + *samples++ = adpcm_ima_expand_nibble(&c->status[0], hi, 3); } break; case CODEC_ID_ADPCM_CT: - for (n = nb_samples >> (1 - st); n > 0; n--, src++) { - uint8_t v = *src; + for (n = nb_samples >> (1 - st); n > 0; n--) { + int v = bytestream2_get_byteu(&gb); *samples++ = adpcm_ct_expand_nibble(&c->status[0 ], v >> 4 ); *samples++ = adpcm_ct_expand_nibble(&c->status[st], v & 0x0F); } @@ -1089,101 +1157,51 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, case CODEC_ID_ADPCM_SBPRO_2: if (!c->status[0].step_index) { /* the first byte is a raw sample */ - *samples++ = 128 * (*src++ - 0x80); + *samples++ = 128 * (bytestream2_get_byteu(&gb) - 0x80); if (st) - *samples++ = 128 * (*src++ - 0x80); + *samples++ = 128 * (bytestream2_get_byteu(&gb) - 0x80); c->status[0].step_index = 1; nb_samples--; } if (avctx->codec->id == CODEC_ID_ADPCM_SBPRO_4) { - for (n = nb_samples >> (1 - st); n > 0; n--, src++) { + for (n = nb_samples >> (1 - st); n > 0; n--) { + int byte = bytestream2_get_byteu(&gb); *samples++ = adpcm_sbpro_expand_nibble(&c->status[0], - src[0] >> 4, 4, 0); + byte >> 4, 4, 0); *samples++ = adpcm_sbpro_expand_nibble(&c->status[st], - src[0] & 0x0F, 4, 0); + byte & 0x0F, 4, 0); } } else if (avctx->codec->id == CODEC_ID_ADPCM_SBPRO_3) { - for (n = nb_samples / 3; n > 0; n--, src++) { + for (n = nb_samples / 3; n > 0; n--) { + int byte = bytestream2_get_byteu(&gb); *samples++ = adpcm_sbpro_expand_nibble(&c->status[0], - src[0] >> 5 , 3, 0); + byte >> 5 , 3, 0); *samples++ = adpcm_sbpro_expand_nibble(&c->status[0], - (src[0] >> 2) & 0x07, 3, 0); + (byte >> 2) & 0x07, 3, 0); *samples++ = adpcm_sbpro_expand_nibble(&c->status[0], - src[0] & 0x03, 2, 0); + byte & 0x03, 2, 0); } } else { - for (n = nb_samples >> (2 - st); n > 0; n--, src++) { + for (n = nb_samples >> (2 - st); n > 0; n--) { + int byte = bytestream2_get_byteu(&gb); *samples++ = adpcm_sbpro_expand_nibble(&c->status[0], - src[0] >> 6 , 2, 2); + byte >> 6 , 2, 2); *samples++ = adpcm_sbpro_expand_nibble(&c->status[st], - (src[0] >> 4) & 0x03, 2, 2); + (byte >> 4) & 0x03, 2, 2); *samples++ = adpcm_sbpro_expand_nibble(&c->status[0], - (src[0] >> 2) & 0x03, 2, 2); + (byte >> 2) & 0x03, 2, 2); *samples++ = adpcm_sbpro_expand_nibble(&c->status[st], - src[0] & 0x03, 2, 2); + byte & 0x03, 2, 2); } } break; case CODEC_ID_ADPCM_SWF: - { - GetBitContext gb; - const int *table; - int k0, signmask, nb_bits, count; - int size = buf_size*8; - - init_get_bits(&gb, buf, size); - - //read bits & initial values - nb_bits = get_bits(&gb, 2)+2; - //av_log(NULL,AV_LOG_INFO,"nb_bits: %d\n", nb_bits); - table = swf_index_tables[nb_bits-2]; - k0 = 1 << (nb_bits-2); - signmask = 1 << (nb_bits-1); - - while (get_bits_count(&gb) <= size - 22*avctx->channels) { - for (i = 0; i < avctx->channels; i++) { - *samples++ = c->status[i].predictor = get_sbits(&gb, 16); - c->status[i].step_index = get_bits(&gb, 6); - } - - for (count = 0; get_bits_count(&gb) <= size - nb_bits*avctx->channels && count < 4095; count++) { - int i; - - for (i = 0; i < avctx->channels; i++) { - // 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 k = k0; - - do { - if (delta & k) - vpdiff += step; - step >>= 1; - k >>= 1; - } while(k); - vpdiff += step; - - if (delta & signmask) - c->status[i].predictor -= vpdiff; - else - c->status[i].predictor += vpdiff; - - c->status[i].step_index += table[delta & (~signmask)]; - - c->status[i].step_index = av_clip(c->status[i].step_index, 0, 88); - c->status[i].predictor = av_clip_int16(c->status[i].predictor); - - *samples++ = c->status[i].predictor; - } - } - } - src += buf_size; + adpcm_swf_decode(avctx, buf, buf_size, samples); + bytestream2_seek(&gb, 0, SEEK_END); break; - } case CODEC_ID_ADPCM_YAMAHA: - for (n = nb_samples >> (1 - st); n > 0; n--, src++) { - uint8_t v = *src; + for (n = nb_samples >> (1 - st); n > 0; n--) { + int v = bytestream2_get_byteu(&gb); *samples++ = adpcm_yamaha_expand_nibble(&c->status[0 ], v & 0x0F); *samples++ = adpcm_yamaha_expand_nibble(&c->status[st], v >> 4 ); } @@ -1194,31 +1212,34 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, int prev[2][2]; int ch; - src += 4; // skip channel size - src += 4; // skip number of samples (already read) - for (i = 0; i < 32; i++) - table[0][i] = (int16_t)bytestream_get_be16(&src); + table[0][i] = sign_extend(bytestream2_get_be16u(&gb), 16); /* Initialize the previous sample. */ for (i = 0; i < 4; i++) - prev[i>>1][i&1] = (int16_t)bytestream_get_be16(&src); + prev[i>>1][i&1] = sign_extend(bytestream2_get_be16u(&gb), 16); for (ch = 0; ch <= st; ch++) { samples = (short *)c->frame.data[0] + ch; /* Read in every sample for this channel. */ for (i = 0; i < nb_samples / 14; i++) { - int index = (*src >> 4) & 7; - unsigned int exp = *src++ & 15; + int byte = bytestream2_get_byteu(&gb); + int index = (byte >> 4) & 7; + unsigned int exp = byte & 0x0F; int factor1 = table[ch][index * 2]; int factor2 = table[ch][index * 2 + 1]; /* Decode 14 samples. */ for (n = 0; n < 14; n++) { int32_t sampledat; - if(n&1) sampledat = sign_extend(*src++, 4); - else sampledat = sign_extend(*src >> 4, 4); + + if (n & 1) { + sampledat = sign_extend(byte, 4); + } else { + byte = bytestream2_get_byteu(&gb); + sampledat = sign_extend(byte >> 4, 4); + } sampledat = ((prev[ch][0]*factor1 + prev[ch][1]*factor2) >> 11) + (sampledat << exp); @@ -1242,7 +1263,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, *got_frame_ptr = 1; *(AVFrame *)data = c->frame; - return src - buf; + return bytestream2_tell(&gb); } |