[MPlayer-cvslog] r31147 - in trunk: Copyright DOCS/tech/MAINTAINERS DOCS/tech/binary-packaging.txt DOCS/tech/general.txt Makefile configure liba52 libmpcodecs/ad_liba52.c libmpdemux/muxer_mpeg.c
diego
subversion at mplayerhq.hu
Sun May 9 16:45:29 CEST 2010
Author: diego
Date: Sun May 9 16:45:29 2010
New Revision: 31147
Log:
Remove internal liba52 copy.
Nowadays FFmpeg is faster than liba52 and external liba52 is well supported.
Deleted:
trunk/liba52/
Modified:
trunk/Copyright
trunk/DOCS/tech/MAINTAINERS
trunk/DOCS/tech/binary-packaging.txt
trunk/DOCS/tech/general.txt
trunk/Makefile
trunk/configure
trunk/libmpcodecs/ad_liba52.c
trunk/libmpdemux/muxer_mpeg.c
Modified: trunk/Copyright
==============================================================================
--- trunk/Copyright Sun May 9 14:28:15 2010 (r31146)
+++ trunk/Copyright Sun May 9 16:45:29 2010 (r31147)
@@ -37,18 +37,6 @@ Copyright: 1992 by Jutta Degener and Ca
License: permissive, see libmpcodecs/native/xa_gsm.c
-Name: liba52
-Version: 0.7.4 + patches
-URL: http://liba52.sourceforge.net/
-Directory: liba52
-Copyright: 1999-2000 Aaron Holtzman <aholtzma at ess.engr.uvic.ca>
- 2000-2001 Michel Lespinasse <walken at zoy.org>
- 2000 Yuqing Deng <Yuqing_Deng at brown.edu>
- 2002 Nick Kurshev
- 2004 Romain Dolbeau <romain at dolbeau.org>
-License: GNU General Public License
-
-
Name: libdvdcss
Version: 1.2.10
URL: http://developers.videolan.org/libdvdcss/
Modified: trunk/DOCS/tech/MAINTAINERS
==============================================================================
--- trunk/DOCS/tech/MAINTAINERS Sun May 9 14:28:15 2010 (r31146)
+++ trunk/DOCS/tech/MAINTAINERS Sun May 9 16:45:29 2010 (r31147)
@@ -93,7 +93,6 @@ Imported libs/projects:
* VIDIX core: Benjamin Zores
* mp3lib: None
* loader: None
- * liba52: None
* libmpeg2: None
* libdvdcss: Diego Biurrun
* libdvdread: Diego Biurrun
Modified: trunk/DOCS/tech/binary-packaging.txt
==============================================================================
--- trunk/DOCS/tech/binary-packaging.txt Sun May 9 14:28:15 2010 (r31146)
+++ trunk/DOCS/tech/binary-packaging.txt Sun May 9 16:45:29 2010 (r31147)
@@ -45,7 +45,7 @@ the following features MUST be included
* codecs
- FAAD(internal)
- libavcodec(internal)
- - native codecs (libmpeg2/liba52/mp3lib)
+ - native codecs (libmpeg2/mp3lib)
- Vorbis Tremor codec(internal)
- RealPlayer codecs support (*)
- Win32/VfW/DShow/QT codecs support (*)
Modified: trunk/DOCS/tech/general.txt
==============================================================================
--- trunk/DOCS/tech/general.txt Sun May 9 14:28:15 2010 (r31146)
+++ trunk/DOCS/tech/general.txt Sun May 9 16:45:29 2010 (r31147)
@@ -196,7 +196,7 @@ Now, go on:
Only used if none of the above works.
4. Codecs. Consists of libmpcodecs/* and separate files or libs,
- for example liba52, libmpeg2, loader, mp3lib.
+ for example libmpeg2, loader, mp3lib.
mplayer.c doesn't call them directly, but through the dec_audio.c and
dec_video.c files, so the mplayer.c doesn't have to know anything about
Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile Sun May 9 14:28:15 2010 (r31146)
+++ trunk/Makefile Sun May 9 16:45:29 2010 (r31147)
@@ -108,16 +108,6 @@ SRCS_COMMON-$(HAVE_SYS_MMAN_H) +=
SRCS_COMMON-$(JPEG) += libmpcodecs/vd_ijpg.c
SRCS_COMMON-$(LADSPA) += libaf/af_ladspa.c
SRCS_COMMON-$(LIBA52) += libmpcodecs/ad_liba52.c
-SRCS_LIBA52_INTERNAL += liba52/crc.c \
- liba52/resample.c \
- liba52/bit_allocate.c \
- liba52/bitstream.c \
- liba52/downmix.c \
- liba52/imdct.c \
- liba52/parse.c \
-
-SRCS_COMMON-$(LIBA52_INTERNAL) += $(SRCS_LIBA52_INTERNAL)
-
SRCS_COMMON-$(LIBASS) += libmpcodecs/vf_ass.c \
libass/ass_mp.c \
@@ -758,7 +748,6 @@ DIRS = . \
gui/wm \
gui/win32 \
input \
- liba52 \
libaf \
libao2 \
libass \
@@ -1020,8 +1009,6 @@ codec-cfg-test$(EXESUF): codec-cfg.c cod
codecs2html$(EXESUF): codec-cfg.c help_mp.h $(TEST_OBJS)
$(CC) -I. -DCODECS2HTML -o $@ $^
-liba52/test$(EXESUF): cpudetect.o $(SRCS_LIBA52_INTERNAL:.c=.o) -lm
-
libvo/aspecttest$(EXESUF): libvo/aspect.o libvo/geometry.o $(TEST_OBJS)
LOADER_TEST_OBJS = $(SRCS_WIN32_EMULATION:.c=.o) $(SRCS_QTX_EMULATION:.S=.o) libavutil/libavutil.a osdep/mmap_anon.o cpudetect.o $(TEST_OBJS)
@@ -1031,8 +1018,7 @@ loader/qtx/list$(EXESUF) loader/qtx/qtxl
mp3lib/test$(EXESUF) mp3lib/test2$(EXESUF): $(SRCS_MP3LIB:.c=.o) libvo/aclib.o cpudetect.o $(TEST_OBJS)
-TESTS = codecs2html codec-cfg-test liba52/test libvo/aspecttest \
- mp3lib/test mp3lib/test2
+TESTS = codecs2html codec-cfg-test libvo/aspecttest mp3lib/test mp3lib/test2
ifdef ARCH_X86
TESTS += loader/qtx/list loader/qtx/qtxload
Modified: trunk/configure
==============================================================================
--- trunk/configure Sun May 9 14:28:15 2010 (r31146)
+++ trunk/configure Sun May 9 16:45:29 2010 (r31147)
@@ -335,7 +335,6 @@ Codecs:
--enable-libdca enable libdca support [autodetect]
--disable-mp3lib disable builtin mp3lib [autodetect]
--disable-liba52 disable liba52 [autodetect]
- --enable-liba52-internal enable builtin liba52 [disabled]
--disable-libmpeg2 disable builtin libmpeg2 [autodetect]
--disable-musepack disable musepack support [autodetect]
--disable-libopencore_amrnb disable libopencore_amr narrowband [autodetect]
@@ -631,7 +630,6 @@ _speex=auto
_theora=auto
_mp3lib=auto
_liba52=auto
-_liba52_internal=no
_libdca=auto
_libmpeg2=auto
_faad=auto
@@ -1028,8 +1026,6 @@ for ac_option do
--disable-theora) _theora=no ;;
--enable-mp3lib) _mp3lib=yes ;;
--disable-mp3lib) _mp3lib=no ;;
- --enable-liba52-internal) _liba52_internal=yes ;;
- --disable-liba52-internal) _liba52_internal=no ;;
--enable-liba52) _liba52=yes ;;
--disable-liba52) _liba52=no ;;
--enable-libdca) _libdca=yes ;;
@@ -6796,27 +6792,19 @@ fi
echores "$_mp3lib"
echocheck "liba52 support"
-if test "$_liba52_internal" = auto ; then
- test "$cc_vendor" = intel && test "$_cc_major" -le 10 -o "$_cc_major" -eq 11 -a "$_cc_minor" -eq 0 && _liba52_internal=no || _liba52_internal=yes
-fi
def_liba52='#undef CONFIG_LIBA52'
-def_liba52_internal="#undef CONFIG_LIBA52_INTERNAL"
-if test "$_liba52_internal" = yes ; then
- _liba52=yes
- def_liba52_internal="#define CONFIG_LIBA52_INTERNAL 1"
- res_comment="internal"
-elif test "$_liba52_internal" = no && test "$_liba52" = auto ; then
+if test "$_liba52" = auto ; then
_liba52=no
cat > $TMPC << EOF
#include <inttypes.h>
#include <a52dec/a52.h>
int main(void) { a52_state_t *testHand; testHand=a52_init(0); return 0; }
EOF
- cc_check -la52 && _liba52=yes && res_comment="external" && extra_ldflags="$extra_ldflags -la52"
+ cc_check -la52 && _liba52=yes && extra_ldflags="$extra_ldflags -la52"
fi
if test "$_liba52" = yes ; then
def_liba52='#define CONFIG_LIBA52 1'
- codecmodules="liba52($res_comment) $codecmodules"
+ codecmodules="liba52 $codecmodules"
else
nocodecmodules="liba52 $nocodecmodules"
fi
@@ -8582,7 +8570,6 @@ KAI = $_kai
KVA = $_kva
LADSPA = $_ladspa
LIBA52 = $_liba52
-LIBA52_INTERNAL = $_liba52_internal
LIBASS = $_ass
LIBASS_INTERNAL = $ass_internal
LIBBS2B = $_libbs2b
@@ -8965,7 +8952,6 @@ $def_faac
$def_faad
$def_faad_internal
$def_liba52
-$def_liba52_internal
$def_libdca
$def_libdv
$def_liblzo
Modified: trunk/libmpcodecs/ad_liba52.c
==============================================================================
--- trunk/libmpcodecs/ad_liba52.c Sun May 9 14:28:15 2010 (r31146)
+++ trunk/libmpcodecs/ad_liba52.c Sun May 9 16:45:29 2010 (r31147)
@@ -35,14 +35,9 @@
#include "libaf/af_format.h"
-#ifdef CONFIG_LIBA52_INTERNAL
-#include "liba52/a52.h"
-#include "liba52/mm_accel.h"
-#else
#include <a52dec/a52.h>
#include <a52dec/mm_accel.h>
int (* a52_resample) (float * _f, int16_t * s16);
-#endif
static a52_state_t *a52_state;
static uint32_t a52_flags=0;
@@ -150,11 +145,7 @@ static int preinit(sh_audio_t *sh)
{
/* Dolby AC3 audio: */
/* however many channels, 2 bytes in a word, 256 samples in a block, 6 blocks in a frame */
-#ifdef CONFIG_LIBA52_INTERNAL
- if (sh->samplesize < 2) sh->samplesize = 2;
-#else
if (sh->samplesize < 4) sh->samplesize = 4;
-#endif
sh->audio_out_minsize=audio_output_channels*sh->samplesize*256*6;
sh->audio_in_minsize=3840;
a52_level = 1.0;
@@ -208,9 +199,7 @@ static int init(sh_audio_t *sh_audio)
mp_msg(MSGT_DECAUDIO,MSGL_ERR,"A52 init failed\n");
return 0;
}
-#ifndef CONFIG_LIBA52_INTERNAL
sh_audio->sample_format = AF_FORMAT_FLOAT_NE;
-#endif
if(a52_fillbuff(sh_audio)<0){
mp_msg(MSGT_DECAUDIO,MSGL_ERR,"A52 sync failed\n");
return 0;
@@ -283,12 +272,7 @@ while(sh_audio->channels>0){
break;
}
} else
-#ifdef CONFIG_LIBA52_INTERNAL
- if(a52_resample_init(a52_accel,flags,sh_audio->channels)) break;
- --sh_audio->channels; /* try to decrease no. of channels*/
-#else
break;
-#endif
}
if(sh_audio->channels<=0){
mp_msg(MSGT_DECAUDIO,MSGL_ERR,"a52: no resampler. try different channel setup!\n");
Modified: trunk/libmpdemux/muxer_mpeg.c
==============================================================================
--- trunk/libmpdemux/muxer_mpeg.c Sun May 9 14:28:15 2010 (r31146)
+++ trunk/libmpdemux/muxer_mpeg.c Sun May 9 16:45:29 2010 (r31147)
@@ -41,8 +41,6 @@
#ifdef CONFIG_LIBA52
#include <a52dec/a52.h>
-#else
-#include "liba52/a52.h"
#endif
#define PACK_HEADER_START_CODE 0x01ba
More information about the MPlayer-cvslog
mailing list