mirror of https://git.ffmpeg.org/ffmpeg.git
avcodec: add support for Cunning Developments' ADPCM
Signed-off-by: Zane van Iperen <zane@zanevaniperen.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Zane van Iperen
Michael Niedermayer
parent
f4d8fad802
commit
3e22e738c0
|
|
@ -62,6 +62,7 @@ version <next>:
|
|||
- tmedian filter
|
||||
- maskedthreshold filter
|
||||
- Support for muxing pcm and pgs in m2ts
|
||||
- Cunning Developments ADPCM decoder
|
||||
|
||||
|
||||
version 4.2:
|
||||
|
|
|
|||
|
|
@ -1102,6 +1102,7 @@ following image formats are supported:
|
|||
@item ADPCM G.726 @tab X @tab X
|
||||
@item ADPCM IMA AMV @tab @tab X
|
||||
@tab Used in AMV files
|
||||
@item ADPCM IMA Cunning Developments @tab @tab X
|
||||
@item ADPCM IMA Electronic Arts EACS @tab @tab X
|
||||
@item ADPCM IMA Electronic Arts SEAD @tab @tab X
|
||||
@item ADPCM IMA Funcom @tab @tab X
|
||||
|
|
|
|||
|
|
@ -843,6 +843,7 @@ OBJS-$(CONFIG_ADPCM_IMA_AMV_DECODER) += adpcm.o adpcm_data.o
|
|||
OBJS-$(CONFIG_ADPCM_IMA_ALP_DECODER) += adpcm.o adpcm_data.o
|
||||
OBJS-$(CONFIG_ADPCM_IMA_APC_DECODER) += adpcm.o adpcm_data.o
|
||||
OBJS-$(CONFIG_ADPCM_IMA_APM_DECODER) += adpcm.o adpcm_data.o
|
||||
OBJS-$(CONFIG_ADPCM_IMA_CUNNING_DECODER) += adpcm.o adpcm_data.o
|
||||
OBJS-$(CONFIG_ADPCM_IMA_DAT4_DECODER) += adpcm.o adpcm_data.o
|
||||
OBJS-$(CONFIG_ADPCM_IMA_DK3_DECODER) += adpcm.o adpcm_data.o
|
||||
OBJS-$(CONFIG_ADPCM_IMA_DK4_DECODER) += adpcm.o adpcm_data.o
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
* Simon & Schuster Interactive ADPCM decoder by Zane van Iperen (zane@zanevaniperen.com)
|
||||
* Ubisoft ADPCM decoder by Zane van Iperen (zane@zanevaniperen.com)
|
||||
* High Voltage Software ALP decoder by Zane van Iperen (zane@zanevaniperen.com)
|
||||
* Cunning Developments decoder by Zane van Iperen (zane@zanevaniperen.com)
|
||||
*
|
||||
* This file is part of FFmpeg.
|
||||
*
|
||||
|
|
@ -109,6 +110,9 @@ static av_cold int adpcm_decode_init(AVCodecContext * avctx)
|
|||
unsigned int max_channels = 2;
|
||||
|
||||
switch(avctx->codec->id) {
|
||||
case AV_CODEC_ID_ADPCM_IMA_CUNNING:
|
||||
max_channels = 1;
|
||||
break;
|
||||
case AV_CODEC_ID_ADPCM_DTK:
|
||||
case AV_CODEC_ID_ADPCM_EA:
|
||||
min_channels = 2;
|
||||
|
|
@ -325,6 +329,26 @@ static inline int16_t adpcm_ima_mtf_expand_nibble(ADPCMChannelStatus *c, int nib
|
|||
return (int16_t)c->predictor;
|
||||
}
|
||||
|
||||
static inline int16_t adpcm_ima_cunning_expand_nibble(ADPCMChannelStatus *c, int8_t nibble)
|
||||
{
|
||||
int step_index;
|
||||
int predictor;
|
||||
int step;
|
||||
|
||||
nibble = sign_extend(nibble & 0xF, 4);
|
||||
|
||||
step = ff_adpcm_ima_cunning_step_table[c->step_index];
|
||||
step_index = c->step_index + ff_adpcm_ima_cunning_index_table[abs(nibble)];
|
||||
step_index = av_clip(step_index, 0, 60);
|
||||
|
||||
predictor = c->predictor + step * nibble;
|
||||
|
||||
c->predictor = av_clip_int16(predictor);
|
||||
c->step_index = step_index;
|
||||
|
||||
return c->predictor;
|
||||
}
|
||||
|
||||
static inline int16_t adpcm_ima_wav_expand_nibble(ADPCMChannelStatus *c, GetBitContext *gb, int bps)
|
||||
{
|
||||
int nibble, step_index, predictor, sign, delta, diff, step, shift;
|
||||
|
|
@ -713,6 +737,7 @@ static int get_nb_samples(AVCodecContext *avctx, GetByteContext *gb,
|
|||
/* simple 4-bit adpcm */
|
||||
case AV_CODEC_ID_ADPCM_CT:
|
||||
case AV_CODEC_ID_ADPCM_IMA_APC:
|
||||
case AV_CODEC_ID_ADPCM_IMA_CUNNING:
|
||||
case AV_CODEC_ID_ADPCM_IMA_EA_SEAD:
|
||||
case AV_CODEC_ID_ADPCM_IMA_OKI:
|
||||
case AV_CODEC_ID_ADPCM_IMA_WS:
|
||||
|
|
@ -1304,6 +1329,13 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data,
|
|||
samples += avctx->channels;
|
||||
}
|
||||
break;
|
||||
case AV_CODEC_ID_ADPCM_IMA_CUNNING:
|
||||
for (n = 0; n < nb_samples / 2; n++) {
|
||||
int v = bytestream2_get_byteu(&gb);
|
||||
*samples++ = adpcm_ima_cunning_expand_nibble(&c->status[0], v & 0x0F);
|
||||
*samples++ = adpcm_ima_cunning_expand_nibble(&c->status[0], v >> 4);
|
||||
}
|
||||
break;
|
||||
case AV_CODEC_ID_ADPCM_IMA_OKI:
|
||||
for (n = nb_samples >> (1 - st); n > 0; n--) {
|
||||
int v = bytestream2_get_byteu(&gb);
|
||||
|
|
@ -2053,6 +2085,7 @@ ADPCM_DECODER(AV_CODEC_ID_ADPCM_EA_XAS, sample_fmts_s16p, adpcm_ea_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_APM, sample_fmts_s16, adpcm_ima_apm, "ADPCM IMA Ubisoft APM");
|
||||
ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_CUNNING, sample_fmts_s16, adpcm_ima_cunning, "ADPCM IMA Cunning Developments");
|
||||
ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_DAT4, sample_fmts_s16, adpcm_ima_dat4, "ADPCM IMA Eurocom DAT4");
|
||||
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");
|
||||
|
|
|
|||
|
|
@ -177,3 +177,16 @@ const int16_t ff_adpcm_mtaf_stepsize[32][16] = {
|
|||
{ 424, 1273, 2121, 2970, 3819, 4668, 5516, 6365,
|
||||
-424, -1273, -2121, -2970, -3819, -4668, -5516, -6365, },
|
||||
};
|
||||
|
||||
const int8_t ff_adpcm_ima_cunning_index_table[8] = {
|
||||
-1, -1, -1, -1, 1, 2, 3, 4,
|
||||
};
|
||||
|
||||
const int16_t ff_adpcm_ima_cunning_step_table[61] = {
|
||||
1, 1, 1, 1, 2, 2, 3, 3, 4, 5,
|
||||
6, 7, 8, 10, 12, 14, 16, 20, 24, 28,
|
||||
32, 40, 48, 56, 64, 80, 96, 112, 128, 160,
|
||||
192, 224, 256, 320, 384, 448, 512, 640, 768, 896,
|
||||
1024, 1280, 1536, 1792, 2048, 2560, 3072, 3584, 4096, 5120,
|
||||
6144, 7168, 8192, 10240, 12288, 14336, 16384, 20480, 24576, 28672, 0
|
||||
};
|
||||
|
|
|
|||
|
|
@ -42,5 +42,7 @@ extern const int16_t ff_adpcm_yamaha_indexscale[];
|
|||
extern const int8_t ff_adpcm_yamaha_difflookup[];
|
||||
extern const int16_t ff_adpcm_afc_coeffs[2][16];
|
||||
extern const int16_t ff_adpcm_mtaf_stepsize[32][16];
|
||||
extern const int8_t ff_adpcm_ima_cunning_index_table[8];
|
||||
extern const int16_t ff_adpcm_ima_cunning_step_table[61];
|
||||
|
||||
#endif /* AVCODEC_ADPCM_DATA_H */
|
||||
|
|
|
|||
|
|
@ -605,6 +605,7 @@ extern AVCodec ff_adpcm_ima_amv_decoder;
|
|||
extern AVCodec ff_adpcm_ima_alp_decoder;
|
||||
extern AVCodec ff_adpcm_ima_apc_decoder;
|
||||
extern AVCodec ff_adpcm_ima_apm_decoder;
|
||||
extern AVCodec ff_adpcm_ima_cunning_decoder;
|
||||
extern AVCodec ff_adpcm_ima_dat4_decoder;
|
||||
extern AVCodec ff_adpcm_ima_dk3_decoder;
|
||||
extern AVCodec ff_adpcm_ima_dk4_decoder;
|
||||
|
|
|
|||
|
|
@ -2348,6 +2348,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
|
|||
.long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA Capcom's MT Framework"),
|
||||
.props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY,
|
||||
},
|
||||
{
|
||||
.id = AV_CODEC_ID_ADPCM_IMA_CUNNING,
|
||||
.type = AVMEDIA_TYPE_AUDIO,
|
||||
.name = "adpcm_ima_cunning",
|
||||
.long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA Cunning Developments"),
|
||||
.props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY,
|
||||
},
|
||||
|
||||
/* AMR */
|
||||
{
|
||||
|
|
|
|||
|
|
@ -382,6 +382,7 @@ enum AVCodecID {
|
|||
AV_CODEC_ID_ADPCM_IMA_APM,
|
||||
AV_CODEC_ID_ADPCM_IMA_ALP,
|
||||
AV_CODEC_ID_ADPCM_IMA_MTF,
|
||||
AV_CODEC_ID_ADPCM_IMA_CUNNING,
|
||||
|
||||
/* AMR */
|
||||
AV_CODEC_ID_AMR_NB = 0x12000,
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
#include "libavutil/version.h"
|
||||
|
||||
#define LIBAVCODEC_VERSION_MAJOR 58
|
||||
#define LIBAVCODEC_VERSION_MINOR 81
|
||||
#define LIBAVCODEC_VERSION_MINOR 82
|
||||
#define LIBAVCODEC_VERSION_MICRO 100
|
||||
|
||||
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
|
||||
|
|
|
|||
Loading…
Reference in New Issue