X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fadpcm.c;h=b6a20e2c322012840c12d98c91081d787b6796b0;hb=4e13e50432bd1c1a89f626f8196b55a0302c8f19;hp=be10f88de8e70a8fa38589d92f5394fe54d2ffb0;hpb=a57ea1a87e6b65194718968fe0b778e843d4d4b0;p=ffmpeg diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index be10f88de8e..b6a20e2c322 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -84,46 +84,80 @@ static const int swf_index_tables[4][16] = { /* end of tables */ typedef struct ADPCMDecodeContext { + AVFrame frame; ADPCMChannelStatus status[6]; + int vqa_version; /**< VQA version. Used for ADPCM_IMA_WS */ } ADPCMDecodeContext; static av_cold int adpcm_decode_init(AVCodecContext * avctx) { ADPCMDecodeContext *c = avctx->priv_data; + unsigned int min_channels = 1; unsigned int max_channels = 2; switch(avctx->codec->id) { - case CODEC_ID_ADPCM_EA_R1: - case CODEC_ID_ADPCM_EA_R2: - case CODEC_ID_ADPCM_EA_R3: - case CODEC_ID_ADPCM_EA_XAS: + case AV_CODEC_ID_ADPCM_EA: + min_channels = 2; + break; + case AV_CODEC_ID_ADPCM_EA_R1: + case AV_CODEC_ID_ADPCM_EA_R2: + case AV_CODEC_ID_ADPCM_EA_R3: + case AV_CODEC_ID_ADPCM_EA_XAS: max_channels = 6; break; } - if(avctx->channels > max_channels){ - return -1; + if (avctx->channels < min_channels || avctx->channels > max_channels) { + av_log(avctx, AV_LOG_ERROR, "Invalid number of channels\n"); + return AVERROR(EINVAL); } switch(avctx->codec->id) { - case CODEC_ID_ADPCM_CT: + case AV_CODEC_ID_ADPCM_CT: c->status[0].step = c->status[1].step = 511; break; - case CODEC_ID_ADPCM_IMA_WAV: + case AV_CODEC_ID_ADPCM_IMA_WAV: if (avctx->bits_per_coded_sample != 4) { av_log(avctx, AV_LOG_ERROR, "Only 4-bit ADPCM IMA WAV files are supported\n"); return -1; } break; - case CODEC_ID_ADPCM_IMA_WS: - if (avctx->extradata && avctx->extradata_size == 2 * 4) { + case AV_CODEC_ID_ADPCM_IMA_APC: + if (avctx->extradata && avctx->extradata_size >= 8) { c->status[0].predictor = AV_RL32(avctx->extradata); c->status[1].predictor = AV_RL32(avctx->extradata + 4); } break; + case AV_CODEC_ID_ADPCM_IMA_WS: + if (avctx->extradata && avctx->extradata_size >= 2) + c->vqa_version = AV_RL16(avctx->extradata); + break; default: break; } - avctx->sample_fmt = AV_SAMPLE_FMT_S16; + + switch(avctx->codec->id) { + case AV_CODEC_ID_ADPCM_IMA_QT: + case AV_CODEC_ID_ADPCM_IMA_WAV: + case AV_CODEC_ID_ADPCM_4XM: + case AV_CODEC_ID_ADPCM_XA: + case AV_CODEC_ID_ADPCM_EA_R1: + case AV_CODEC_ID_ADPCM_EA_R2: + case AV_CODEC_ID_ADPCM_EA_R3: + case AV_CODEC_ID_ADPCM_EA_XAS: + case AV_CODEC_ID_ADPCM_THP: + avctx->sample_fmt = AV_SAMPLE_FMT_S16P; + break; + case AV_CODEC_ID_ADPCM_IMA_WS: + avctx->sample_fmt = c->vqa_version == 3 ? AV_SAMPLE_FMT_S16P : + AV_SAMPLE_FMT_S16; + break; + default: + avctx->sample_fmt = AV_SAMPLE_FMT_S16; + } + + avcodec_get_frame_defaults(&c->frame); + avctx->coded_frame = &c->frame; + return 0; } @@ -135,8 +169,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; @@ -180,12 +213,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); @@ -250,18 +283,30 @@ static inline short adpcm_yamaha_expand_nibble(ADPCMChannelStatus *c, unsigned c return c->predictor; } -static void xa_decode(short *out, const unsigned char *in, - ADPCMChannelStatus *left, ADPCMChannelStatus *right, int inc) +static int xa_decode(AVCodecContext *avctx, int16_t *out0, int16_t *out1, + const uint8_t *in, ADPCMChannelStatus *left, + ADPCMChannelStatus *right, int channels, int sample_offset) { int i, j; int shift,filter,f0,f1; int s_1,s_2; int d,s,t; - for(i=0;i<4;i++) { + out0 += sample_offset; + if (channels == 1) + out1 = out0 + 28; + else + out1 += sample_offset; + for(i=0;i<4;i++) { shift = 12 - (in[4+i*2] & 15); filter = in[4+i*2] >> 4; + if (filter > 4) { + av_log(avctx, AV_LOG_ERROR, + "Invalid XA-ADPCM filter %d (max. allowed is 4)\n", + filter); + return AVERROR_INVALIDDATA; + } f0 = xa_adpcm_table[filter][0]; f1 = xa_adpcm_table[filter][1]; @@ -271,69 +316,279 @@ static void xa_decode(short *out, const unsigned char *in, 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<>6); s_2 = s_1; s_1 = av_clip_int16(s); - *out = s_1; - out += inc; + out0[j] = s_1; } - if (inc==2) { /* stereo */ + if (channels == 2) { left->sample1 = s_1; left->sample2 = s_2; s_1 = right->sample1; s_2 = right->sample2; - out = out + 1 - 28*2; } shift = 12 - (in[5+i*2] & 15); filter = in[5+i*2] >> 4; - + if (filter > 4) { + av_log(avctx, AV_LOG_ERROR, + "Invalid XA-ADPCM filter %d (max. allowed is 4)\n", + filter); + return AVERROR_INVALIDDATA; + } f0 = xa_adpcm_table[filter][0]; f1 = xa_adpcm_table[filter][1]; 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<>6); s_2 = s_1; s_1 = av_clip_int16(s); - *out = s_1; - out += inc; + out1[j] = s_1; } - if (inc==2) { /* stereo */ + if (channels == 2) { right->sample1 = s_1; right->sample2 = s_2; - out -= 1; } else { left->sample1 = s_1; left->sample2 = s_2; } + + out0 += 28 * (3 - channels); + out1 += 28 * (3 - channels); } + + 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; -/* 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 = *src++; \ - if (src >= buf + buf_size) break; \ - nibble = last_byte & 0x0F; \ - decode_top_nibble_next = 1; \ + init_get_bits(&gb, buf, size); + + //read bits & initial values + nb_bits = get_bits(&gb, 2)+2; + 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 + * decode with the given buf_size. + * + * @param[out] coded_samples set to the number of samples as coded in the + * packet, or 0 if the codec does not encode the + * number of samples in each frame. + */ +static int get_nb_samples(AVCodecContext *avctx, GetByteContext *gb, + int buf_size, int *coded_samples) +{ + ADPCMDecodeContext *s = avctx->priv_data; + int nb_samples = 0; + int ch = avctx->channels; + int has_coded_samples = 0; + int header_size; + + *coded_samples = 0; + + switch (avctx->codec->id) { + /* constant, only check buf_size */ + case AV_CODEC_ID_ADPCM_EA_XAS: + if (buf_size < 76 * ch) + return 0; + nb_samples = 128; + break; + case AV_CODEC_ID_ADPCM_IMA_QT: + if (buf_size < 34 * ch) + return 0; + nb_samples = 64; + break; + /* simple 4-bit adpcm */ + case AV_CODEC_ID_ADPCM_CT: + case AV_CODEC_ID_ADPCM_IMA_APC: + case AV_CODEC_ID_ADPCM_IMA_EA_SEAD: + case AV_CODEC_ID_ADPCM_IMA_WS: + case AV_CODEC_ID_ADPCM_YAMAHA: + nb_samples = buf_size * 2 / ch; + break; } + if (nb_samples) + return nb_samples; + + /* simple 4-bit adpcm, with header */ + header_size = 0; + switch (avctx->codec->id) { + case AV_CODEC_ID_ADPCM_4XM: + case AV_CODEC_ID_ADPCM_IMA_ISS: header_size = 4 * ch; break; + case AV_CODEC_ID_ADPCM_IMA_AMV: header_size = 8; break; + case AV_CODEC_ID_ADPCM_IMA_SMJPEG: header_size = 4; break; + } + if (header_size > 0) + return (buf_size - header_size) * 2 / ch; + + /* more complex formats */ + switch (avctx->codec->id) { + case AV_CODEC_ID_ADPCM_EA: + has_coded_samples = 1; + *coded_samples = bytestream2_get_le32(gb); + *coded_samples -= *coded_samples % 28; + nb_samples = (buf_size - 12) / 30 * 28; + break; + case AV_CODEC_ID_ADPCM_IMA_EA_EACS: + has_coded_samples = 1; + *coded_samples = bytestream2_get_le32(gb); + nb_samples = (buf_size - (4 + 8 * ch)) * 2 / ch; + break; + case AV_CODEC_ID_ADPCM_EA_MAXIS_XA: + nb_samples = (buf_size - ch) / ch * 2; + break; + case AV_CODEC_ID_ADPCM_EA_R1: + case AV_CODEC_ID_ADPCM_EA_R2: + case AV_CODEC_ID_ADPCM_EA_R3: + /* maximum number of samples */ + /* has internal offsets and a per-frame switch to signal raw 16-bit */ + has_coded_samples = 1; + switch (avctx->codec->id) { + case AV_CODEC_ID_ADPCM_EA_R1: + header_size = 4 + 9 * ch; + *coded_samples = bytestream2_get_le32(gb); + break; + case AV_CODEC_ID_ADPCM_EA_R2: + header_size = 4 + 5 * ch; + *coded_samples = bytestream2_get_le32(gb); + break; + case AV_CODEC_ID_ADPCM_EA_R3: + header_size = 4 + 5 * ch; + *coded_samples = bytestream2_get_be32(gb); + break; + } + *coded_samples -= *coded_samples % 28; + nb_samples = (buf_size - header_size) * 2 / ch; + nb_samples -= nb_samples % 28; + break; + case AV_CODEC_ID_ADPCM_IMA_DK3: + if (avctx->block_align > 0) + buf_size = FFMIN(buf_size, avctx->block_align); + nb_samples = ((buf_size - 16) * 2 / 3 * 4) / ch; + break; + case AV_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 AV_CODEC_ID_ADPCM_IMA_WAV: + if (avctx->block_align > 0) + buf_size = FFMIN(buf_size, avctx->block_align); + nb_samples = 1 + (buf_size - 4 * ch) / (4 * ch) * 8; + break; + case AV_CODEC_ID_ADPCM_MS: + if (avctx->block_align > 0) + buf_size = FFMIN(buf_size, avctx->block_align); + nb_samples = 2 + (buf_size - 7 * ch) * 2 / ch; + break; + case AV_CODEC_ID_ADPCM_SBPRO_2: + case AV_CODEC_ID_ADPCM_SBPRO_3: + case AV_CODEC_ID_ADPCM_SBPRO_4: + { + int samples_per_byte; + switch (avctx->codec->id) { + case AV_CODEC_ID_ADPCM_SBPRO_2: samples_per_byte = 4; break; + case AV_CODEC_ID_ADPCM_SBPRO_3: samples_per_byte = 3; break; + case AV_CODEC_ID_ADPCM_SBPRO_4: samples_per_byte = 2; break; + } + if (!s->status[0].step_index) { + nb_samples++; + buf_size -= ch; + } + nb_samples += buf_size * samples_per_byte / ch; + break; + } + case AV_CODEC_ID_ADPCM_SWF: + { + int buf_bits = buf_size * 8 - 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; + int bits_left = buf_bits - nblocks * block_size; + nb_samples = nblocks * 4096; + if (bits_left >= block_hdr_size) + nb_samples += 1 + (bits_left - block_hdr_size) / (nbits * ch); + break; + } + case AV_CODEC_ID_ADPCM_THP: + has_coded_samples = 1; + 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; + case AV_CODEC_ID_ADPCM_XA: + nb_samples = (buf_size / 128) * 224 / ch; + break; + } + + /* validate coded sample count */ + if (has_coded_samples && (*coded_samples <= 0 || *coded_samples > nb_samples)) + return AVERROR_INVALIDDATA; + + return nb_samples; +} -static int adpcm_decode_frame(AVCodecContext *avctx, - void *data, int *data_size, - AVPacket *avpkt) +static int adpcm_decode_frame(AVCodecContext *avctx, void *data, + int *got_frame_ptr, AVPacket *avpkt) { const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; @@ -341,65 +596,55 @@ static int adpcm_decode_frame(AVCodecContext *avctx, ADPCMChannelStatus *cs; int n, m, channel, i; short *samples; - short *samples_end; - const uint8_t *src; + int16_t **samples_p; int st; /* stereo */ - - /* DK3 ADPCM accounting variables */ - unsigned char last_byte = 0; - unsigned char nibble; - int decode_top_nibble_next = 0; - int diff_channel; - - /* EA ADPCM state variables */ - uint32_t samples_in_chunk; - 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 count1, count2; - int coeff[2][2], shift[2];//used in EA MAXIS ADPCM - - if (!buf_size) - return 0; - - //should protect all 4bit ADPCM variants - //8 is needed for CODEC_ID_ADPCM_IMA_WAV with 2 channels - // - if(*data_size/4 < buf_size + 8) - return -1; + int nb_samples, coded_samples, ret; + GetByteContext gb; + + 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; + } - samples = data; - samples_end= samples + *data_size/2; - *data_size= 0; - src = buf; + /* get output buffer */ + c->frame.nb_samples = nb_samples; + if ((ret = avctx->get_buffer(avctx, &c->frame)) < 0) { + av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); + return ret; + } + samples = (short *)c->frame.data[0]; + samples_p = (int16_t **)c->frame.extended_data; + + /* use coded_samples when applicable */ + /* it is always <= nb_samples, so the output buffer will be large enough */ + if (coded_samples) { + if (coded_samples != nb_samples) + av_log(avctx, AV_LOG_WARNING, "mismatch in coded sample count\n"); + c->frame.nb_samples = nb_samples = coded_samples; + } st = avctx->channels == 2 ? 1 : 0; switch(avctx->codec->id) { - case CODEC_ID_ADPCM_IMA_QT: + case AV_CODEC_ID_ADPCM_IMA_QT: /* In QuickTime, IMA is encoded by chunks of 34 bytes (=64 samples). Channel data is interleaved per-chunk. */ - if (buf_size / 34 < avctx->channels) { - av_log(avctx, AV_LOG_ERROR, "packet is too small\n"); - return AVERROR(EINVAL); - } 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) @@ -410,155 +655,162 @@ static int adpcm_decode_frame(AVCodecContext *avctx, 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*)data + channel; + samples = samples_p[channel]; - for (m = 0; m < 32; m++) { - *samples = adpcm_ima_qt_expand_nibble(cs, src[0] & 0x0F, 3); - samples += avctx->channels; - *samples = adpcm_ima_qt_expand_nibble(cs, src[0] >> 4 , 3); - samples += avctx->channels; - src ++; + 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); } } - if (st) - samples--; break; - case CODEC_ID_ADPCM_IMA_WAV: - if (avctx->block_align != 0 && buf_size > avctx->block_align) - buf_size = avctx->block_align; - -// samples_per_block= (block_align-4*chanels)*8 / (bits_per_sample * chanels) + 1; - + case AV_CODEC_ID_ADPCM_IMA_WAV: for(i=0; ichannels; i++){ cs = &(c->status[i]); - cs->predictor = *samples++ = (int16_t)bytestream_get_le16(&src); + cs->predictor = samples_p[i][0] = 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 */ } - while(src < buf + buf_size){ + for (n = 0; n < (nb_samples - 1) / 8; n++) { for (i = 0; i < avctx->channels; i++) { cs = &c->status[i]; - for (m = 0; m < 4; m++) { - uint8_t v = *src++; - *samples = adpcm_ima_expand_nibble(cs, v & 0x0F, 3); - samples += avctx->channels; - *samples = adpcm_ima_expand_nibble(cs, v >> 4 , 3); - samples += avctx->channels; + samples = &samples_p[i][1 + n * 8]; + for (m = 0; m < 8; m += 2) { + int v = bytestream2_get_byteu(&gb); + samples[m ] = adpcm_ima_expand_nibble(cs, v & 0x0F, 3); + samples[m + 1] = adpcm_ima_expand_nibble(cs, v >> 4 , 3); } - samples -= 8 * avctx->channels - 1; } - samples += 7 * avctx->channels; } break; - case CODEC_ID_ADPCM_4XM: + case AV_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; + } } - m= (buf_size - (src - buf))>>st; - for (i = 0; i < avctx->channels; i++) { - samples = (short*)data + i; + samples = (int16_t *)c->frame.data[i]; cs = &c->status[i]; - for (n = 0; n < m; n++) { - uint8_t v = *src++; - *samples = adpcm_ima_expand_nibble(cs, v & 0x0F, 4); - samples += avctx->channels; - *samples = adpcm_ima_expand_nibble(cs, v >> 4 , 4); - samples += avctx->channels; + for (n = nb_samples >> 1; n > 0; n--) { + int v = bytestream2_get_byteu(&gb); + *samples++ = adpcm_ima_expand_nibble(cs, v & 0x0F, 4); + *samples++ = adpcm_ima_expand_nibble(cs, v >> 4 , 4); } } - samples -= (avctx->channels - 1); break; - case CODEC_ID_ADPCM_MS: + case AV_CODEC_ID_ADPCM_MS: { int block_predictor; - if (avctx->block_align != 0 && buf_size > avctx->block_align) - buf_size = avctx->block_align; - n = buf_size - 7 * avctx->channels; - if (n < 0) - return -1; - - 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>0;n--) { - *samples++ = adpcm_ms_expand_nibble(&c->status[0 ], src[0] >> 4 ); - *samples++ = adpcm_ms_expand_nibble(&c->status[st], src[0] & 0x0F); - src ++; + 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; - + case AV_CODEC_ID_ADPCM_IMA_DK4: for (channel = 0; channel < avctx->channels; channel++) { cs = &c->status[channel]; - cs->predictor = (int16_t)bytestream_get_le16(&src); - cs->step_index = *src++; - 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; + } } - while (src < buf + buf_size) { - 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: - if (avctx->block_align != 0 && buf_size > avctx->block_align) - buf_size = avctx->block_align; - - if(buf_size + 16 > (samples_end - samples)*3/8) - return -1; - - 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 = src[14]; - c->status[1].step_index = src[15]; + case AV_CODEC_ID_ADPCM_IMA_DK3: + { + int last_byte = 0; + int nibble; + int decode_top_nibble_next = 0; + int diff_channel; + 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 */ @@ -586,19 +838,22 @@ static int adpcm_decode_frame(AVCodecContext *avctx, *samples++ = c->status[0].predictor - c->status[1].predictor; } break; - case CODEC_ID_ADPCM_IMA_ISS: - c->status[0].predictor = (int16_t)AV_RL16(src + 0); - c->status[0].step_index = src[2]; - src += 4; - if(st) { - c->status[1].predictor = (int16_t)AV_RL16(src + 0); - c->status[1].step_index = src[2]; - src += 4; + } + case AV_CODEC_ID_ADPCM_IMA_ISS: + for (channel = 0; channel < avctx->channels; channel++) { + cs = &c->status[channel]; + 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; + } } - while (src < buf + buf_size) { - 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; @@ -611,79 +866,108 @@ static int adpcm_decode_frame(AVCodecContext *avctx, *samples++ = adpcm_ima_expand_nibble(&c->status[st], v2, 3); } break; - case CODEC_ID_ADPCM_IMA_WS: - while (src < buf + buf_size) { - uint8_t v = *src++; + case AV_CODEC_ID_ADPCM_IMA_APC: + 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_XA: - while (buf_size >= 128) { - xa_decode(samples, src, &c->status[0], &c->status[1], - avctx->channels); - src += 128; - samples += 28 * 8; - buf_size -= 128; + case AV_CODEC_ID_ADPCM_IMA_WS: + if (c->vqa_version == 3) { + for (channel = 0; channel < avctx->channels; channel++) { + int16_t *smp = samples_p[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++ = adpcm_ima_expand_nibble(&c->status[channel], v & 0x0F, 3); + } + } + } else { + for (n = nb_samples / 2; n > 0; n--) { + 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; + } + } + bytestream2_seek(&gb, 0, SEEK_END); + break; + case AV_CODEC_ID_ADPCM_XA: + { + int16_t *out0 = samples_p[0]; + int16_t *out1 = samples_p[1]; + int samples_per_block = 28 * (3 - avctx->channels) * 4; + int sample_offset = 0; + while (bytestream2_get_bytes_left(&gb) >= 128) { + if ((ret = xa_decode(avctx, out0, out1, buf + bytestream2_tell(&gb), + &c->status[0], &c->status[1], + avctx->channels, sample_offset)) < 0) + return ret; + bytestream2_skipu(&gb, 128); + sample_offset += samples_per_block; } break; - case CODEC_ID_ADPCM_IMA_EA_EACS: - samples_in_chunk = bytestream_get_le32(&src) >> (1-st); - - if (samples_in_chunk > buf_size-4-(8<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].step_index = bytestream_get_le32(&src); for (i=0; i<=st; i++) - c->status[i].predictor = bytestream_get_le32(&src); + c->status[i].predictor = bytestream2_get_le32u(&gb); - for (; samples_in_chunk; samples_in_chunk--, 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 (; src < buf+buf_size; 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); + case AV_CODEC_ID_ADPCM_IMA_EA_SEAD: + 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: + case AV_CODEC_ID_ADPCM_EA: + { + 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. */ - if (buf_size < 12) { - av_log(avctx, AV_LOG_ERROR, "frame too small\n"); - return AVERROR(EINVAL); - } - samples_in_chunk = AV_RL32(src); - if (samples_in_chunk / 28 > (buf_size - 12) / 30) { - av_log(avctx, AV_LOG_ERROR, "invalid frame\n"); - return AVERROR(EINVAL); - } - src += 4; - 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); - - for (count1 = 0; count1 < samples_in_chunk/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++; - - shift_left = (*src >> 4 ) + 8; - shift_right = (*src & 0x0F) + 8; - 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++) { + 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]; + + byte = bytestream2_get_byteu(&gb); + shift_left = 20 - (byte >> 4); + shift_right = 20 - (byte & 0x0F); for (count2 = 0; count2 < 28; count2++) { - next_left_sample = (int32_t)((*src & 0xF0) << 24) >> shift_left; - next_right_sample = (int32_t)((*src & 0x0F) << 28) >> 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) + @@ -696,26 +980,33 @@ static int adpcm_decode_frame(AVCodecContext *avctx, 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; - case CODEC_ID_ADPCM_EA_MAXIS_XA: + } + case AV_CODEC_ID_ADPCM_EA_MAXIS_XA: + { + 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] = (*src & 0x0F) + 8; - src++; + coeff[channel][i] = ea_adpcm_table[(byte >> 4) + 4*i]; + shift[channel] = 20 - (byte & 0x0F); } - for (count1 = 0; count1 < (buf_size - avctx->channels) / avctx->channels; count1++) { + 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 = (int32_t)(((*(src+channel) >> i) & 0x0F) << 0x1C) >> 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; @@ -724,72 +1015,63 @@ static int adpcm_decode_frame(AVCodecContext *avctx, *samples++ = c->status[channel].sample1; } } - src+=avctx->channels; } + bytestream2_seek(&gb, 0, SEEK_END); break; - case CODEC_ID_ADPCM_EA_R1: - case CODEC_ID_ADPCM_EA_R2: - case CODEC_ID_ADPCM_EA_R3: { + } + case AV_CODEC_ID_ADPCM_EA_R1: + case AV_CODEC_ID_ADPCM_EA_R2: + case AV_CODEC_ID_ADPCM_EA_R3: { /* channel numbering 2chan: 0=fl, 1=fr 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; + const int big_endian = avctx->codec->id == AV_CODEC_ID_ADPCM_EA_R3; + 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; - - samples_in_chunk = (big_endian ? bytestream_get_be32(&src) - : bytestream_get_le32(&src)) / 28; - if (samples_in_chunk > UINT32_MAX/(28*avctx->channels) || - 28*samples_in_chunk*avctx->channels > samples_end-samples) { - src += buf_size - 4; - break; - } + int count = 0; + int offsets[6]; - for (channel=0; channelchannels; channel++) { - int32_t offset = (big_endian ? bytestream_get_be32(&src) - : bytestream_get_le32(&src)) - + (avctx->channels-channel-1) * 4; + for (channel=0; channelchannels; channel++) + offsets[channel] = (big_endian ? bytestream2_get_be32(&gb) : + bytestream2_get_le32(&gb)) + + (avctx->channels + 1) * 4; - if ((offset < 0) || (offset >= src_end - src - 4)) break; - srcC = src + offset; - samplesC = samples + channel; + for (channel=0; channelchannels; channel++) { + bytestream2_seek(&gb, offsets[channel], SEEK_SET); + samplesC = samples_p[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); + if (avctx->codec->id == AV_CODEC_ID_ADPCM_EA_R1) { + 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 src_end - 30*2) break; - current_sample = (int16_t)bytestream_get_be16(&srcC); - previous_sample = (int16_t)bytestream_get_be16(&srcC); + for (count1 = 0; count1 < nb_samples / 28; count1++) { + 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 += avctx->channels; - } + for (count2=0; count2<28; count2++) + *samplesC++ = sign_extend(bytestream2_get_be16(&gb), 16); } else { - coeff1 = ea_adpcm_table[ *srcC>>4 ]; - coeff2 = ea_adpcm_table[(*srcC>>4) + 4]; - shift = (*srcC++ & 0x0F) + 8; + 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 = (int32_t)((*srcC++ & 0x0F) << 28) >> shift; - else - next_sample = (int32_t)((*srcC & 0xF0) << 24) >> 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); @@ -797,264 +1079,220 @@ static int adpcm_decode_frame(AVCodecContext *avctx, previous_sample = current_sample; current_sample = next_sample; - *samplesC = current_sample; - samplesC += avctx->channels; + *samplesC++ = current_sample; } } } + if (!count) { + count = count1; + } else if (count != count1) { + av_log(avctx, AV_LOG_WARNING, "per-channel sample count mismatch\n"); + count = FFMAX(count, count1); + } - if (avctx->codec->id != CODEC_ID_ADPCM_EA_R1) { + if (avctx->codec->id != AV_CODEC_ID_ADPCM_EA_R1) { c->status[channel].predictor = current_sample; c->status[channel].prev_sample = previous_sample; } } - src = src + buf_size - (4 + 4*avctx->channels); - samples += 28 * samples_in_chunk * avctx->channels; + c->frame.nb_samples = count * 28; + bytestream2_seek(&gb, 0, SEEK_END); break; } - case CODEC_ID_ADPCM_EA_XAS: - if (samples_end-samples < 32*4*avctx->channels - || buf_size < (4+15)*4*avctx->channels) { - src += buf_size; - break; - } + case AV_CODEC_ID_ADPCM_EA_XAS: for (channel=0; channelchannels; channel++) { int coeff[2][4], shift[4]; - short *s2, *s = &samples[channel]; - for (n=0; n<4; n++, s+=32*avctx->channels) { + int16_t *s = samples_p[channel]; + for (n = 0; n < 4; n++, s += 32) { + 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] = (src[2]&0x0F) + 8; - 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[1] = 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 (s2=s, i=0; i<8; i+=4, s2+=avctx->channels) { - int level = (int32_t)((*src & (0xF0>>i)) << (24+i)) >> 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); - } + s = &samples_p[channel][m]; + for (n = 0; n < 4; n++, s += 32) { + int level, pred; + int byte = bytestream2_get_byteu(&gb); + + level = sign_extend(byte >> 4, 4) << shift[n]; + pred = s[-1] * coeff[0][n] + s[-2] * coeff[1][n]; + s[0] = av_clip_int16((level + pred + 0x80) >> 8); + + level = sign_extend(byte, 4) << shift[n]; + pred = s[0] * coeff[0][n] + s[-1] * coeff[1][n]; + s[1] = av_clip_int16((level + pred + 0x80) >> 8); } } } - samples += 32*4*avctx->channels; break; - case CODEC_ID_ADPCM_IMA_AMV: - case CODEC_ID_ADPCM_IMA_SMJPEG: - c->status[0].predictor = (int16_t)bytestream_get_le16(&src); - c->status[0].step_index = bytestream_get_le16(&src); - - if (avctx->codec->id == CODEC_ID_ADPCM_IMA_AMV) - src+=4; - - while (src < buf + buf_size) { - char hi, lo; - lo = *src & 0x0F; - hi = *src >> 4; - - if (avctx->codec->id == CODEC_ID_ADPCM_IMA_AMV) - FFSWAP(char, hi, lo); - - *samples++ = adpcm_ima_expand_nibble(&c->status[0], - lo, 3); - *samples++ = adpcm_ima_expand_nibble(&c->status[0], - hi, 3); - src++; + case AV_CODEC_ID_ADPCM_IMA_AMV: + case AV_CODEC_ID_ADPCM_IMA_SMJPEG: + if (avctx->codec->id == AV_CODEC_ID_ADPCM_IMA_AMV) { + 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(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--) { + int hi, lo, v = bytestream2_get_byteu(&gb); + + if (avctx->codec->id == AV_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); } break; - case CODEC_ID_ADPCM_CT: - while (src < buf + buf_size) { - uint8_t v = *src++; + case AV_CODEC_ID_ADPCM_CT: + 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); } break; - case CODEC_ID_ADPCM_SBPRO_4: - case CODEC_ID_ADPCM_SBPRO_3: - case CODEC_ID_ADPCM_SBPRO_2: + case AV_CODEC_ID_ADPCM_SBPRO_4: + case AV_CODEC_ID_ADPCM_SBPRO_3: + case AV_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) { - while (src < buf + buf_size) { + if (avctx->codec->id == AV_CODEC_ID_ADPCM_SBPRO_4) { + 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); - src++; + byte & 0x0F, 4, 0); } - } else if (avctx->codec->id == CODEC_ID_ADPCM_SBPRO_3) { - while (src < buf + buf_size && samples + 2 < samples_end) { + } else if (avctx->codec->id == AV_CODEC_ID_ADPCM_SBPRO_3) { + 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); - src++; + byte & 0x03, 2, 0); } } else { - while (src < buf + buf_size && samples + 3 < samples_end) { + 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); - src++; + 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; - if (samples >= samples_end) { - av_log(avctx, AV_LOG_ERROR, "allocated output buffer is too small\n"); - return -1; - } - } - } - } - src += buf_size; + case AV_CODEC_ID_ADPCM_SWF: + adpcm_swf_decode(avctx, buf, buf_size, samples); + bytestream2_seek(&gb, 0, SEEK_END); break; - } - case CODEC_ID_ADPCM_YAMAHA: - while (src < buf + buf_size) { - uint8_t v = *src++; + case AV_CODEC_ID_ADPCM_YAMAHA: + 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 ); } break; - case CODEC_ID_ADPCM_THP: + case AV_CODEC_ID_ADPCM_THP: { int table[2][16]; - unsigned int samplecnt; int prev[2][2]; int ch; - if (buf_size < 80) { - av_log(avctx, AV_LOG_ERROR, "frame too small\n"); - return -1; - } - - src+=4; - samplecnt = bytestream_get_be32(&src); - - for (i = 0; i < 32; i++) - table[0][i] = (int16_t)bytestream_get_be16(&src); + for (i = 0; i < 2; i++) + for (n = 0; n < 16; n++) + table[i][n] = sign_extend(bytestream2_get_be16u(&gb), 16); /* Initialize the previous sample. */ - for (i = 0; i < 4; i++) - prev[0][i] = (int16_t)bytestream_get_be16(&src); - - if (samplecnt >= (samples_end - samples) / (st + 1)) { - av_log(avctx, AV_LOG_ERROR, "allocated output buffer is too small\n"); - return -1; - } + for (i = 0; i < 2; i++) + for (n = 0; n < 2; n++) + prev[i][n] = sign_extend(bytestream2_get_be16u(&gb), 16); for (ch = 0; ch <= st; ch++) { - samples = (unsigned short *) data + ch; + samples = samples_p[ch]; /* Read in every sample for this channel. */ - for (i = 0; i < samplecnt / 14; i++) { - int index = (*src >> 4) & 7; - unsigned int exp = 28 - (*src++ & 15); + for (i = 0; i < nb_samples / 14; i++) { + 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= *src++ <<28; - else sampledat= (*src&0xF0)<<24; + + 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); + + prev[ch][1]*factor2) >> 11) + (sampledat << exp); *samples = av_clip_int16(sampledat); prev[ch][1] = prev[ch][0]; prev[ch][0] = *samples++; - - /* In case of stereo, skip one sample, this sample - is for the other channel. */ - samples += st; } } } - - /* In the previous loop, in case stereo is used, samples is - increased exactly one time too often. */ - samples -= st; break; } default: return -1; } - *data_size = (uint8_t *)samples - (uint8_t *)data; - return src - buf; + + *got_frame_ptr = 1; + *(AVFrame *)data = c->frame; + + return bytestream2_tell(&gb); } -#define ADPCM_DECODER(id_, name_, long_name_) \ +static const enum AVSampleFormat sample_fmts_s16[] = { AV_SAMPLE_FMT_S16, + AV_SAMPLE_FMT_NONE }; +static const enum AVSampleFormat sample_fmts_s16p[] = { AV_SAMPLE_FMT_S16, + AV_SAMPLE_FMT_NONE }; +static const enum AVSampleFormat sample_fmts_both[] = { AV_SAMPLE_FMT_S16, + AV_SAMPLE_FMT_S16P, + AV_SAMPLE_FMT_NONE }; + +#define ADPCM_DECODER(id_, sample_fmts_, name_, long_name_) \ AVCodec ff_ ## name_ ## _decoder = { \ .name = #name_, \ .type = AVMEDIA_TYPE_AUDIO, \ @@ -1062,33 +1300,36 @@ AVCodec ff_ ## name_ ## _decoder = { \ .priv_data_size = sizeof(ADPCMDecodeContext), \ .init = adpcm_decode_init, \ .decode = adpcm_decode_frame, \ + .capabilities = CODEC_CAP_DR1, \ .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ + .sample_fmts = sample_fmts_, \ } /* Note: Do not forget to add new entries to the Makefile as well. */ -ADPCM_DECODER(CODEC_ID_ADPCM_4XM, adpcm_4xm, "ADPCM 4X Movie"); -ADPCM_DECODER(CODEC_ID_ADPCM_CT, adpcm_ct, "ADPCM Creative Technology"); -ADPCM_DECODER(CODEC_ID_ADPCM_EA, adpcm_ea, "ADPCM Electronic Arts"); -ADPCM_DECODER(CODEC_ID_ADPCM_EA_MAXIS_XA, adpcm_ea_maxis_xa, "ADPCM Electronic Arts Maxis CDROM XA"); -ADPCM_DECODER(CODEC_ID_ADPCM_EA_R1, adpcm_ea_r1, "ADPCM Electronic Arts R1"); -ADPCM_DECODER(CODEC_ID_ADPCM_EA_R2, adpcm_ea_r2, "ADPCM Electronic Arts R2"); -ADPCM_DECODER(CODEC_ID_ADPCM_EA_R3, adpcm_ea_r3, "ADPCM Electronic Arts R3"); -ADPCM_DECODER(CODEC_ID_ADPCM_EA_XAS, adpcm_ea_xas, "ADPCM Electronic Arts XAS"); -ADPCM_DECODER(CODEC_ID_ADPCM_IMA_AMV, adpcm_ima_amv, "ADPCM IMA AMV"); -ADPCM_DECODER(CODEC_ID_ADPCM_IMA_DK3, adpcm_ima_dk3, "ADPCM IMA Duck DK3"); -ADPCM_DECODER(CODEC_ID_ADPCM_IMA_DK4, adpcm_ima_dk4, "ADPCM IMA Duck DK4"); -ADPCM_DECODER(CODEC_ID_ADPCM_IMA_EA_EACS, adpcm_ima_ea_eacs, "ADPCM IMA Electronic Arts EACS"); -ADPCM_DECODER(CODEC_ID_ADPCM_IMA_EA_SEAD, adpcm_ima_ea_sead, "ADPCM IMA Electronic Arts SEAD"); -ADPCM_DECODER(CODEC_ID_ADPCM_IMA_ISS, adpcm_ima_iss, "ADPCM IMA Funcom ISS"); -ADPCM_DECODER(CODEC_ID_ADPCM_IMA_QT, adpcm_ima_qt, "ADPCM IMA QuickTime"); -ADPCM_DECODER(CODEC_ID_ADPCM_IMA_SMJPEG, adpcm_ima_smjpeg, "ADPCM IMA Loki SDL MJPEG"); -ADPCM_DECODER(CODEC_ID_ADPCM_IMA_WAV, adpcm_ima_wav, "ADPCM IMA WAV"); -ADPCM_DECODER(CODEC_ID_ADPCM_IMA_WS, adpcm_ima_ws, "ADPCM IMA Westwood"); -ADPCM_DECODER(CODEC_ID_ADPCM_MS, adpcm_ms, "ADPCM Microsoft"); -ADPCM_DECODER(CODEC_ID_ADPCM_SBPRO_2, adpcm_sbpro_2, "ADPCM Sound Blaster Pro 2-bit"); -ADPCM_DECODER(CODEC_ID_ADPCM_SBPRO_3, adpcm_sbpro_3, "ADPCM Sound Blaster Pro 2.6-bit"); -ADPCM_DECODER(CODEC_ID_ADPCM_SBPRO_4, adpcm_sbpro_4, "ADPCM Sound Blaster Pro 4-bit"); -ADPCM_DECODER(CODEC_ID_ADPCM_SWF, adpcm_swf, "ADPCM Shockwave Flash"); -ADPCM_DECODER(CODEC_ID_ADPCM_THP, adpcm_thp, "ADPCM Nintendo Gamecube THP"); -ADPCM_DECODER(CODEC_ID_ADPCM_XA, adpcm_xa, "ADPCM CDROM XA"); -ADPCM_DECODER(CODEC_ID_ADPCM_YAMAHA, adpcm_yamaha, "ADPCM Yamaha"); +ADPCM_DECODER(AV_CODEC_ID_ADPCM_4XM, sample_fmts_s16p, adpcm_4xm, "ADPCM 4X Movie"); +ADPCM_DECODER(AV_CODEC_ID_ADPCM_CT, sample_fmts_s16, adpcm_ct, "ADPCM Creative Technology"); +ADPCM_DECODER(AV_CODEC_ID_ADPCM_EA, sample_fmts_s16, adpcm_ea, "ADPCM Electronic Arts"); +ADPCM_DECODER(AV_CODEC_ID_ADPCM_EA_MAXIS_XA, sample_fmts_s16, adpcm_ea_maxis_xa, "ADPCM Electronic Arts Maxis CDROM XA"); +ADPCM_DECODER(AV_CODEC_ID_ADPCM_EA_R1, sample_fmts_s16p, adpcm_ea_r1, "ADPCM Electronic Arts R1"); +ADPCM_DECODER(AV_CODEC_ID_ADPCM_EA_R2, sample_fmts_s16p, adpcm_ea_r2, "ADPCM Electronic Arts R2"); +ADPCM_DECODER(AV_CODEC_ID_ADPCM_EA_R3, sample_fmts_s16p, adpcm_ea_r3, "ADPCM Electronic Arts R3"); +ADPCM_DECODER(AV_CODEC_ID_ADPCM_EA_XAS, sample_fmts_s16p, adpcm_ea_xas, "ADPCM Electronic Arts XAS"); +ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_AMV, sample_fmts_s16, adpcm_ima_amv, "ADPCM IMA AMV"); +ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_APC, sample_fmts_s16, adpcm_ima_apc, "ADPCM IMA CRYO APC"); +ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_DK3, sample_fmts_s16, adpcm_ima_dk3, "ADPCM IMA Duck DK3"); +ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_DK4, sample_fmts_s16, adpcm_ima_dk4, "ADPCM IMA Duck DK4"); +ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_EA_EACS, sample_fmts_s16, adpcm_ima_ea_eacs, "ADPCM IMA Electronic Arts EACS"); +ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_EA_SEAD, sample_fmts_s16, adpcm_ima_ea_sead, "ADPCM IMA Electronic Arts SEAD"); +ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_ISS, sample_fmts_s16, adpcm_ima_iss, "ADPCM IMA Funcom ISS"); +ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_QT, sample_fmts_s16p, adpcm_ima_qt, "ADPCM IMA QuickTime"); +ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_SMJPEG, sample_fmts_s16, adpcm_ima_smjpeg, "ADPCM IMA Loki SDL MJPEG"); +ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_WAV, sample_fmts_s16p, adpcm_ima_wav, "ADPCM IMA WAV"); +ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_WS, sample_fmts_both, adpcm_ima_ws, "ADPCM IMA Westwood"); +ADPCM_DECODER(AV_CODEC_ID_ADPCM_MS, sample_fmts_s16, adpcm_ms, "ADPCM Microsoft"); +ADPCM_DECODER(AV_CODEC_ID_ADPCM_SBPRO_2, sample_fmts_s16, adpcm_sbpro_2, "ADPCM Sound Blaster Pro 2-bit"); +ADPCM_DECODER(AV_CODEC_ID_ADPCM_SBPRO_3, sample_fmts_s16, adpcm_sbpro_3, "ADPCM Sound Blaster Pro 2.6-bit"); +ADPCM_DECODER(AV_CODEC_ID_ADPCM_SBPRO_4, sample_fmts_s16, adpcm_sbpro_4, "ADPCM Sound Blaster Pro 4-bit"); +ADPCM_DECODER(AV_CODEC_ID_ADPCM_SWF, sample_fmts_s16, adpcm_swf, "ADPCM Shockwave Flash"); +ADPCM_DECODER(AV_CODEC_ID_ADPCM_THP, sample_fmts_s16p, adpcm_thp, "ADPCM Nintendo Gamecube THP"); +ADPCM_DECODER(AV_CODEC_ID_ADPCM_XA, sample_fmts_s16p, adpcm_xa, "ADPCM CDROM XA"); +ADPCM_DECODER(AV_CODEC_ID_ADPCM_YAMAHA, sample_fmts_s16, adpcm_yamaha, "ADPCM Yamaha");