Signed-off-by: Paul B Mahol <[email protected]>
---
doc/general.texi | 2 +
libavcodec/Makefile | 1 +
libavcodec/allcodecs.c | 1 +
libavcodec/avcodec.h | 1 +
libavcodec/version.h | 2 +-
libavcodec/vima.c | 272 ++++++++++++++++++++++++++++++++++++++++++++++++
6 files changed, 278 insertions(+), 1 deletions(-)
create mode 100644 libavcodec/vima.c
diff --git a/doc/general.texi b/doc/general.texi
index 88949c6..14040db 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -764,6 +764,8 @@ following image formats are supported:
@item TrueHD @tab @tab X
@tab Used in HD-DVD and Blu-Ray discs.
@item TwinVQ (VQF flavor) @tab @tab X
+@item VIMA
+ @tab Used in SANM variant of LucasArts SMUSH animations.
@item Vorbis @tab E @tab X
@tab A native but very primitive encoder exists.
@item WavPack @tab @tab X
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 95ed39a..05db041 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -541,6 +541,7 @@ OBJS-$(CONFIG_ADPCM_THP_DECODER) += adpcm.o
adpcm_data.o
OBJS-$(CONFIG_ADPCM_XA_DECODER) += adpcm.o adpcm_data.o
OBJS-$(CONFIG_ADPCM_YAMAHA_DECODER) += adpcm.o adpcm_data.o
OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER) += adpcmenc.o adpcm_data.o
+OBJS-$(CONFIG_VIMA_DECODER) += vima.o
# libavformat dependencies
OBJS-$(CONFIG_ADTS_MUXER) += mpeg4audio.o
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 615946a..03eec03 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -363,6 +363,7 @@ void avcodec_register_all(void)
REGISTER_DECODER (ADPCM_THP, adpcm_thp);
REGISTER_DECODER (ADPCM_XA, adpcm_xa);
REGISTER_ENCDEC (ADPCM_YAMAHA, adpcm_yamaha);
+ REGISTER_DECODER (VIMA, vima);
/* subtitles */
REGISTER_ENCDEC (ASS, ass);
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 9f4aaa9..9219f84 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -309,6 +309,7 @@ enum CodecID {
CODEC_ID_ADPCM_IMA_ISS,
CODEC_ID_ADPCM_G722,
CODEC_ID_ADPCM_IMA_APC,
+ CODEC_ID_VIMA,
/* AMR */
CODEC_ID_AMR_NB = 0x12000,
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 4573568..39ecd68 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -21,7 +21,7 @@
#define AVCODEC_VERSION_H
#define LIBAVCODEC_VERSION_MAJOR 54
-#define LIBAVCODEC_VERSION_MINOR 9
+#define LIBAVCODEC_VERSION_MINOR 10
#define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
diff --git a/libavcodec/vima.c b/libavcodec/vima.c
new file mode 100644
index 0000000..46ffe4c
--- /dev/null
+++ b/libavcodec/vima.c
@@ -0,0 +1,272 @@
+/*
+ * LucasArt VIMA decoder
+ * Copyright (c) 2012 Paul B Mahol
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "avcodec.h"
+#include "bytestream.h"
+
+typedef struct {
+ AVFrame frame;
+ uint16_t *predict_table;
+} VimaContext;
+
+static const int16_t step_table[] =
+{
+ 7, 8, 9, 10, 11, 12, 13, 14, 16, 17,
+ 19, 21, 23, 25, 28, 31, 34, 37, 41, 45,
+ 50, 55, 60, 66, 73, 80, 88, 97, 107, 118,
+ 130, 143, 157, 173, 190, 209, 230, 253, 279, 307,
+ 337, 371, 408, 449, 494, 544, 598, 658, 724, 796,
+ 876, 963, 1060, 1166, 1282, 1411, 1552, 1707, 1878, 2066,
+ 2272, 2499, 2749, 3024, 3327, 3660, 4026, 4428, 4871, 5358,
+ 5894, 6484, 7132, 7845, 8630, 9493, 10442, 11487, 12635, 13899,
+ 15289, 16818, 18500, 20350, 22385, 24623, 27086, 29794, 32767
+};
+
+static const uint8_t size_table[] =
+{
+ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5,
+ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+ 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7
+};
+
+static const int8_t index_table1[] =
+{
+ -1, 4, -1, 4
+};
+
+static const int8_t index_table2[] =
+{
+ -1, -1, 2, 6, -1, -1, 2, 6
+};
+
+static const int8_t index_table3[] =
+{
+ -1, -1, -1, -1, 1, 2, 4, 6,
+ -1, -1, -1, -1, 1, 2, 4, 6
+};
+
+static const int8_t index_table4[] =
+{
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ 1, 1, 1, 2, 2, 4, 5, 6,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ 1, 1, 1, 2, 2, 4, 5, 6
+};
+
+static const int8_t index_table5[] =
+{
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ 1, 1, 1, 1, 1, 2, 2, 2,
+ 2, 4, 4, 4, 5, 5, 6, 6,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ 1, 1, 1, 1, 1, 2, 2, 2,
+ 2, 4, 4, 4, 5, 5, 6, 6
+};
+
+static const int8_t index_table6[] =
+{
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 2, 2, 2, 2, 2, 2,
+ 2, 2, 4, 4, 4, 4, 4, 4,
+ 5, 5, 5, 5, 6, 6, 6, 6,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 2, 2, 2, 2, 2, 2,
+ 2, 2, 4, 4, 4, 4, 4, 4,
+ 5, 5, 5, 5, 6, 6, 6, 6
+};
+
+static const int8_t* step_index_tables[] =
+{
+ index_table1, index_table2, index_table3,
+ index_table4, index_table5, index_table6
+};
+
+static av_cold int decode_init(AVCodecContext *avctx)
+{
+ VimaContext *vima = avctx->priv_data;
+ int start_pos, i;
+
+ vima->predict_table = av_mallocz(5786 * 2);
+ if (!vima->predict_table) {
+ av_log(avctx, AV_LOG_ERROR, "Could not allocate predict table.\n");
+ return AVERROR(ENOMEM);
+ }
+
+ for (start_pos = 0, i = 0; start_pos < 64; start_pos++, i++) {
+ unsigned int dest_pos, table_pos;
+
+ for (table_pos = 0, dest_pos = start_pos;
+ table_pos < sizeof(step_table) / sizeof(step_table[0]);
+ table_pos++, dest_pos += 64) {
+ int put = 0, count, table_value;
+
+ for (count = 32, table_value = step_table[table_pos]; count != 0;
+ count >>= 1, table_value >>= 1) {
+ if (i & count)
+ put += table_value;
+ }
+ vima->predict_table[dest_pos] = put;
+ }
+ }
+
+ avcodec_get_frame_defaults(&vima->frame);
+ avctx->coded_frame = &vima->frame;
+ avctx->sample_fmt = AV_SAMPLE_FMT_S16;
+
+ return 0;
+}
+
+static int decode_frame(AVCodecContext *avctx, void *data,
+ int *got_frame_ptr, AVPacket *pkt)
+{
+ GetByteContext gb;
+ VimaContext *vima = avctx->priv_data;
+ int16_t pcm_data[2];
+ int8_t channel_hint[2];
+ uint8_t *dest;
+ int bits, bitPtr = 0, ret, chan, samples, channels = 1;
+
+ bytestream2_init(&gb, pkt->data, pkt->size);
+
+ if (bytestream2_get_bytes_left(&gb) < 13)
+ return -1;
+
+ samples = bytestream2_get_be32u(&gb);
+ if (samples < 0) {
+ bytestream2_skip(&gb, 4);
+ samples = bytestream2_get_be32u(&gb);
+ }
+
+ channel_hint[0] = bytestream2_get_byteu(&gb);
+ if (channel_hint[0] & 0x80) {
+ channel_hint[0] = ~channel_hint[0];
+ channels = 2;
+ }
+ avctx->channels = channels;
+ pcm_data[0] = bytestream2_get_be16u(&gb);
+ if (channels > 1) {
+ channel_hint[1] = bytestream2_get_byte(&gb);
+ pcm_data[1] = bytestream2_get_be16(&gb);
+ }
+ bits = bytestream2_get_be16(&gb);
+
+ vima->frame.nb_samples = samples;
+ if ((ret = avctx->get_buffer(avctx, &vima->frame)) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+ return ret;
+ }
+ dest = vima->frame.data[0];
+
+ for (chan = 0; chan < channels; chan++) {
+ uint8_t *destPos = dest + chan;
+ int step_index = channel_hint[chan];
+ int outputWord = pcm_data[chan];
+ int sample;
+
+ for (sample = 0; sample < samples; sample++) {
+ int lookup_size, highBit, lowBits, val;
+
+ step_index = av_clip(step_index, 0, 88);
+ lookup_size = size_table[step_index];
+ highBit = 1 << (lookup_size - 1);
+ lowBits = highBit - 1;
+ bitPtr += lookup_size;
+ val = (bits >> (16 - bitPtr)) & (highBit | lowBits);
+ if (bitPtr > 7) {
+ if (bytestream2_get_bytes_left(&gb) < 1)
+ return -1;
+
+ bits = ((bits & 0xff) << 8) | bytestream2_get_byteu(&gb);
+ bitPtr -= 8;
+ }
+
+ if (val & highBit)
+ val ^= highBit;
+ else
+ highBit = 0;
+
+ if (val == lowBits) {
+ if (bytestream2_get_bytes_left(&gb) < 2)
+ return -1;
+
+ outputWord = ((int16_t)(bits << bitPtr) & 0xffffff00);
+ bits = ((bits & 0xff) << 8) |
bytestream2_get_byteu(&gb);
+ outputWord |= ((bits >> (8 - bitPtr)) & 0xff);
+ bits = ((bits & 0xff) << 8) |
bytestream2_get_byteu(&gb);
+ } else {
+ int predict_index, delta;
+
+ predict_index = (val << (7 - lookup_size)) | (step_index << 6);
+ predict_index = av_clip(predict_index, 0, 5785);
+ delta = vima->predict_table[predict_index];
+ if (val)
+ delta += step_table[step_index] >> (lookup_size - 1);
+ if (highBit)
+ delta = -delta;
+
+ outputWord += delta;
+ outputWord = av_clip(outputWord, -0x8000, 0x7fff);
+ }
+
+ bytestream_put_be16(&destPos, outputWord);
+ destPos += channels;
+
+ step_index += step_index_tables[lookup_size - 2][val];
+ }
+ }
+
+ *got_frame_ptr = 1;
+ *(AVFrame *)data = vima->frame;
+
+ return pkt->size;
+}
+
+static av_cold int decode_end(AVCodecContext *avctx)
+{
+ VimaContext *vima = avctx->priv_data;
+
+ av_free(vima->predict_table);
+
+ return 0;
+}
+
+AVCodec ff_vima_decoder = {
+ .name = "vima",
+ .type = AVMEDIA_TYPE_AUDIO,
+ .id = CODEC_ID_VIMA,
+ .priv_data_size = sizeof(VimaContext),
+ .init = decode_init,
+ .close = decode_end,
+ .decode = decode_frame,
+ .capabilities = CODEC_CAP_DR1,
+ .long_name = NULL_IF_CONFIG_SMALL("LucasArts SMUSH audio"),
+};
--
1.7.7
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
