Added support for the libmp1e ultrafast mpeg1 realtime encoder. This makes rte obsolete.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3328 b3059339-0415-0410-9bf9-f77b7e298cf2

2 files changed, 15 insertions, 46 deletions

diff --git a/Makefile b/Makefile
index 82c02aa5c8..2d7707ce47 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo2 $(EXTRA_INC) # -Wall
 VO_LIBS = -Llibvo2 -lvo2 $(X_LIB) $(DXR3_LIB) $(GGI_LIB) $(MLIB_LIB) $(PNG_LIB) $(SDL_LIB) $(SVGA_LIB)
 endif
 
-A_LIBS = -Lmp3lib -lMP3 -Llibac3 -lac3 $(ALSA_LIB) $(NAS_LIB) $(MAD_LIB) $(VORBIS_LIB) $(SGIAUDIO_LIB)
+A_LIBS = -Lmp3lib -lMP3 -Llibac3 -lac3 $(ALSA_LIB) $(MAD_LIB) $(VORBIS_LIB) $(SGIAUDIO_LIB)
 
 OSDEP_LIBS = -Llinux -losdep
 PP_LIBS = -Lpostproc -lpostproc
@@ -43,9 +43,9 @@ XA_LIBS = -Lxa -lxa
 # SRCS = $(SRCS_MENCODER) $(SRCS_MPLAYER)
 # OBJS = $(OBJS_MENCODER) $(OBJS_MPLAYER)
 
-PARTS = libmpdemux mp3lib libac3 libmpeg2 opendivx libavcodec libvo libao2 drivers drivers/syncfb linux postproc xa
+PARTS = libmpdemux mp3lib libac3 libmp1e libmpeg2 opendivx libavcodec libvo libao2 drivers drivers/syncfb linux postproc xa
 ifeq ($(VO2),yes)
-PARTS = libmpdemux mp3lib libac3 libmpeg2 opendivx libavcodec libvo2 libao2 drivers drivers/syncfb linux postproc xa
+PARTS = libmpdemux mp3lib libac3 libmp1e libmpeg2 opendivx libavcodec libvo2 libao2 drivers drivers/syncfb linux postproc xa
 endif
 
 
@@ -81,9 +81,9 @@ all:	$(ALL_PRG)
 .c.o:
 	$(CC) -c $(CFLAGS) -o $@ $<
 
-COMMONLIBS = libmpdemux/libmpdemux.a libvo/libvo.a libao2/libao2.a libac3/libac3.a mp3lib/libMP3.a libmpeg2/libmpeg2.a opendivx/libdecore.a linux/libosdep.a postproc/libpostproc.a xa/libxa.a
+COMMONLIBS = libmpdemux/libmpdemux.a libvo/libvo.a libao2/libao2.a libac3/libac3.a mp3lib/libMP3.a libmp1e/libmp1e.a libmpeg2/libmpeg2.a opendivx/libdecore.a linux/libosdep.a postproc/libpostproc.a xa/libxa.a
 ifeq ($(VO2),yes)
-COMMONLIBS = libmpdemux/libmpdemux.a libvo2/libvo2.a libao2/libao2.a libac3/libac3.a mp3lib/libMP3.a libmpeg2/libmpeg2.a opendivx/libdecore.a linux/libosdep.a postproc/libpostproc.a xa/libxa.a
+COMMONLIBS = libmpdemux/libmpdemux.a libvo2/libvo2.a libao2/libao2.a libac3/libac3.a mp3lib/libMP3.a libmp1e/libmp1e.a libmpeg2/libmpeg2.a opendivx/libdecore.a linux/libosdep.a postproc/libpostproc.a xa/libxa.a
 endif
 
 loader/libloader.a:
@@ -95,6 +95,9 @@ libmpdemux/libmpdemux.a:
 loader/DirectShow/libDS_Filter.a:
 	$(MAKE) -C loader/DirectShow
 
+libmp1e/libmp1e.a:
+	$(MAKE) -C libmp1e
+
 libavcodec/libavcodec.a:
 	$(MAKE) -C libavcodec
 
@@ -146,14 +149,15 @@ MENCODER_DEP += Gui/libgui.a
 endif
 
 $(PRG):	$(MPLAYER_DEP)
-	$(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) -Llibmpdemux -lmpdemux $(AV_LIB) $(EXTRA_LIB) $(LIRC_LIB) $(LIB_LOADER) $(MP1E_LIB) -Llibmpeg2 -lmpeg2 -Llibao2 -lao2 $(A_LIBS) $(VO_LIBS) $(CSS_LIB) $(ARCH_LIB) $(OSDEP_LIBS) $(PP_LIBS) $(XA_LIBS) $(DECORE_LIB) $(TERMCAP_LIB) $(DIRECTFB_LIB) -lm $(STATIC_LIB) $(GUI_LIBS) $(PNG_LIB) $(Z_LIB)
+	$(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) -Llibmpdemux -lmpdemux $(AV_LIB) $(EXTRA_LIB) $(LIRC_LIB) $(LIB_LOADER) -Llibmpeg2 -lmpeg2 -Llibao2 -lao2 $(A_LIBS) $(VO_LIBS) $(CSS_LIB) $(ARCH_LIB) $(OSDEP_LIBS) $(PP_LIBS) $(XA_LIBS) $(DECORE_LIB) $(TERMCAP_LIB) -Llibmp1e -lmp1e -lm $(STATIC_LIB) $(GUI_LIBS) $(PNG_LIB) $(Z_LIB)
 
 $(PRG_FIBMAP): fibmap_mplayer.o
 	$(CC) -o $(PRG_FIBMAP) fibmap_mplayer.o
 
 ifeq ($(MENCODER),yes)
 $(PRG_MENCODER): $(MENCODER_DEP)
-	$(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) -Llibmpeg2 -lmpeg2 -Llibmpdemux -lmpdemux $(X_LIBS) $(LIB_LOADER) $(AV_LIB) $(MP1E_LIB) -lmp3lame $(A_LIBS) $(CSS_LIB) $(GUI_LIBS) $(PNG_LIB) $(Z_LIB) $(ARCH_LIB) $(OSDEP_LIBS) $(PP_LIBS) $(XA_LIBS) $(DECORE_LIB) $(ENCORE_LIB) $(TERMCAP_LIB) -lm
+	$(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) -Llibmpeg2 -lmpeg2 -Llibmpdemux -lmpdemux -Llibmp1e -lmp1e $(X_LIBS) $(LIB_LOADER) $(AV_LIB) -lmp3lame $(A_LIBS) $(CSS_LIB) $(GUI_LIBS) $(PNG_LIB) $(Z_LIB) $(ARCH_LIB) $(OSDEP_LIBS) $(PP_LIBS) $(XA_LIBS) $(DECORE_LIB) $(ENCORE_LIB) $(TERMCAP_LIB) -lm
+
 endif
 
 # $(PRG_HQ):	depfile mplayerHQ.o $(OBJS) loader/libloader.a libmpeg2/libmpeg2.a opendivx/libdecore.a $(COMMONLIBS) encore/libencore.a
diff --git a/configure b/configure
index 27340ea5f8..87a3d6e21a 100755
--- a/configure
+++ b/configure
@@ -155,7 +155,6 @@ Audio:
   --disable-alsa         disable alsa sound support [autodetect]
   --disable-sunaudio     disable Sun sound support [autodetect]
   --disable-mad          disable mad audio support [autodetect]
-  --disable-mp1e	 disable mp1e codec support [autodetect]
   --disable-select       disable using select() on OSS audio device [enable]
 
 Miscellaneous options:
@@ -659,7 +658,6 @@ _iconv=auto
 _rtc=auto
 _ossaudio=auto
 _mad=auto
-_mp1e=auto
 _vorbis=auto
 _css=auto
 _dvdread=auto
@@ -741,8 +739,6 @@ for ac_option do
   --disable-ossaudio)	_ossaudio=no	;;
   --enable-mad)		_mad=yes	;;
   --disable-mad)	_mad=no		;;
-  --enable-mp1e)	_mp1e=yes	;;
-  --disable-mp1e)	_mp1e=no	;;
   --enable-vorbis)	_vorbis=yes	;;
   --disable-vorbis)	_vorbis=no	;;
   --enable-css)		_css=yes	;;
@@ -1816,15 +1812,14 @@ echores "$_nas"
 echocheck "DXR3/H+"
 if test "$_dxr3" = auto ; then
   cat > $TMPC << EOF
-#include <libdxr3/api.h>
+#include <linux/em8300.h>
 int main(void) { return 0; }
 EOF
   _dxr3=no
-  cc_check  -ldxr3 && _dxr3=yes
+  cc_check && _dxr3=yes
 fi
 if test "$_dxr3" = yes ; then
   _def_dxr3='#define HAVE_DXR3 1'
-  _ld_dxr3='-ldxr3'
   _vosrc="$_vosrc vo_dxr3.c"
   _aosrc="$_aosrc ao_dxr3.c"
   _vomodules="dxr3 $_vomodules"
@@ -2070,28 +2065,6 @@ fi
 echores "$_mad"
 
 
-echocheck "mp1e rte support"
-if test "$_mp1e" = auto ; then
-  _mp1e=no
-  cat > $TMPC << EOF
-#include <unistd.h>
-#include <sys/types.h>
-#include <rte.h>
-int main(void) { return 0; }
-EOF
-  cc_check -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -lrte && _mp1e=yes
-fi
-if test "$_mp1e" = yes ; then
-  _largefiles=yes
-  _def_mp1e='#define USE_MP1E 1'
-  _ld_mp1e='-lrte'
-else
-  _def_mp1e='#undef USE_MP1E'
-  _ld_mp1e=''
-fi
-echores "$_mp1e"
-
-
 echocheck "OggVorbis support"
 if test "$_vorbis" = auto ; then
   _vorbis=no
@@ -2570,9 +2543,9 @@ elif bsd ; then
 fi
 
 # 64 bit file offsets?
-if test "$_largefiles" = yes || test "$_mp1e" = yes || freebsd ; then
+if test "$_largefiles" = yes || freebsd ; then
   CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
-  if test "$_dvdread" = yes || test "$_mp1e" = yes ; then
+  if test "$_dvdread" = yes ; then
     # dvdread support requires this (for off64_t)
     CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE"
   fi
@@ -2631,7 +2604,6 @@ X11DIR = $_ld_x11
 
 # video output
 X_LIB = $_ld_x11 $_ld_gl $_ld_dga $_ld_xv $_ld_vm $_ld_xinerama $_ld_mad $_ld_sock 
-DXR3_LIB =  $_ld_dxr3
 GGI_LIB = $_ld_ggi
 MLIB_LIB =  $_ld_mlib
 MLIB_INC = $_inc_mlib
@@ -2659,7 +2631,6 @@ DS_DEP = $_dep_dshow
 DS_LIB = $_ld_dshow
 AV_DEP = $_dep_libavcodec
 AV_LIB = $_ld_libavcodec
-MP1E_LIB = $_ld_mp1e
 ARCH_LIB =  $_ld_arch $_ld_iconv
 DIVX4LINUX = $_divx4linux
 DECORE_LIB = $_ld_decore
@@ -2804,9 +2775,6 @@ $_def_libavcodecso
 /* use only decoders from libavcodec: */
 #define CONFIG_DECODERS 1
 
-/* mp1e rte encoder */
-$_def_mp1e
-
 /* XAnim DLL support */
 $_def_xanim
 $_def_xanim_path
@@ -2887,9 +2855,6 @@ $_def_png
 /* libmad support */
 $_def_mad
 
-/* mp1e support */
-$_def_mp1e
-
 /* enable OggVorbis support */
 $_def_vorbis