diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2012-08-28 23:39:53 -0400 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2012-10-09 09:03:52 -0400 |
| commit | 176db0b8928a1f1099a072604d512bf44de01404 (patch) | |
| tree | a6f7f9ff1588ff868959bda486c663067784692f /libavcodec/adpcm.c | |
| parent | 7e5f0450390196c09f43cf706b4c5039213d644f (diff) | |
adpcmdec: use planar sample format for adpcm_ima_qt
Diffstat (limited to 'libavcodec/adpcm.c')
| -rw-r--r-- | libavcodec/adpcm.c | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index f11b899dd3..2137c309a1 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -134,7 +134,14 @@ static av_cold int adpcm_decode_init(AVCodecContext * avctx) default: break; } - avctx->sample_fmt = AV_SAMPLE_FMT_S16; + + switch(avctx->codec->id) { + case AV_CODEC_ID_ADPCM_IMA_QT: + avctx->sample_fmt = AV_SAMPLE_FMT_S16P; + break; + default: + avctx->sample_fmt = AV_SAMPLE_FMT_S16; + } avcodec_get_frame_defaults(&c->frame); avctx->coded_frame = &c->frame; @@ -573,6 +580,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, ADPCMChannelStatus *cs; int n, m, channel, i; short *samples; + int16_t **samples_p; int st; /* stereo */ int count1, count2; int nb_samples, coded_samples, ret; @@ -592,6 +600,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, 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 */ @@ -636,14 +645,12 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, return AVERROR_INVALIDDATA; } - samples = (short *)c->frame.data[0] + channel; + samples = samples_p[channel]; - for (m = 0; m < 32; m++) { + for (m = 0; m < 64; m += 2) { 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, byte >> 4 , 3); - samples += avctx->channels; + samples[m ] = adpcm_ima_qt_expand_nibble(cs, byte & 0x0F, 3); + samples[m + 1] = adpcm_ima_qt_expand_nibble(cs, byte >> 4 , 3); } } break; @@ -1267,6 +1274,8 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, 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 }; #define ADPCM_DECODER(id_, sample_fmts_, name_, long_name_) \ AVCodec ff_ ## name_ ## _decoder = { \ @@ -1297,7 +1306,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_QT, sample_fmts_s16, adpcm_ima_qt, "ADPCM IMA QuickTime"); +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_s16, adpcm_ima_wav, "ADPCM IMA WAV"); ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_WS, sample_fmts_s16, adpcm_ima_ws, "ADPCM IMA Westwood"); |