Merge commit '3e589878'

* commit '3e589878':
  Voxware MetaSound decoder

Conflicts:
	Changelog
	libavcodec/Makefile
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Changelog

@@ -13,6 +13,7 @@ version <next>
   the -noaccurate_seek option.
 - ffmpeg -t option can now be used for inputs, to limit the duration of
   data read from an input file
+- incomplete Voxware MetaSound decoder
 
 
 version 2.0:

configure

@@ -1809,6 +1809,7 @@ lagarith_decoder_select="dsputil"
 ljpeg_encoder_select="aandcttables mpegvideoenc"
 loco_decoder_select="golomb"
 mdec_decoder_select="dsputil error_resilience mpegvideo"
+metasound_decoder_select="lsp mdct sinewin"
 mimic_decoder_select="dsputil hpeldsp"
 mjpeg_decoder_select="dsputil hpeldsp"
 mjpegb_decoder_select="dsputil hpeldsp"

doc/general.texi

@@ -922,6 +922,8 @@ following image formats are supported:
     @tab Used in LucasArts SMUSH animations.
 @item Vorbis                 @tab  E  @tab  X
     @tab A native but very primitive encoder exists.
+@item Voxware MetaSound      @tab     @tab  X
+    @tab imperfect and incomplete support
 @item WavPack                @tab  E  @tab  X
     @tab supported through external library libwavpack
 @item Westwood Audio (SND1)  @tab     @tab  X

libavcodec/Makefile

@@ -261,6 +261,8 @@ OBJS-$(CONFIG_LOCO_DECODER)            += loco.o
 OBJS-$(CONFIG_MACE3_DECODER)           += mace.o
 OBJS-$(CONFIG_MACE6_DECODER)           += mace.o
 OBJS-$(CONFIG_MDEC_DECODER)            += mdec.o mpeg12.o mpeg12data.o
+OBJS-$(CONFIG_METASOUND_DECODER)       += metasound.o metasound_data.o \
+                                          twinvq.o
 OBJS-$(CONFIG_MICRODVD_DECODER)        += microdvddec.o ass.o
 OBJS-$(CONFIG_MIMIC_DECODER)           += mimic.o
 OBJS-$(CONFIG_MJPEG_DECODER)           += mjpegdec.o mjpeg.o

libavcodec/allcodecs.c

@@ -332,6 +332,7 @@ void avcodec_register_all(void)
     REGISTER_DECODER(IMC,               imc);
     REGISTER_DECODER(MACE3,             mace3);
     REGISTER_DECODER(MACE6,             mace6);
+    REGISTER_DECODER(METASOUND,         metasound);
     REGISTER_DECODER(MLP,               mlp);
     REGISTER_DECODER(MP1,               mp1);
     REGISTER_DECODER(MP1FLOAT,          mp1float);

libavcodec/metasound_data.h

+/*
+ * MetaSound decoder
+ * Copyright (c) 2013 Konstantin Shishkov
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg 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.
+ *
+ * FFmpeg 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 FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_METASOUND_DATA_H
+#define AVCODEC_METASOUND_DATA_H
+
+#include <stddef.h>
+#include <stdint.h>
+
+#include "twinvq.h"
+
+extern const TwinVQModeTab ff_metasound_mode0806;
+extern const TwinVQModeTab ff_metasound_mode0806s;
+extern const TwinVQModeTab ff_metasound_mode0808;
+extern const TwinVQModeTab ff_metasound_mode0808s;
+extern const TwinVQModeTab ff_metasound_mode1110;
+extern const TwinVQModeTab ff_metasound_mode1110s;
+extern const TwinVQModeTab ff_metasound_mode1616;
+extern const TwinVQModeTab ff_metasound_mode1616s;
+extern const TwinVQModeTab ff_metasound_mode2224;
+extern const TwinVQModeTab ff_metasound_mode2224s;
+extern const TwinVQModeTab ff_metasound_mode2232;
+extern const TwinVQModeTab ff_metasound_mode2232s;
+extern const TwinVQModeTab ff_metasound_mode4432;
+extern const TwinVQModeTab ff_metasound_mode4432s;
+extern const TwinVQModeTab ff_metasound_mode4440;
+extern const TwinVQModeTab ff_metasound_mode4440s;
+extern const TwinVQModeTab ff_metasound_mode4448;
+extern const TwinVQModeTab ff_metasound_mode4448s;
+
+#endif /* AVCODEC_METASOUND_DATA_H */

libavcodec/twinvq.c

@@ -686,6 +686,11 @@ static av_cold void init_bitstream_params(TwinVQContext *tctx)
             TWINVQ_WINDOW_TYPE_BITS +
             mtab->fmode[i].sub * (bse_bits[i] + n_ch * TWINVQ_SUB_GAIN_BITS);
 
+    if (tctx->codec == TWINVQ_CODEC_METASOUND) {
+        bsize_no_main_cb[1] += 2;
+        bsize_no_main_cb[2] += 2;
+    }
+
     // The remaining bits are all used for the main spectrum coefficients
     for (i = 0; i < 4; i++) {
         int bit_size, vect_size;

libavcodec/version.h

@@ -29,7 +29,7 @@
 #include "libavutil/avutil.h"
 
 #define LIBAVCODEC_VERSION_MAJOR 55
-#define LIBAVCODEC_VERSION_MINOR  23
+#define LIBAVCODEC_VERSION_MINOR  24
 #define LIBAVCODEC_VERSION_MICRO 100
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \