[MPlayer-cvslog] r32741 - in trunk: Changelog Copyright DOCS/tech/MAINTAINERS DOCS/tech/TODO DOCS/tech/binary-packaging.txt DOCS/xml/en/install.xml DOCS/xml/es/install.xml Makefile configure debian/copyright libfaa...
diego
subversion at mplayerhq.hu
Sat Jan 1 15:27:42 CET 2011
Author: diego
Date: Sat Jan 1 15:27:41 2011
New Revision: 32741
Log:
Remove forked internal libfaad2 copy.
The FFmpeg AAC decoder is default now and surpasses libfaad2 in all regards,
so there is no longer a reason to keep a forked library copy.
Deleted:
trunk/libfaad2/
Modified:
trunk/Changelog
trunk/Copyright
trunk/DOCS/tech/MAINTAINERS
trunk/DOCS/tech/TODO
trunk/DOCS/tech/binary-packaging.txt
trunk/Makefile
trunk/configure
trunk/debian/copyright
trunk/libmpcodecs/ad_faad.c
trunk/rpm/mplayer.spec
Changes in other areas also in this revision:
Modified:
trunk/DOCS/xml/en/install.xml
trunk/DOCS/xml/es/install.xml
Modified: trunk/Changelog
==============================================================================
--- trunk/Changelog Sat Jan 1 15:06:21 2011 (r32740)
+++ trunk/Changelog Sat Jan 1 15:27:41 2011 (r32741)
@@ -3,7 +3,8 @@ MPlayer (1.0)
rc5:
Decoders:
- * FFmpeg AAC decoder is now preferred over libfaad2
+ * FFmpeg AAC decoder is now preferred over libfaad2 and the internal
+ libfaad2 forked copy has been removed in its favor
Demuxers:
* experimental support for using binary Quicktime codecs with -demuxer lavf.
Modified: trunk/Copyright
==============================================================================
--- trunk/Copyright Sat Jan 1 15:06:21 2011 (r32740)
+++ trunk/Copyright Sat Jan 1 15:27:41 2011 (r32741)
@@ -21,14 +21,6 @@ License: GNU Lesser General Public Li
License, GNU General Public License when combined
-Name: FAAD2
-Version: 2.1 beta (20040915 CVS snapshot) + fixes and portability patches
-URL: http://www.audiocoding.com
-Directory: libfaad2
-Copyright: 2003-2004 M. Bakker, Ahead Software AG, http://www.nero.com
-License: GNU General Public License
-
-
Name: libdvdcss
Version: Subversion r237 + local changes
URL: http://developers.videolan.org/libdvdcss/
Modified: trunk/DOCS/tech/MAINTAINERS
==============================================================================
--- trunk/DOCS/tech/MAINTAINERS Sat Jan 1 15:06:21 2011 (r32740)
+++ trunk/DOCS/tech/MAINTAINERS Sat Jan 1 15:27:41 2011 (r32741)
@@ -96,7 +96,6 @@ Imported libs/projects:
* libmpeg2: None
* libdvdcss: Diego Biurrun
* libdvdread: Diego Biurrun
- * libfaad2: None
* realrtsp: Roberto Togni
* librtsp: Benjamin Zores
* freesdp: Benjamin Zores
Modified: trunk/DOCS/tech/TODO
==============================================================================
--- trunk/DOCS/tech/TODO Sat Jan 1 15:06:21 2011 (r32740)
+++ trunk/DOCS/tech/TODO Sat Jan 1 15:27:41 2011 (r32741)
@@ -90,4 +90,3 @@ remove externals:
- remove tremor when ffvorbis has integer-only decoder.
- remove libmpeg2 when ffmpeg12 is faster
- remove mp3lib when ffmp3 is faster
-- remove libfaad2 after soc aac is 100%
Modified: trunk/DOCS/tech/binary-packaging.txt
==============================================================================
--- trunk/DOCS/tech/binary-packaging.txt Sat Jan 1 15:06:21 2011 (r32740)
+++ trunk/DOCS/tech/binary-packaging.txt Sat Jan 1 15:27:41 2011 (r32741)
@@ -43,7 +43,6 @@ the following features MUST be included
- X11/Xvideo
* codecs
- - FAAD(internal)
- libavcodec(internal)
- native codecs (libmpeg2/mp3lib)
- Vorbis Tremor codec(internal)
Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile Sat Jan 1 15:06:21 2011 (r32740)
+++ trunk/Makefile Sat Jan 1 15:27:41 2011 (r32741)
@@ -58,45 +58,6 @@ SRCS_COMMON-$(DVDREAD_INTERNAL) +=
libdvdread4/nav_read.c \
SRCS_COMMON-$(FAAD) += libmpcodecs/ad_faad.c
-SRCS_COMMON-$(FAAD_INTERNAL) += libfaad2/bits.c \
- libfaad2/cfft.c \
- libfaad2/common.c \
- libfaad2/decoder.c \
- libfaad2/drc.c \
- libfaad2/drm_dec.c \
- libfaad2/error.c \
- libfaad2/filtbank.c \
- libfaad2/hcr.c \
- libfaad2/huffman.c \
- libfaad2/ic_predict.c \
- libfaad2/is.c \
- libfaad2/lt_predict.c \
- libfaad2/mdct.c \
- libfaad2/mp4.c \
- libfaad2/ms.c \
- libfaad2/output.c \
- libfaad2/pns.c \
- libfaad2/ps_dec.c \
- libfaad2/ps_syntax.c \
- libfaad2/pulse.c \
- libfaad2/rvlc.c \
- libfaad2/sbr_dct.c \
- libfaad2/sbr_dec.c \
- libfaad2/sbr_e_nf.c \
- libfaad2/sbr_fbt.c \
- libfaad2/sbr_hfadj.c \
- libfaad2/sbr_hfgen.c \
- libfaad2/sbr_huff.c \
- libfaad2/sbr_qmf.c \
- libfaad2/sbr_syntax.c \
- libfaad2/sbr_tf_grid.c \
- libfaad2/specrec.c \
- libfaad2/ssr.c \
- libfaad2/ssr_fb.c \
- libfaad2/ssr_ipqf.c \
- libfaad2/syntax.c \
- libfaad2/tns.c \
-
SRCS_COMMON-$(FASTMEMCPY) += libvo/aclib.c
SRCS_COMMON-$(FFMPEG) += av_opts.c \
libaf/af_lavcresample.c \
@@ -785,7 +746,6 @@ DIRS = . \
libdvdnav \
libdvdnav/vm \
libdvdread4 \
- libfaad2 \
libmenu \
libmpcodecs \
libmpcodecs/native \
@@ -901,7 +861,6 @@ gui/%: CFLAGS += -Wno-strict-prototypes
libdvdcss/%: CFLAGS := -Ilibdvdcss -D_GNU_SOURCE -DVERSION=\"1.2.10\" $(CFLAGS_LIBDVDCSS) $(CFLAGS)
libdvdnav/%: CFLAGS := -Ilibdvdnav -D_GNU_SOURCE -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\" $(CFLAGS)
libdvdread4/%: CFLAGS := -Ilibdvdread4 -D_GNU_SOURCE $(CFLAGS_LIBDVDCSS_DVDREAD) $(CFLAGS)
-libfaad2/%: CFLAGS := -Ilibfaad2 -DHAVE_CONFIG_H $(CFLAGS_FAAD_FIXED) $(CFLAGS)
loader/%: CFLAGS += -fno-omit-frame-pointer $(CFLAGS_NO_OMIT_LEAF_FRAME_POINTER)
#loader/%: CFLAGS += -Ddbg_printf=__vprintf -DTRACE=__vprintf -DDETAILED_OUT
Modified: trunk/configure
==============================================================================
--- trunk/configure Sat Jan 1 15:06:21 2011 (r32740)
+++ trunk/configure Sat Jan 1 15:27:41 2011 (r32741)
@@ -358,9 +358,7 @@ Codecs:
--disable-speex disable Speex support [autodetect]
--disable-libgsm disable libgsm support [autodetect]
--enable-theora enable OggTheora libraries [autodetect]
- --enable-faad enable external FAAD2 (AAC) [autodetect]
- --enable-faad-internal enable internal FAAD2 (AAC) [disabled]
- --enable-faad-fixed enable fixed-point mode in internal FAAD2 [disabled]
+ --enable-faad enable FAAD2 (AAC) [autodetect]
--disable-faac disable support for FAAC (AAC encoder) [autodetect]
--disable-faac-lavc disable support for FAAC in libavcodec [autodetect]
--disable-ladspa disable LADSPA plugin support [autodetect]
@@ -669,8 +667,6 @@ _libdca=auto
_libmpeg2=auto
_libmpeg2_internal=auto
_faad=auto
-_faad_internal=no
-_faad_fixed=no
_faac=auto
_faac_lavc=auto
_ladspa=auto
@@ -1076,10 +1072,6 @@ for ac_option do
--disable-musepack) _musepack=no ;;
--enable-faad) _faad=yes ;;
--disable-faad) _faad=no ;;
- --enable-faad-internal) _faad_internal=yes ;;
- --disable-faad-internal) _faad_internal=no ;;
- --enable-faad-fixed) _faad_fixed=yes ;;
- --disable-faad-fixed) _faad_fixed=no ;;
--enable-faac) _faac=yes ;;
--disable-faac) _faac=no ;;
--enable-faac-lavc) _faac_lavc=yes ;;
@@ -6630,27 +6622,8 @@ echores "$_faac"
echocheck "FAAD2 support"
-if test "$_faad_internal" = auto ; then
- if cygwin ; then
- _faad_internal=no
- res_comment="does not compile on cygwin"
- elif x86_32 && test cc_vendor=gnu; then
- case $cc_version in
- 3.1*|3.2) # ICE/insn with these versions
- _faad_internal=no
- res_comment="broken gcc"
- ;;
- *)
- _faad=yes
- _faad_internal=yes
- ;;
- esac
- else
- _faad=yes
- _faad_internal=yes
- fi
-fi
if test "$_faad" = auto ; then
+ _faad=no
cat > $TMPC << EOF
#include <faad.h>
#ifndef FAAD_MIN_STREAMSIZE
@@ -6663,29 +6636,11 @@ EOF
fi
def_faad='#undef CONFIG_FAAD'
-def_faad_internal="#undef CONFIG_FAAD_INTERNAL"
-if test "$_faad_internal" = yes ; then
- def_faad_internal="#define CONFIG_FAAD_INTERNAL 1"
- res_comment="internal floating-point"
- if test "$_faad_fixed" = yes ; then
- # The FIXED_POINT implementation of FAAD2 improves performance
- # on some platforms, especially for SBR files.
- cflags_faad_fixed="-DFIXED_POINT"
- res_comment="internal fixed-point"
- fi
-elif test "$_faad" = yes ; then
- extra_ldflags="$extra_ldflags -lfaad"
-fi
-
if test "$_faad" = yes ; then
def_faad='#define CONFIG_FAAD 1'
- if test "$_faad_internal" = yes ; then
- codecmodules="faad2(internal) $codecmodules"
- else
- codecmodules="faad2 $codecmodules"
- fi
+ extra_ldflags="$extra_ldflags -lfaad"
+ codecmodules="faad2 $codecmodules"
else
- _faad=no
nocodecmodules="faad2 $nocodecmodules"
fi
echores "$_faad"
@@ -8026,7 +7981,6 @@ CXXFLAGS = $WARNFLAGS $CXXFLAGS $extra_c
CC_DEPFLAGS = $DEPFLAGS
CFLAGS_DHAHELPER = $cflags_dhahelper
-CFLAGS_FAAD_FIXED = $cflags_faad_fixed
CFLAGS_LIBDVDCSS = $cflags_libdvdcss
CFLAGS_LIBDVDCSS_DVDREAD = $cflags_libdvdcss_dvdread
CFLAGS_LIBDVDNAV = $cflags_libdvdnav
@@ -8095,7 +8049,6 @@ DXR3 = $_dxr3
ESD = $_esd
FAAC=$_faac
FAAD = $_faad
-FAAD_INTERNAL = $_faad_internal
FASTMEMCPY = $_fastmemcpy
FBDEV = $_fbdev
FREETYPE = $_freetype
@@ -8360,17 +8313,11 @@ $def_fast_inttypes
#define HAVE_ERRNO_H 1
/* libdvdcss + libdvdread */
#define HAVE_LIMITS_H 1
-/* libdvdcss + libfaad2 */
+/* libdvdcss */
#define HAVE_UNISTD_H 1
-/* libfaad2 + libdvdread */
+/* libdvdread */
#define STDC_HEADERS 1
#define HAVE_MEMCPY 1
-/* libfaad2 */
-#define HAVE_STDLIB_H 1
-#define HAVE_STRING_H 1
-#define HAVE_STRINGS_H 1
-#define HAVE_SYS_STAT_H 1
-#define HAVE_SYS_TYPES_H 1
/* libdvdnav */
#define READ_CACHE_TRACE 0
/* libdvdread */
@@ -8487,7 +8434,6 @@ $def_vcd
/* codec libraries */
$def_faac
$def_faad
-$def_faad_internal
$def_liba52
$def_libdca
$def_libdv
Modified: trunk/debian/copyright
==============================================================================
--- trunk/debian/copyright Sat Jan 1 15:06:21 2011 (r32740)
+++ trunk/debian/copyright Sat Jan 1 15:27:41 2011 (r32741)
@@ -62,13 +62,6 @@ Copyright (c) The ffmpeg Project
License: GNU Lesser General Public License, some parts GNU General Public
License, GNU General Public License when combined
-Name: FAAD2
-Version: 2.1 beta (20040915 CVS snapshot) + fixes and portability patches
-Homepage: http://www.audiocoding.com
-Directory: libfaad2
-Copyright (C) 2003-2004 M. Bakker, Ahead Software AG, http://www.nero.com
-License: GNU General Public License
-
Name: libmpeg2
Version: 0.4.0b + patches
Homepage: http://libmpeg2.sourceforge.net/
Modified: trunk/libmpcodecs/ad_faad.c
==============================================================================
--- trunk/libmpcodecs/ad_faad.c Sat Jan 1 15:06:21 2011 (r32740)
+++ trunk/libmpcodecs/ad_faad.c Sat Jan 1 15:27:41 2011 (r32741)
@@ -23,6 +23,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
+#include <faad.h>
#include "config.h"
#include "ad_internal.h"
@@ -40,12 +41,6 @@ static const ad_info_t info =
LIBAD_EXTERN(faad)
-#ifndef CONFIG_FAAD_INTERNAL
-#include <faad.h>
-#else
-#include "libfaad2/faad.h"
-#endif
-
/* configure maximum supported channels, *
* this is theoretically max. 64 chans */
#define FAAD_MAX_CHANNELS 8
@@ -132,30 +127,9 @@ static int init(sh_audio_t *sh)
mp_msg(MSGT_DECAUDIO, MSGL_FATAL, "Could not get audio data!\n");
return 0;
}
-#if CONFIG_FAAD_INTERNAL
- /* init the codec, look for LATM */
- faac_init = faacDecInit(faac_hdec, sh->a_in_buffer,
- sh->a_in_buffer_len, &faac_samplerate, &faac_channels,1);
- if (faac_init < 0 && sh->a_in_buffer_len >= 3 && sh->format == mmioFOURCC('M', 'P', '4', 'L')) {
- // working LATM not found at first try, look further on in stream
- int i;
-
- for (i = 0; i < 5; i++) {
- pos = sh->a_in_buffer_len-3;
- memmove(sh->a_in_buffer, &(sh->a_in_buffer[pos]), 3);
- sh->a_in_buffer_len = 3;
- sh->a_in_buffer_len += demux_read_data(sh->ds,&sh->a_in_buffer[sh->a_in_buffer_len],
- sh->a_in_buffer_size - sh->a_in_buffer_len);
- faac_init = faacDecInit(faac_hdec, sh->a_in_buffer,
- sh->a_in_buffer_len, &faac_samplerate, &faac_channels,1);
- if (faac_init >= 0) break;
- }
- }
-#else
/* external faad does not have latm lookup support */
faac_init = faacDecInit(faac_hdec, sh->a_in_buffer,
sh->a_in_buffer_len, &faac_samplerate, &faac_channels);
-#endif
if (faac_init < 0) {
pos = aac_probe(sh->a_in_buffer, sh->a_in_buffer_len);
@@ -169,13 +143,8 @@ static int init(sh_audio_t *sh)
}
/* init the codec */
-#if CONFIG_FAAD_INTERNAL
- faac_init = faacDecInit(faac_hdec, sh->a_in_buffer,
- sh->a_in_buffer_len, &faac_samplerate, &faac_channels,0);
-#else
faac_init = faacDecInit(faac_hdec, sh->a_in_buffer,
sh->a_in_buffer_len, &faac_samplerate, &faac_channels);
-#endif
}
sh->a_in_buffer_len -= (faac_init > 0)?faac_init:0; // how many bytes init consumed
Modified: trunk/rpm/mplayer.spec
==============================================================================
--- trunk/rpm/mplayer.spec Sat Jan 1 15:06:21 2011 (r32740)
+++ trunk/rpm/mplayer.spec Sat Jan 1 15:27:41 2011 (r32741)
@@ -149,7 +149,6 @@ mv DOCS/man/zh DOCS/man/zh_CN
--disable-libdvdcss-internal \
--enable-menu \
\
- --disable-faad-internal \
--disable-tremor-internal \
%{!?_with_amr:--disable-libamr_nb --disable-libamr_wb} \
%{!?_with_libmad:--disable-mad} \
@@ -198,7 +197,6 @@ mv -f mplayer gmplayer
--disable-libdvdcss-internal \
--enable-menu \
\
- --disable-faad-internal \
--disable-tremor-internal \
%{!?_with_amr:--disable-libamr_nb --disable-libamr_wb} \
%{!?_with_libmad:--disable-mad} \
More information about the MPlayer-cvslog
mailing list