[MPlayer-cvslog] CVS: main Makefile, 1.312, 1.313 configure, 1.947, 1.948

[Jindrich Makovicka CVS]

CVS change done by Jindrich Makovicka CVS

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

Modified Files:
	Makefile configure 
Log Message:
internal Tremor decoder for Ogg/Vorbis

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -r1.312 -r1.313
--- Makefile	27 Dec 2004 17:30:12 -0000	1.312
+++ Makefile	30 Dec 2004 12:11:31 -0000	1.313
@@ -77,6 +77,9 @@
 ifeq ($(LIBMENU),yes)
 PARTS += libmenu
 endif
+ifeq ($(TREMOR),yes)
+PARTS += tremor
+endif
 
 ALL_PRG = $(PRG)
 ifeq ($(MENCODER),yes)
@@ -100,6 +103,10 @@
 ifeq ($(INTERNAL_FAAD),yes)
 COMMON_DEPS += libfaad2/libfaad2.a
 endif
+ifeq ($(TREMOR),yes)
+COMMON_DEPS += tremor/libvorbisidec.a
+COMMON_LIBS += tremor/libvorbisidec.a
+endif
 ifeq ($(VIDIX),yes)
 COMMON_DEPS += libdha/libdha.so vidix/libvidix.a
 endif
@@ -184,6 +191,9 @@
 mp3lib/libMP3.a:
 	$(MAKE) -C mp3lib
 
+tremor/libvorbisidec.a:
+	$(MAKE) -C tremor
+
 libdha/libdha.so:
 	$(MAKE) -C libdha
 

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.947
retrieving revision 1.948
diff -u -r1.947 -r1.948
--- configure	29 Dec 2004 23:23:46 -0000	1.947
+++ configure	30 Dec 2004 12:11:32 -0000	1.948
@@ -205,8 +205,10 @@
   --disable-libavcodec   disable libavcodec [autodetect]
   --disable-libavformat  disable libavformat [autodetect]
   --enable-libfame       enable libfame realtime encoder [autodetect]
-  --enable-vorbis        build with OggVorbis support [autodetect]
-  --enable-tremor        build with integer-only OggVorbis support [disabled]
+  --disable-internal-tremor do not build internal OggVorbis support [enabled]
+  --enable-tremor-low    build with lower accuracy internal tremor [disabled]
+  --enable-external-tremor build with external tremor [disabled]
+  --disable-vorbis       disable OggVorbis support entirely [autodetect]
   --enable-theora        build with OggTheora support [autodetect]
   --disable-internal-matroska disable internal Matroska support [enabled]
   --enable-external-faad build with external FAAD2 (AAC) support [autodetect]
@@ -1314,6 +1316,8 @@
 _liblzo=auto
 _mad=auto
 _toolame=auto
+_tremor_internal=yes
+_tremor_low=no
 _vorbis=auto
 _theora=auto
 _mp3lib=yes
@@ -1499,8 +1503,12 @@
   --disable-liblzo)	_liblzo=no		;;
   --enable-vorbis)	_vorbis=yes	;;
   --disable-vorbis)	_vorbis=no	;;
-  --enable-tremor)	_tremor=yes	;;
-  --disable-tremor)	_tremor=no	;;
+  --enable-internal-tremor)	_tremor_internal=yes	;;
+  --disable-internal-tremor)	_tremor_internal=no	;;
+  --enable-tremor-low)	_tremor_low=yes	;;
+  --disable-tremor-low)	_tremor_low=no	;;
+  --enable-external-tremor)	_tremor=yes	;;
+  --disable-external-tremor)	_tremor=no	;;
   --enable-theora)	_theora=yes	;;
   --disable-theora)	_theora=no	;;
   --enable-mp3lib)	_mp3lib=yes	;;
@@ -5102,7 +5110,9 @@
 fi
 
 echocheck "OggVorbis support"
-if test "$_vorbis" = auto ; then
+if test "$_tremor_internal" = yes; then
+  _vorbis=yes
+elif test "$_vorbis" = auto; then
   _vorbis=no
   cat > $TMPC << EOF
 #include <vorbis/codec.h>
@@ -5112,7 +5122,16 @@
 fi
 if test "$_vorbis" = yes ; then
   _def_vorbis='#define HAVE_OGGVORBIS 1'
-  if test "$_tremor" = yes ; then
+  if test "$_tremor_internal" = yes ; then
+    # do not set _ld_vorbis as it is resolved separately
+    # mp3lame support for vorbis is deprecated so don't care
+    _def_tremor='#define TREMOR 1'
+    if test "$_tremor_low" = yes ; then
+	_tremor_flags='-D_LOW_ACCURACY_'
+    else
+	_tremor_flags=''
+    fi
+  elif test "$_tremor" = yes ; then
     _def_tremor='#define TREMOR 1'
     _ld_vorbis='-lvorbisidec'
   else
@@ -5125,7 +5144,11 @@
   _def_tremor='#undef TREMOR'
   _nocodecmodules="libvorbis $_nocodecmodules"
 fi
-if test "$_vorbis" = yes -a "$_tremor" = yes ; then
+if test "$_vorbis" = yes -a "$_tremor_internal" = yes -a "$_tremor_low" = yes ; then
+  echores "$_vorbis (internal low accuracy Tremor)"
+elif test "$_vorbis" = yes -a "$_tremor_internal" = yes ; then
+  echores "$_vorbis (internal Tremor)"
+elif test "$_vorbis" = yes -a "$_tremor" = yes ; then
   echores "$_vorbis (Tremor)"
 else
   echores "$_vorbis"
@@ -6650,6 +6673,8 @@
 MP3LIB = $_mp3lib
 LIBA52 = $_liba52
 LIBMPEG2 = $_libmpeg2
+TREMOR = $_tremor_internal
+TREMOR_FLAGS = $_tremor_flags
 
 UNRARLIB = $_unrarlib
 HAVE_FFPOSTPROCESS = $_def_haveffpostprocess