[MPlayer-cvslog] CVS: main configure, 1.980, 1.981 mencoder.c, 1.280, 1.281 Makefile, 1.320, 1.321 cfg-mencoder.h, 1.95, 1.96

[Nico Sabbi CVS]

CVS change done by Nico Sabbi CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv17185

Modified Files:
	configure mencoder.c Makefile cfg-mencoder.h 
Log Message:
added faac audio encoder

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.980
retrieving revision 1.981
diff -u -r1.980 -r1.981
--- configure	22 Apr 2005 06:59:58 -0000	1.980
+++ configure	25 Apr 2005 07:07:57 -0000	1.981
@@ -217,6 +217,7 @@
   --disable-internal-matroska disable internal Matroska support [enabled]
   --enable-external-faad build with external FAAD2 (AAC) support [autodetect]
   --disable-internal-faad disable internal FAAD2 (AAC) support [autodetect]
+  --disable-faac         disable support for FAAC (AAC encoder) [autodetect]
   --disable-ladspa       disable LADSPA plugin support [autodetect]
   --disable-libdv        disable libdv 0.9.5 en/decoding support [autodetect]
   --disable-mad          disable libmad (MPEG audio) support [autodetect]
@@ -1333,6 +1334,7 @@
 _tremor=no
 _faad_internal=auto
 _faad_external=auto
+_faac=auto
 _ladspa=auto
 _xmms=no
 # dvdnav disabled, it does not work
@@ -1531,6 +1533,7 @@
   --disable-internal-faad)	_faad_internal=no	;;
   --enable-external-faad)	_faad_external=yes	_faad_internal=no	;;
   --disable-external-faad)	_faad_external=no	;;
+  --disable-faac)	_faac=no	;;
   --enable-ladspa)	_ladspa=yes	;;
   --disable-ladspa)	_ladspa=no		;;
   --enable-xmms)	_xmms=yes	;;
@@ -5317,6 +5320,34 @@
 fi
 echores "$_matroska_internal"
 
+echocheck "FAAC (AAC encoder) support"
+if test "$_faac" = auto ; then
+  cat > $TMPC <<EOF
+#include <inttypes.h> 
+#include <faac.h>
+int main(void) { unsigned long x, y; faacEncOpen(48000, 2, &x, &y); return 0; }
+EOF
+  if ( cc_check -c -O4 -lfaac $_ld_lm ); then
+    _faac=yes
+    _ld_faac="-lfaac"
+  else
+    if ( cc_check -c -O4 -lfaac -lmp4v2 -lstdc++ $_ld_lm ); then
+      _faac=yes
+      _ld_faac="-lfaac -lmp4v2 -lstdc++"
+    else
+      _faac=no
+      _ld_faac=""
+    fi
+  fi
+fi
+if test "$_faac" = yes ; then
+  _def_faac="#define HAVE_FAAC 1"
+  _codecmodules="$_codecmodules faac"
+else
+  _def_faac="#undef HAVE_FAAC"
+  _nocodecmodules="$_nocodecmodules faac"
+fi
+echores "$_faac"
 
 echocheck "internal FAAD2 (AAC) support"
 _inc_faad="-I`pwd`/libfaad2"
@@ -6846,6 +6877,8 @@
 TOOLAME=$_toolame
 TOOLAME_EXTRAFLAGS=$_toolame_extraflags
 TOOLAME_LIB=$_toolame_lib
+FAAC=$_faac
+FAAC_LIB=$_ld_faac
 AMR_NB=$_amr_nb
 AMR_NB_FIXED=$_amr_nb_fixed
 AMR_WB=$_amr_wb
@@ -7382,6 +7415,9 @@
 $_def_faad
 $_def_faad_internal
 
+/* enable FAAC (AAC encoder) support */
+$_def_faac
+
 /* enable LADSPA plugin support */
 $_def_ladspa
 

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -r1.280 -r1.281
--- mencoder.c	22 Apr 2005 06:59:58 -0000	1.280
+++ mencoder.c	25 Apr 2005 07:07:57 -0000	1.281
@@ -17,6 +17,7 @@
 #define ACODEC_NULL 3
 #define ACODEC_LAVC 4
 #define ACODEC_TOOLAME 5
+#define ACODEC_FAAC 6
 
 #include <stdio.h>
 #include <stdlib.h>

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -r1.320 -r1.321
--- Makefile	21 Apr 2005 03:44:59 -0000	1.320
+++ Makefile	25 Apr 2005 07:07:57 -0000	1.321
@@ -41,6 +41,10 @@
 CODEC_LIBS += $(TOOLAME_LIB)
 endif
 
+ifeq ($(FAAC),yes)
+CODEC_LIBS += $(FAAC_LIB)
+endif
+
 PARTS = libmpdemux libmpcodecs libavcodec libavformat libao2 drivers osdep postproc input libvo libaf
 ifeq ($(MP3LIB),yes)
 PARTS += mp3lib

Index: cfg-mencoder.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- cfg-mencoder.h	22 Apr 2005 06:59:58 -0000	1.95
+++ cfg-mencoder.h	25 Apr 2005 07:07:57 -0000	1.96
@@ -33,6 +33,10 @@
 extern m_option_t toolameopts_conf[];
 #endif
 
+#ifdef HAVE_FAAC
+extern m_option_t faacopts_conf[];
+#endif
+
 #ifdef USE_WIN32DLL
 extern m_option_t vfwopts_conf[];
 #endif
@@ -115,6 +119,11 @@
 #else
 	{"toolame", "MPlayer was compiled without libtoolame. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 #endif
+#ifdef HAVE_FAAC
+	{"faac", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_FAAC, NULL},
+#else
+	{"faac", "MPlayer was compiled without libfaac. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+#endif
 	{"help", "\nAvailable codecs:\n"
 	"   copy     - frame copy, without re-encoding (useful for AC3)\n"
 	"   pcm      - uncompressed PCM audio\n"
@@ -127,6 +136,9 @@
 #ifdef HAVE_TOOLAME
 	"   toolame  - Toolame MP2 audio encoder\n"
 #endif
+#ifdef HAVE_FAAC
+	"   faac  - FAAC AAC audio encoder\n"
+#endif
 	"\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 	{NULL, NULL, 0, 0, 0, 0, NULL}
 };
@@ -244,6 +256,11 @@
 #else
 	{"toolameopts", "MPlayer was compiled without libtoolame. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 #endif
+#ifdef HAVE_FAAC
+	{"faacopts", faacopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
+#else
+	{"faacopts", "MPlayer was compiled without libfaac. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+#endif
 #ifdef USE_WIN32DLL
 	{"vfwopts", vfwopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
 #endif