|
|
@@ -210,6 +210,7 @@ static av_cold int adpcm_decode_init(AVCodecContext * avctx) |
|
|
|
case AV_CODEC_ID_ADPCM_PSX: |
|
|
|
case AV_CODEC_ID_ADPCM_MTAF: |
|
|
|
case AV_CODEC_ID_ADPCM_ARGO: |
|
|
|
case AV_CODEC_ID_ADPCM_IMA_MOFLEX: |
|
|
|
avctx->sample_fmt = AV_SAMPLE_FMT_S16P; |
|
|
|
break; |
|
|
|
case AV_CODEC_ID_ADPCM_IMA_WS: |
|
|
@@ -774,6 +775,7 @@ static int get_nb_samples(AVCodecContext *avctx, GetByteContext *gb, |
|
|
|
case AV_CODEC_ID_ADPCM_4XM: |
|
|
|
case AV_CODEC_ID_ADPCM_AGM: |
|
|
|
case AV_CODEC_ID_ADPCM_IMA_DAT4: |
|
|
|
case AV_CODEC_ID_ADPCM_IMA_MOFLEX: |
|
|
|
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 * ch; break; |
|
|
@@ -1298,6 +1300,29 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, |
|
|
|
*samples++ = adpcm_ima_expand_nibble(&c->status[st], v2, 3); |
|
|
|
} |
|
|
|
break; |
|
|
|
case AV_CODEC_ID_ADPCM_IMA_MOFLEX: |
|
|
|
for (channel = 0; channel < avctx->channels; channel++) { |
|
|
|
cs = &c->status[channel]; |
|
|
|
cs->step_index = sign_extend(bytestream2_get_le16u(&gb), 16); |
|
|
|
cs->predictor = 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 (int subframe = 0; subframe < nb_samples / 256; subframe++) { |
|
|
|
for (channel = 0; channel < avctx->channels; channel++) { |
|
|
|
samples = samples_p[channel] + 256 * subframe; |
|
|
|
for (n = 0; n < 256; n += 2) { |
|
|
|
int v = bytestream2_get_byteu(&gb); |
|
|
|
*samples++ = adpcm_ima_expand_nibble(&c->status[channel], v & 0x0F, 3); |
|
|
|
*samples++ = adpcm_ima_expand_nibble(&c->status[channel], v >> 4 , 3); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
break; |
|
|
|
case AV_CODEC_ID_ADPCM_IMA_DAT4: |
|
|
|
for (channel = 0; channel < avctx->channels; channel++) { |
|
|
|
cs = &c->status[channel]; |
|
|
@@ -2107,6 +2132,7 @@ ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_DK4, sample_fmts_s16, adpcm_ima_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_MOFLEX, sample_fmts_s16p, adpcm_ima_moflex, "ADPCM IMA MobiClip MOFLEX"); |
|
|
|
ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_MTF, sample_fmts_s16, adpcm_ima_mtf, "ADPCM IMA Capcom's MT Framework"); |
|
|
|
ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_OKI, sample_fmts_s16, adpcm_ima_oki, "ADPCM IMA Dialogic OKI"); |
|
|
|
ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_QT, sample_fmts_s16p, adpcm_ima_qt, "ADPCM IMA QuickTime"); |
|
|
|