WavPack lossless audio decoder

Originally committed as revision 6336 to svn://svn.ffmpeg.org/ffmpeg/trunk
dilaroga · Sep 26, 2006 · 730581f · 730581f
1 parent 1a174c2
commit 730581f
Show file tree

Hide file tree

Showing 11 changed files with 770 additions and 0 deletions.
diff --git a/Changelog b/Changelog
@@ -58,6 +58,7 @@ version <next>
 - VMware video decoder
 - VP5 video decoder
 - VP6 video decoder
+- WavPack lossless audio decoder
 
 version 0.4.9-pre1:
 

diff --git a/MAINTAINERS b/MAINTAINERS
@@ -167,6 +167,7 @@ Codecs:
   vp5                                   Aurelien Jacobs
   vp6                                   Aurelien Jacobs
   vqavideo.c                            Mike Melanson
+  wavpack.c                             Kostya Shishkov
   wmv2.c                                Michael Niedermayer
   wnv1.c                                Kostya Shishkov
   x264.c                                Mans Rullgard
@@ -219,6 +220,7 @@ Muxers/Demuxers:
   wav.c                                 Michael Niedermayer
   wc3movie.c                            Mike Melanson
   westwood.c                            Mike Melanson
+  wv.c                                  Kostya Shishkov
 
 
 Operating systems / CPU architectures

diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
@@ -893,6 +893,7 @@ following image formats are supported:
 @item DSP Group TrueSpeech   @tab      @tab X
 @item True Audio (TTA)       @tab      @tab X
 @item Smacker Audio          @tab      @tab X
+@item WavPack Audio          @tab      @tab X
 @end multitable
 
 @code{X} means that encoding (resp. decoding) is supported.

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
@@ -126,6 +126,7 @@ OBJS-$(CONFIG_VP3_DECODER)             += vp3.o
 OBJS-$(CONFIG_VP5_DECODER)             += vp5.o vp56.o vp56data.o
 OBJS-$(CONFIG_VP6_DECODER)             += vp6.o vp56.o vp56data.o
 OBJS-$(CONFIG_VQA_DECODER)             += vqavideo.o
+OBJS-$(CONFIG_WAVPACK_DECODER)         += wavpack.o
 OBJS-$(CONFIG_WMAV1_DECODER)           += wmadec.o
 OBJS-$(CONFIG_WMAV2_DECODER)           += wmadec.o
 OBJS-$(CONFIG_WMV3_DECODER)            += vc1.o

diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
@@ -540,6 +540,9 @@ void avcodec_register_all(void)
 #ifdef CONFIG_VMNC_DECODER
     register_avcodec(&vmnc_decoder);
 #endif //CONFIG_VMNC_DECODER
+#ifdef CONFIG_WAVPACK_DECODER
+    register_avcodec(&wavpack_decoder);
+#endif //CONFIG_WAVPACK_DECODER
 #endif /* CONFIG_DECODERS */
 
 #if defined(CONFIG_AMR_NB) || defined(CONFIG_AMR_NB_FIXED)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
@@ -224,6 +224,7 @@ enum CodecID {
     CODEC_ID_TTA,
     CODEC_ID_SMACKAUDIO,
     CODEC_ID_QCELP,
+    CODEC_ID_WAVPACK,
 
     /* subtitle codecs */
     CODEC_ID_DVD_SUBTITLE= 0x17000,
@@ -2285,6 +2286,7 @@ extern AVCodec kmvc_decoder;
 extern AVCodec flashsv_decoder;
 extern AVCodec cavs_decoder;
 extern AVCodec vmnc_decoder;
+extern AVCodec wavpack_decoder;
 
 /* pcm codecs */
 #define PCM_CODEC(id, name) \