avcodec: add decoder for High Voltage Software's ALP ADPCM

Zane van Iperen committed 6 years ago

Commit d90413e1 parent 0830e918 files · +50 −2Browse files

Unified · Split

8 files

Changelog +1 −0
doc/general.texi +1 −0
libavcodec/Makefile +1 −0
libavcodec/adpcm.c +36 −0
libavcodec/allcodecs.c +1 −0
libavcodec/avcodec.h +1 −0
libavcodec/codec_desc.c +7 −0
libavcodec/version.h +2 −2

@@ -43,6 +43,7 @@ version <next>: · 42 unmodified lines
43	43	- Rayman 2 ADPCM decoder
44	44	- Rayman 2 APM demuxer
45	45	- cas video filter
	46	+- High Voltage Software ADPCM decoder
46	47
47	48
48	49	version 4.2:

doc/general.texi+1−0

@@ -1100,6 +1100,7 @@ following image formats are supported: · 1099 unmodified lines
1100	1100	@item ADPCM IMA Electronic Arts EACS @tab @tab X
1101	1101	@item ADPCM IMA Electronic Arts SEAD @tab @tab X
1102	1102	@item ADPCM IMA Funcom @tab @tab X
	1103	+@item ADPCM IMA High Voltage Software ALP @tab @tab X
1103	1104	@item ADPCM IMA QuickTime @tab X @tab X
1104	1105	@item ADPCM IMA Simon & Schuster Interactive @tab @tab X
1105	1106	@item ADPCM IMA Ubisoft APM @tab @tab X

libavcodec/Makefile+1−0

@@ -834,6 +834,7 @@ OBJS-$(CONFIG_ADPCM_G726_ENCODER) += g726.o · 833 unmodified lines
834	834	OBJS-$(CONFIG_ADPCM_G726LE_DECODER) += g726.o
835	835	OBJS-$(CONFIG_ADPCM_G726LE_ENCODER) += g726.o
836	836	OBJS-$(CONFIG_ADPCM_IMA_AMV_DECODER) += adpcm.o adpcm_data.o
	837	+OBJS-$(CONFIG_ADPCM_IMA_ALP_DECODER) += adpcm.o adpcm_data.o
837	838	OBJS-$(CONFIG_ADPCM_IMA_APC_DECODER) += adpcm.o adpcm_data.o
838	839	OBJS-$(CONFIG_ADPCM_IMA_APM_DECODER) += adpcm.o adpcm_data.o
839	840	OBJS-$(CONFIG_ADPCM_IMA_DAT4_DECODER) += adpcm.o adpcm_data.o

libavcodec/adpcm.c+36−0

@@ -15,6 +15,7 @@ · 14 unmodified lines
15	15	* Argonaut Games ADPCM decoder by Zane van Iperen (zane@zanevaniperen.com)
16	16	* Simon & Schuster Interactive ADPCM decoder by Zane van Iperen (zane@zanevaniperen.com)
17	17	* Ubisoft ADPCM decoder by Zane van Iperen (zane@zanevaniperen.com)
	18	+ * High Voltage Software ALP decoder by Zane van Iperen (zane@zanevaniperen.com)
18	19	*
19	20	* This file is part of FFmpeg.
20	21	*
@@ -280,6 +281,29 @@ static inline int16_t adpcm_ima_expand_nibble(ADPCMChannelStatus *c, int8_t nibb · 259 unmodified lines
280	281	return (int16_t)c->predictor;
281	282	}
282	283
	284	+static inline int16_t adpcm_ima_alp_expand_nibble(ADPCMChannelStatus *c, int8_t nibble, int shift)
	285	+{
	286	+ int step_index;
	287	+ int predictor;
	288	+ int sign, delta, diff, step;
	289	+
	290	+ step = ff_adpcm_step_table[c->step_index];
	291	+ step_index = c->step_index + ff_adpcm_index_table[(unsigned)nibble];
	292	+ step_index = av_clip(step_index, 0, 88);
	293	+
	294	+ sign = nibble & 8;
	295	+ delta = nibble & 7;
	296	+ diff = (delta * step) >> shift;
	297	+ predictor = c->predictor;
	298	+ if (sign) predictor -= diff;
	299	+ else predictor += diff;
	300	+
	301	+ c->predictor = av_clip_int16(predictor);
	302	+ c->step_index = step_index;
	303	+
	304	+ return (int16_t)c->predictor;
	305	+}
	306	+
283	307	static inline int16_t adpcm_ima_wav_expand_nibble(ADPCMChannelStatus c, GetBitContext gb, int bps)
284	308	{
285	309	int nibble, step_index, predictor, sign, delta, diff, step, shift;
@@ -675,6 +699,7 @@ static int get_nb_samples(AVCodecContext avctx, GetByteContext gb, · 389 unmodified lines
675	699	case AV_CODEC_ID_ADPCM_AICA:
676	700	case AV_CODEC_ID_ADPCM_IMA_SSI:
677	701	case AV_CODEC_ID_ADPCM_IMA_APM:
	702	+ case AV_CODEC_ID_ADPCM_IMA_ALP:
678	703	nb_samples = buf_size * 2 / ch;
679	704	break;
680	705	}
@@ -1247,6 +1272,16 @@ static int adpcm_decode_frame(AVCodecContext avctx, void data, · 566 unmodified lines
1247	1272	samples += avctx->channels;
1248	1273	}
1249	1274	break;
	1275	+ case AV_CODEC_ID_ADPCM_IMA_ALP:
	1276	+ for (n = nb_samples / 2; n > 0; n--) {
	1277	+ for (channel = 0; channel < avctx->channels; channel++) {
	1278	+ int v = bytestream2_get_byteu(&gb);
	1279	+ *samples++ = adpcm_ima_alp_expand_nibble(&c->status[channel], v >> 4 , 2);
	1280	+ samples[st] = adpcm_ima_alp_expand_nibble(&c->status[channel], v & 0x0F, 2);
	1281	+ }
	1282	+ samples += avctx->channels;
	1283	+ }
	1284	+ break;
1250	1285	case AV_CODEC_ID_ADPCM_IMA_OKI:
1251	1286	while (bytestream2_get_bytes_left(&gb) > 0) {
1252	1287	int v = bytestream2_get_byteu(&gb);
@@ -1997,6 +2032,7 @@ ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_QT, sample_fmts_s16p, adpcm_ima_qt, · 744 unmodified lines
1997	2032	ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_RAD, sample_fmts_s16, adpcm_ima_rad, "ADPCM IMA Radical");
1998	2033	ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_SSI, sample_fmts_s16, adpcm_ima_ssi, "ADPCM IMA Simon & Schuster Interactive");
1999	2034	ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_SMJPEG, sample_fmts_s16, adpcm_ima_smjpeg, "ADPCM IMA Loki SDL MJPEG");
	2035	+ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_ALP, sample_fmts_s16, adpcm_ima_alp, "ADPCM IMA High Voltage Software ALP");
2000	2036	ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_WAV, sample_fmts_s16p, adpcm_ima_wav, "ADPCM IMA WAV");
2001	2037	ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_WS, sample_fmts_both, adpcm_ima_ws, "ADPCM IMA Westwood");
2002	2038	ADPCM_DECODER(AV_CODEC_ID_ADPCM_MS, sample_fmts_both, adpcm_ms, "ADPCM Microsoft");

libavcodec/allcodecs.c+1−0

@@ -599,6 +599,7 @@ extern AVCodec ff_adpcm_g726_decoder; · 598 unmodified lines
599	599	extern AVCodec ff_adpcm_g726le_encoder;
600	600	extern AVCodec ff_adpcm_g726le_decoder;
601	601	extern AVCodec ff_adpcm_ima_amv_decoder;
	602	+extern AVCodec ff_adpcm_ima_alp_decoder;
602	603	extern AVCodec ff_adpcm_ima_apc_decoder;
603	604	extern AVCodec ff_adpcm_ima_apm_decoder;
604	605	extern AVCodec ff_adpcm_ima_dat4_decoder;

libavcodec/avcodec.h+1−0

@@ -552,6 +552,7 @@ enum AVCodecID { · 551 unmodified lines
552	552	AV_CODEC_ID_ADPCM_IMA_SSI,
553	553	AV_CODEC_ID_ADPCM_ZORK,
554	554	AV_CODEC_ID_ADPCM_IMA_APM,
	555	+ AV_CODEC_ID_ADPCM_IMA_ALP,
555	556
556	557	/* AMR */
557	558	AV_CODEC_ID_AMR_NB = 0x12000,

libavcodec/codec_desc.c+7−0

@@ -2325,6 +2325,13 @@ static const AVCodecDescriptor codec_descriptors[] = { · 2324 unmodified lines
2325	2325	.long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA Ubisoft APM"),
2326	2326	.props = AV_CODEC_PROP_INTRA_ONLY \| AV_CODEC_PROP_LOSSY,
2327	2327	},
	2328	+ {
	2329	+ .id = AV_CODEC_ID_ADPCM_IMA_ALP,
	2330	+ .type = AVMEDIA_TYPE_AUDIO,
	2331	+ .name = "adpcm_ima_alp",
	2332	+ .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA High Voltage Software ALP"),
	2333	+ .props = AV_CODEC_PROP_INTRA_ONLY \| AV_CODEC_PROP_LOSSY,
	2334	+ },
2328	2335
2329	2336	/* AMR */
2330	2337	{

libavcodec/version.h+2−2

@@ -28,8 +28,8 @@ · 27 unmodified lines
28	28	#include "libavutil/version.h"
29	29
30	30	#define LIBAVCODEC_VERSION_MAJOR 58
31		−#define LIBAVCODEC_VERSION_MINOR 73
32		−#define LIBAVCODEC_VERSION_MICRO 102
	31	+#define LIBAVCODEC_VERSION_MINOR 74
	32	+#define LIBAVCODEC_VERSION_MICRO 100
33	33
34	34	#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
35	35	LIBAVCODEC_VERSION_MINOR, \

avcodec: add decoder for High Voltage Software's ALP ADPCM

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code