diff --git a/configure b/configure index 6ea314c776..fb4d892694 100755 --- a/configure +++ b/configure @@ -83,6 +83,8 @@ show_help(){ echo " --enable-liba52 enable GPLed liba52 support [default=no]" echo " --enable-liba52bin open liba52.so.0 at runtime [default=no]" echo " --enable-avisynth allow reading AVISynth script files [default=no]" + echo " --enable-libamr-nb enable libamr-nb floating point audio codec" + echo " --enable-libamr-wb enable libamr-wb floating point audio codec" echo " --enable-libdts enable GPLed libdts support [default=no]" echo " --enable-libfaac enable FAAC support via libfaac [default=no]" echo " --enable-libfaad enable FAAD support via libfaad [default=no]" @@ -98,8 +100,6 @@ show_help(){ echo " --enable-x264 enable H.264 encoding via x264 [default=no]" echo " --enable-xvid enable Xvid encoding via xvidcore," echo " native MPEG-4/Xvid encoder exists [default=no]" - echo " --enable-amr-nb enable amr-nb floating point audio codec" - echo " --enable-amr-wb enable amr-wb floating point audio codec" echo "" echo "Advanced options (experts only):" echo " --source-path=PATH path to source code [$source_path]" @@ -556,9 +556,6 @@ CONFIG_LIST=' parsers muxers demuxers - amr - amr_nb - amr_wb audio_beos audio_oss avisynth @@ -574,6 +571,9 @@ CONFIG_LIST=' ipv6 liba52 liba52bin + libamr + libamr_nb + libamr_wb libdts libfaac libfaad @@ -683,12 +683,12 @@ zmbv_encoder_deps="zlib" aac_decoder_deps="libfaad" mpeg4aac_decoder_deps="libfaad" -amr_nb_decoder_deps="amr_nb" -amr_nb_encoder_deps="amr_nb" -amr_wb_decoder_deps="amr_wb" -amr_wb_encoder_deps="amr_wb" faac_encoder_deps="libfaac" liba52_decoder_deps="liba52" +libamr_nb_decoder_deps="libamr_nb" +libamr_nb_encoder_deps="libamr_nb" +libamr_wb_decoder_deps="libamr_wb" +libamr_wb_encoder_deps="libamr_wb" libdts_decoder_deps="libdts" libgsm_decoder_deps="libgsm" libgsm_encoder_deps="libgsm" @@ -793,14 +793,14 @@ v4l2="yes" v4l="yes" # libraries -amr_nb="no" -amr_wb="no" avisynth="no" dc1394="no" dlfcn_h="no" dlopen="no" liba52="no" liba52bin="no" +libamr_nb="no" +libamr_wb="no" libdts="no" libfaac="no" libfaad2="no" @@ -1586,12 +1586,12 @@ for thread in $THREADS_LIST; do fi done -enabled_any amr_nb amr_wb && enable amr +enabled_any libamr_nb libamr_wb && enable libamr # these are off by default, so fail if requested and not available -enabled amr_nb && require libamrnb amrnb/interf_dec.h Speech_Decode_Frame_init -lamrnb -lm -enabled amr_wb && require libamrwb amrwb/dec_if.h D_IF_init -lamrwb -lm enabled liba52 && require liba52 a52dec/a52.h a52_init -la52 +enabled libamr_nb && require libamrnb amrnb/interf_dec.h Speech_Decode_Frame_init -lamrnb -lm +enabled libamr_wb && require libamrwb amrwb/dec_if.h D_IF_init -lamrwb -lm enabled libdts && require libdts dts.h dts_init -ldts -lm enabled libgsm && require libgsm gsm.h gsm_create -lgsm enabled libmp3lame && require LAME lame/lame.h lame_init -lmp3lame -lm @@ -1851,6 +1851,8 @@ echo "Sun medialib support $mlib" echo "AVISynth enabled $avisynth" echo "liba52 support $liba52" echo "liba52 dlopened $liba52bin" +echo "libamr-nb support $libamr_nb" +echo "libamr-wb support $libamr_wb" echo "libdts support $libdts" echo "libfaac enabled $libfaac" echo "libfaad enabled $libfaad" @@ -1864,8 +1866,6 @@ echo "libvorbis enabled $libvorbis" echo "x264 enabled $x264" echo "XviD enabled $xvid" echo "zlib enabled $zlib" -echo "AMR-NB float support $amr_nb" -echo "AMR-WB float support $amr_wb" if disabled gpl; then echo "License: LGPL" else diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 14b70adfc3..a7ef433102 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -260,7 +260,7 @@ OBJS-$(CONFIG_ADPCM_YAMAHA_DECODER) += adpcm.o OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER) += adpcm.o # external codec libraries -OBJS-$(CONFIG_AMR) += amr.o +OBJS-$(CONFIG_LIBAMR) += amr.o OBJS-$(CONFIG_LIBA52) += a52dec.o OBJS-$(CONFIG_LIBDTS) += dtsdec.o OBJS-$(CONFIG_LIBFAAC) += faac.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 54ca26118a..5b1c6ccc36 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -165,8 +165,6 @@ void avcodec_register_all(void) REGISTER_DECODER(MPEG4AAC, mpeg4aac); REGISTER_ENCODER(AC3, ac3); REGISTER_DECODER(ALAC, alac); - REGISTER_ENCDEC (AMR_NB, amr_nb); - REGISTER_ENCDEC (AMR_WB, amr_wb); REGISTER_DECODER(ATRAC3, atrac3); REGISTER_DECODER(COOK, cook); REGISTER_DECODER(DCA, dca); @@ -174,6 +172,8 @@ void avcodec_register_all(void) REGISTER_ENCODER(FAAC, faac); REGISTER_ENCDEC (FLAC, flac); REGISTER_DECODER(IMC, imc); + REGISTER_ENCDEC (LIBAMR_NB, libamr_nb); + REGISTER_ENCDEC (LIBAMR_WB, libamr_wb); REGISTER_DECODER(LIBA52, liba52); REGISTER_DECODER(LIBDTS, libdts); REGISTER_ENCDEC (LIBGSM, libgsm); diff --git a/libavcodec/amr.c b/libavcodec/amr.c index bff406cb3a..afe597de23 100644 --- a/libavcodec/amr.c +++ b/libavcodec/amr.c @@ -65,7 +65,7 @@ #include "avcodec.h" -#ifdef CONFIG_AMR_NB_FIXED +#ifdef CONFIG_LIBAMR_NB_FIXED #define MMS_IO @@ -136,7 +136,7 @@ static void amr_decode_fix_avctx(AVCodecContext * avctx) avctx->frame_size = 160 * is_amr_wb; } -#ifdef CONFIG_AMR_NB_FIXED +#ifdef CONFIG_LIBAMR_NB_FIXED /* fixed point version*/ /* frame size in serial bitstream file (frame type + serial stream + flags) */ #define SERIAL_FRAMESIZE (1+MAX_SERIAL_SIZE+5) @@ -352,7 +352,7 @@ static int amr_nb_encode_frame(AVCodecContext *avctx, } -#elif defined(CONFIG_AMR_NB) /* Float point version*/ +#elif defined(CONFIG_LIBAMR_NB) /* Float point version*/ typedef struct AMRContext { int frameCount; @@ -491,11 +491,11 @@ static int amr_nb_encode_frame(AVCodecContext *avctx, #endif -#if defined(CONFIG_AMR_NB) || defined(CONFIG_AMR_NB_FIXED) +#if defined(CONFIG_LIBAMR_NB) || defined(CONFIG_LIBAMR_NB_FIXED) -AVCodec amr_nb_decoder = +AVCodec libamr_nb_decoder = { - "amr_nb", + "libamr_nb", CODEC_TYPE_AUDIO, CODEC_ID_AMR_NB, sizeof(AMRContext), @@ -505,9 +505,9 @@ AVCodec amr_nb_decoder = amr_nb_decode_frame, }; -AVCodec amr_nb_encoder = +AVCodec libamr_nb_encoder = { - "amr_nb", + "libamr_nb", CODEC_TYPE_AUDIO, CODEC_ID_AMR_NB, sizeof(AMRContext), @@ -520,7 +520,7 @@ AVCodec amr_nb_encoder = #endif /* -----------AMR wideband ------------*/ -#ifdef CONFIG_AMR_WB +#ifdef CONFIG_LIBAMR_WB #ifdef _TYPEDEF_H //To avoid duplicate typedefs from typdef in amr-nb @@ -684,9 +684,9 @@ static int amr_wb_decode_close(AVCodecContext * avctx) return 0; } -AVCodec amr_wb_decoder = +AVCodec libamr_wb_decoder = { - "amr_wb", + "libamr_wb", CODEC_TYPE_AUDIO, CODEC_ID_AMR_WB, sizeof(AMRWBContext), @@ -696,9 +696,9 @@ AVCodec amr_wb_decoder = amr_wb_decode_frame, }; -AVCodec amr_wb_encoder = +AVCodec libamr_wb_encoder = { - "amr_wb", + "libamr_wb", CODEC_TYPE_AUDIO, CODEC_ID_AMR_WB, sizeof(AMRWBContext), @@ -708,4 +708,4 @@ AVCodec amr_wb_encoder = NULL, }; -#endif //CONFIG_AMR_WB +#endif //CONFIG_LIBAMR_WB diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 111eb6bf9c..9d6d04ab8a 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2423,12 +2423,12 @@ extern AVCodec rawvideo_encoder; /* the following codecs use external libs */ extern AVCodec aac_decoder; -extern AVCodec amr_nb_decoder; -extern AVCodec amr_nb_encoder; -extern AVCodec amr_wb_decoder; -extern AVCodec amr_wb_encoder; extern AVCodec faac_encoder; extern AVCodec liba52_decoder; +extern AVCodec libamr_nb_decoder; +extern AVCodec libamr_nb_encoder; +extern AVCodec libamr_wb_decoder; +extern AVCodec libamr_wb_encoder; extern AVCodec libdts_decoder; extern AVCodec libgsm_decoder; extern AVCodec libgsm_encoder;