AMR-NB floating-point based decoder.

Code produced during SoC by Robert Swain and Colin McQuillan. Originally committed as revision 21943 to svn://svn.ffmpeg.org/ffmpeg/trunk
lu-zero · Feb 21, 2010 · 4fe3eda · 4fe3eda
1 parent f1b267d
commit 4fe3eda
Show file tree

Hide file tree

Showing 6 changed files with 2,761 additions and 2 deletions.
diff --git a/Changelog b/Changelog
@@ -59,6 +59,7 @@ version <next>:
 - RTP depacketization of AMR
 - WMAVoice decoder
 - FFprobe tool
+- AMR-NB decoder
 
 
 

diff --git a/doc/general.texi b/doc/general.texi
@@ -549,8 +549,8 @@ following image formats are supported:
 @item ADPCM Westwood Studios IMA @tab     @tab  X
     @tab Used in Westwood Studios games like Command and Conquer.
 @item ADPCM Yamaha           @tab  X  @tab  X
-@item AMR-NB                 @tab  E  @tab  E
-    @tab supported through external library libopencore-amrnb
+@item AMR-NB                 @tab  X  @tab  E
+    @tab encoding supported through external library libopencore-amrnb
 @item AMR-WB                 @tab     @tab  E
     @tab decoding supported through external library libopencore-amrwb
 @item Apple lossless audio   @tab  X  @tab  X

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
@@ -51,6 +51,10 @@ OBJS-$(CONFIG_AC3_ENCODER)             += ac3enc.o ac3tab.o ac3.o
 OBJS-$(CONFIG_ALAC_DECODER)            += alac.o
 OBJS-$(CONFIG_ALAC_ENCODER)            += alacenc.o
 OBJS-$(CONFIG_ALS_DECODER)             += alsdec.o bgmc.o mpeg4audio.o
+OBJS-$(CONFIG_AMRNB_DECODER)           += amrnbdec.o celp_filters.o   \
+                                          celp_math.o acelp_filters.o \
+                                          acelp_vectors.o lsp.o       \
+                                          acelp_pitch_delay.o
 OBJS-$(CONFIG_AMV_DECODER)             += sp5xdec.o mjpegdec.o mjpeg.o
 OBJS-$(CONFIG_ANM_DECODER)             += anm.o
 OBJS-$(CONFIG_APE_DECODER)             += apedec.o

diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
@@ -214,6 +214,7 @@ void avcodec_register_all(void)
     REGISTER_ENCDEC  (AC3, ac3);
     REGISTER_ENCDEC  (ALAC, alac);
     REGISTER_DECODER (ALS, als);
+    REGISTER_DECODER (AMRNB, amrnb);
     REGISTER_DECODER (APE, ape);
     REGISTER_DECODER (ATRAC1, atrac1);
     REGISTER_DECODER (ATRAC3, atrac3);