History

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
  1. Changelog +1 −0
  2. doc/general.texi +1 −0
  3. libavcodec/Makefile +1 −0
  4. libavcodec/adpcm.c +36 −0
  5. libavcodec/allcodecs.c +1 −0
  6. libavcodec/avcodec.h +1 −0
  7. libavcodec/codec_desc.c +7 −0
  8. libavcodec/version.h +2 −2
Changelog+1−0
@@ -43,6 +43,7 @@ version <next>: · 42 unmodified lines
43- Rayman 2 ADPCM decoder43- Rayman 2 ADPCM decoder
44- Rayman 2 APM demuxer44- Rayman 2 APM demuxer
45- cas video filter45- cas video filter
46- High Voltage Software ADPCM decoder
46 47
47 48
48version 4.2:49version 4.2:
doc/general.texi+1−0
@@ -1100,6 +1100,7 @@ following image formats are supported: · 1099 unmodified lines
1100@item ADPCM IMA Electronic Arts EACS @tab @tab X1100@item ADPCM IMA Electronic Arts EACS @tab @tab X
1101@item ADPCM IMA Electronic Arts SEAD @tab @tab X1101@item ADPCM IMA Electronic Arts SEAD @tab @tab X
1102@item ADPCM IMA Funcom @tab @tab X1102@item ADPCM IMA Funcom @tab @tab X
1103@item ADPCM IMA High Voltage Software ALP @tab @tab X
1103@item ADPCM IMA QuickTime @tab X @tab X1104@item ADPCM IMA QuickTime @tab X @tab X
1104@item ADPCM IMA Simon & Schuster Interactive @tab @tab X1105@item ADPCM IMA Simon & Schuster Interactive @tab @tab X
1105@item ADPCM IMA Ubisoft APM @tab @tab X1106@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
834OBJS-$(CONFIG_ADPCM_G726LE_DECODER) += g726.o834OBJS-$(CONFIG_ADPCM_G726LE_DECODER) += g726.o
835OBJS-$(CONFIG_ADPCM_G726LE_ENCODER) += g726.o835OBJS-$(CONFIG_ADPCM_G726LE_ENCODER) += g726.o
836OBJS-$(CONFIG_ADPCM_IMA_AMV_DECODER) += adpcm.o adpcm_data.o836OBJS-$(CONFIG_ADPCM_IMA_AMV_DECODER) += adpcm.o adpcm_data.o
837OBJS-$(CONFIG_ADPCM_IMA_ALP_DECODER) += adpcm.o adpcm_data.o
837OBJS-$(CONFIG_ADPCM_IMA_APC_DECODER) += adpcm.o adpcm_data.o838OBJS-$(CONFIG_ADPCM_IMA_APC_DECODER) += adpcm.o adpcm_data.o
838OBJS-$(CONFIG_ADPCM_IMA_APM_DECODER) += adpcm.o adpcm_data.o839OBJS-$(CONFIG_ADPCM_IMA_APM_DECODER) += adpcm.o adpcm_data.o
839OBJS-$(CONFIG_ADPCM_IMA_DAT4_DECODER) += adpcm.o adpcm_data.o840OBJS-$(CONFIG_ADPCM_IMA_DAT4_DECODER) += adpcm.o adpcm_data.o
libavcodec/adpcm.c+36−0
@@ -15,6 +15,7 @@ · 14 unmodified lines
15 * Argonaut Games ADPCM decoder by Zane van Iperen (zane@zanevaniperen.com)15 * Argonaut Games ADPCM decoder by Zane van Iperen (zane@zanevaniperen.com)
16 * Simon & Schuster Interactive ADPCM decoder by Zane van Iperen (zane@zanevaniperen.com)16 * Simon & Schuster Interactive ADPCM decoder by Zane van Iperen (zane@zanevaniperen.com)
17 * Ubisoft ADPCM decoder by Zane van Iperen (zane@zanevaniperen.com)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 * This file is part of FFmpeg.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 return (int16_t)c->predictor;281 return (int16_t)c->predictor;
281}282}
282 283
284static 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
283static inline int16_t adpcm_ima_wav_expand_nibble(ADPCMChannelStatus *c, GetBitContext *gb, int bps)307static inline int16_t adpcm_ima_wav_expand_nibble(ADPCMChannelStatus *c, GetBitContext *gb, int bps)
284{308{
285 int nibble, step_index, predictor, sign, delta, diff, step, shift;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 case AV_CODEC_ID_ADPCM_AICA:699 case AV_CODEC_ID_ADPCM_AICA:
676 case AV_CODEC_ID_ADPCM_IMA_SSI:700 case AV_CODEC_ID_ADPCM_IMA_SSI:
677 case AV_CODEC_ID_ADPCM_IMA_APM:701 case AV_CODEC_ID_ADPCM_IMA_APM:
702 case AV_CODEC_ID_ADPCM_IMA_ALP:
678 nb_samples = buf_size * 2 / ch;703 nb_samples = buf_size * 2 / ch;
679 break;704 break;
680 }705 }
@@ -1247,6 +1272,16 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, · 566 unmodified lines
1247 samples += avctx->channels;1272 samples += avctx->channels;
1248 }1273 }
1249 break;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 case AV_CODEC_ID_ADPCM_IMA_OKI:1285 case AV_CODEC_ID_ADPCM_IMA_OKI:
1251 while (bytestream2_get_bytes_left(&gb) > 0) {1286 while (bytestream2_get_bytes_left(&gb) > 0) {
1252 int v = bytestream2_get_byteu(&gb);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
1997ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_RAD, sample_fmts_s16, adpcm_ima_rad, "ADPCM IMA Radical");2032ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_RAD, sample_fmts_s16, adpcm_ima_rad, "ADPCM IMA Radical");
1998ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_SSI, sample_fmts_s16, adpcm_ima_ssi, "ADPCM IMA Simon & Schuster Interactive");2033ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_SSI, sample_fmts_s16, adpcm_ima_ssi, "ADPCM IMA Simon & Schuster Interactive");
1999ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_SMJPEG, sample_fmts_s16, adpcm_ima_smjpeg, "ADPCM IMA Loki SDL MJPEG");2034ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_SMJPEG, sample_fmts_s16, adpcm_ima_smjpeg, "ADPCM IMA Loki SDL MJPEG");
2035ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_ALP, sample_fmts_s16, adpcm_ima_alp, "ADPCM IMA High Voltage Software ALP");
2000ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_WAV, sample_fmts_s16p, adpcm_ima_wav, "ADPCM IMA WAV");2036ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_WAV, sample_fmts_s16p, adpcm_ima_wav, "ADPCM IMA WAV");
2001ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_WS, sample_fmts_both, adpcm_ima_ws, "ADPCM IMA Westwood");2037ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_WS, sample_fmts_both, adpcm_ima_ws, "ADPCM IMA Westwood");
2002ADPCM_DECODER(AV_CODEC_ID_ADPCM_MS, sample_fmts_both, adpcm_ms, "ADPCM Microsoft");2038ADPCM_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
599extern AVCodec ff_adpcm_g726le_encoder;599extern AVCodec ff_adpcm_g726le_encoder;
600extern AVCodec ff_adpcm_g726le_decoder;600extern AVCodec ff_adpcm_g726le_decoder;
601extern AVCodec ff_adpcm_ima_amv_decoder;601extern AVCodec ff_adpcm_ima_amv_decoder;
602extern AVCodec ff_adpcm_ima_alp_decoder;
602extern AVCodec ff_adpcm_ima_apc_decoder;603extern AVCodec ff_adpcm_ima_apc_decoder;
603extern AVCodec ff_adpcm_ima_apm_decoder;604extern AVCodec ff_adpcm_ima_apm_decoder;
604extern AVCodec ff_adpcm_ima_dat4_decoder;605extern AVCodec ff_adpcm_ima_dat4_decoder;
libavcodec/avcodec.h+1−0
@@ -552,6 +552,7 @@ enum AVCodecID { · 551 unmodified lines
552 AV_CODEC_ID_ADPCM_IMA_SSI,552 AV_CODEC_ID_ADPCM_IMA_SSI,
553 AV_CODEC_ID_ADPCM_ZORK,553 AV_CODEC_ID_ADPCM_ZORK,
554 AV_CODEC_ID_ADPCM_IMA_APM,554 AV_CODEC_ID_ADPCM_IMA_APM,
555 AV_CODEC_ID_ADPCM_IMA_ALP,
555 556
556 /* AMR */557 /* AMR */
557 AV_CODEC_ID_AMR_NB = 0x12000,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 .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA Ubisoft APM"),2325 .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA Ubisoft APM"),
2326 .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY,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 /* AMR */2336 /* AMR */
2330 {2337 {
libavcodec/version.h+2−2
@@ -28,8 +28,8 @@ · 27 unmodified lines
28#include "libavutil/version.h"28#include "libavutil/version.h"
29 29
30#define LIBAVCODEC_VERSION_MAJOR 5830#define LIBAVCODEC_VERSION_MAJOR 58
31#define LIBAVCODEC_VERSION_MINOR 7331#define LIBAVCODEC_VERSION_MINOR 74
32#define LIBAVCODEC_VERSION_MICRO 10232#define LIBAVCODEC_VERSION_MICRO 100
33 33
34#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \34#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
35 LIBAVCODEC_VERSION_MINOR, \35 LIBAVCODEC_VERSION_MINOR, \

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t