From 3c918d674b8bc6a125f385137b4f296260c968cf Mon Sep 17 00:00:00 2001 From: theuni Date: Thu, 17 Feb 2011 11:37:11 -0500 Subject: [PATCH] Removed use of libfaad2. It was already disabled on all platforms. --- .gitignore | 39 --- README.linux | 2 +- README.ubuntu | 2 +- XBMC.xcodeproj/project.pbxproj | 18 -- configure.in | 11 - lib/Makefile.in | 11 - project/VS2010Express/XBMC for Windows.sln | 2 - project/VS2010Express/XBMC.vcxproj | 3 - project/VS2010Express/XBMC.vcxproj.filters | 9 - tools/arm/arm-scripts/pkg-paths.txt | 2 - xbmc/DllPaths_generated.h.in | 2 - xbmc/DllPaths_win32.h | 1 - .../DVDCodecs/Audio/DVDAudioCodecLibFaad.cpp | 266 ------------------ .../DVDCodecs/Audio/DVDAudioCodecLibFaad.h | 75 ----- .../dvdplayer/DVDCodecs/Audio/DllLibFaad.h | 74 ----- .../dvdplayer/DVDCodecs/Audio/Makefile.in | 1 - .../DVDCodecs/Audio/libfaad/neaacdec.h | 255 ----------------- .../dvdplayer/DVDCodecs/DVDFactoryCodec.cpp | 12 - 18 files changed, 2 insertions(+), 783 deletions(-) delete mode 100644 xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLibFaad.cpp delete mode 100644 xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLibFaad.h delete mode 100644 xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibFaad.h delete mode 100644 xbmc/cores/dvdplayer/DVDCodecs/Audio/libfaad/neaacdec.h diff --git a/.gitignore b/.gitignore index ff3c15fde7d5d..54b4b01a0be8f 100644 --- a/.gitignore +++ b/.gitignore @@ -348,7 +348,6 @@ config.log /system/players/dvdplayer/libdvdcss-2.dll /system/players/dvdplayer/libdvdnav.dll /system/players/dvdplayer/libexpat-1.dll -/system/players/dvdplayer/libfaad.dll /system/players/dvdplayer/libfontconfig-1.dll /system/players/dvdplayer/librtmp.dll /system/players/dvdplayer/postproc-51.dll @@ -685,44 +684,6 @@ config.log /lib/libdts/vc++/Debug /lib/libdts/vc++/Release -# /lib/libfaad2/ -/lib/libfaad2/config.log -/lib/libfaad2/config.h -/lib/libfaad2/Makefile -/lib/libfaad2/config.status -/lib/libfaad2/stamp-h1 -/lib/libfaad2/configure.lineno -/lib/libfaad2/libtool -/lib/libfaad2/faad2.spec -/lib/libfaad2/libfaad/ReleaseDLL - -# /lib/libfaad2/common/ -/lib/libfaad2/common/Makefile - -# /lib/libfaad2/common/mp4ff/ -/lib/libfaad2/common/mp4ff/Makefile - -# /lib/libfaad2/frontend/ -/lib/libfaad2/frontend/Makefile -/lib/libfaad2/frontend/faad - -# /lib/libfaad2/libfaad/ -/lib/libfaad2/libfaad/Makefile -/lib/libfaad2/libfaad/DebugDLL -/lib/libfaad2/libfaad/ReleaseDLL - -# /lib/libfaad2/plugins/ -/lib/libfaad2/plugins/Makefile - -# /lib/libfaad2/plugins/mpeg4ip/ -/lib/libfaad2/plugins/mpeg4ip/Makefile - -# /lib/libfaad2/plugins/xmms/ -/lib/libfaad2/plugins/xmms/Makefile - -# /lib/libfaad2/plugins/xmms/src/ -/lib/libfaad2/plugins/xmms/src/Makefile - # /lib/libmad/ /lib/libmad/config.h /lib/libmad/Makefile diff --git a/README.linux b/README.linux index 6e24408341d11..8b4f2f7307599 100644 --- a/README.linux +++ b/README.linux @@ -52,7 +52,7 @@ Build-Depends: debhelper (>= 7.0.50~), python-support, cmake, libmpeg2-4-dev, libass-dev (>= 0.9.8), libmpcdec-dev, libflac-dev, libwavpack-dev, python-dev, gawk, gperf, nasm [!amd64], libcwiid1-dev, libbluetooth-dev, zlib1g-dev, libsmbclient-dev, - libfaad-dev, libiso9660-dev, libssl-dev, lsb-release, libvdpau-dev, libmicrohttpd-dev, + libiso9660-dev, libssl-dev, lsb-release, libvdpau-dev, libmicrohttpd-dev, libmodplug-dev, librtmp-dev, libcrystalhd-dev, curl *** For developers and anyone else who compiles frequently it is recommended to diff --git a/README.ubuntu b/README.ubuntu index c5d520feeb7e0..5c801c5c0c1bc 100644 --- a/README.ubuntu +++ b/README.ubuntu @@ -44,7 +44,7 @@ Two methods exist to install the required Ubuntu packages: For Ubuntu (all versions >= 7.04): - # sudo apt-get install subversion make g++ gcc gawk pmount libtool nasm yasm automake cmake gperf zip unzip bison libsdl-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libfribidi-dev liblzo2-dev libfreetype6-dev libsqlite3-dev libogg-dev libasound-dev python-sqlite libglew-dev libcurl3 libcurl4-gnutls-dev libxrandr-dev libxrender-dev libmad0-dev libogg-dev libvorbisenc2 libsmbclient-dev libmysqlclient-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper-dev libfontconfig-dev libbz2-dev libboost-dev libenca-dev libxt-dev libxtst-dev libxmu-dev libpng-dev libjpeg-dev libpulse-dev mesa-utils libcdio-dev libsamplerate-dev libmpeg3-dev libfaad-dev libflac-dev libiso9660-dev libass-dev libssl-dev fp-compiler gdc libwavpack-dev libmpeg2-4-dev libmicrohttpd-dev libmodplug-dev libssh-dev gettext cvs + # sudo apt-get install subversion make g++ gcc gawk pmount libtool nasm yasm automake cmake gperf zip unzip bison libsdl-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libfribidi-dev liblzo2-dev libfreetype6-dev libsqlite3-dev libogg-dev libasound-dev python-sqlite libglew-dev libcurl3 libcurl4-gnutls-dev libxrandr-dev libxrender-dev libmad0-dev libogg-dev libvorbisenc2 libsmbclient-dev libmysqlclient-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper-dev libfontconfig-dev libbz2-dev libboost-dev libenca-dev libxt-dev libxtst-dev libxmu-dev libpng-dev libjpeg-dev libpulse-dev mesa-utils libcdio-dev libsamplerate-dev libmpeg3-dev libflac-dev libiso9660-dev libass-dev libssl-dev fp-compiler gdc libwavpack-dev libmpeg2-4-dev libmicrohttpd-dev libmodplug-dev libssh-dev gettext cvs For Ubuntu Maverick (10.10): # sudo apt-get install autopoint diff --git a/XBMC.xcodeproj/project.pbxproj b/XBMC.xcodeproj/project.pbxproj index f91ae74143590..1de0ad872db85 100644 --- a/XBMC.xcodeproj/project.pbxproj +++ b/XBMC.xcodeproj/project.pbxproj @@ -627,7 +627,6 @@ E38E1F7B0D25F9FD00618676 /* DVDAudioCodecFFmpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15070D25F9F900618676 /* DVDAudioCodecFFmpeg.cpp */; }; E38E1F7C0D25F9FD00618676 /* DVDAudioCodecLiba52.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15090D25F9F900618676 /* DVDAudioCodecLiba52.cpp */; }; E38E1F7D0D25F9FD00618676 /* DVDAudioCodecLibDts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E150B0D25F9F900618676 /* DVDAudioCodecLibDts.cpp */; }; - E38E1F7E0D25F9FD00618676 /* DVDAudioCodecLibFaad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E150D0D25F9F900618676 /* DVDAudioCodecLibFaad.cpp */; }; E38E1F7F0D25F9FD00618676 /* DVDAudioCodecLibMad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E150F0D25F9F900618676 /* DVDAudioCodecLibMad.cpp */; }; E38E1F800D25F9FD00618676 /* DVDAudioCodecLPcm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15110D25F9F900618676 /* DVDAudioCodecLPcm.cpp */; }; E38E1F810D25F9FD00618676 /* DVDAudioCodecPassthrough.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15130D25F9F900618676 /* DVDAudioCodecPassthrough.cpp */; }; @@ -1222,7 +1221,6 @@ F5A1C8E90F6B06CF00A96ABD /* DVDAudioCodecFFmpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15070D25F9F900618676 /* DVDAudioCodecFFmpeg.cpp */; }; F5A1C8EA0F6B06CF00A96ABD /* DVDAudioCodecLiba52.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15090D25F9F900618676 /* DVDAudioCodecLiba52.cpp */; }; F5A1C8EB0F6B06CF00A96ABD /* DVDAudioCodecLibDts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E150B0D25F9F900618676 /* DVDAudioCodecLibDts.cpp */; }; - F5A1C8EC0F6B06CF00A96ABD /* DVDAudioCodecLibFaad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E150D0D25F9F900618676 /* DVDAudioCodecLibFaad.cpp */; }; F5A1C8ED0F6B06CF00A96ABD /* DVDAudioCodecLibMad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E150F0D25F9F900618676 /* DVDAudioCodecLibMad.cpp */; }; F5A1C8EE0F6B06CF00A96ABD /* DVDAudioCodecLPcm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15110D25F9F900618676 /* DVDAudioCodecLPcm.cpp */; }; F5A1C8EF0F6B06CF00A96ABD /* DVDAudioCodecPassthrough.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15130D25F9F900618676 /* DVDAudioCodecPassthrough.cpp */; }; @@ -2613,7 +2611,6 @@ E38E14FF0D25F9F900618676 /* DVDClock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDClock.h; sourceTree = ""; }; E38E15020D25F9F900618676 /* DllLiba52.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DllLiba52.h; sourceTree = ""; }; E38E15030D25F9F900618676 /* DllLibDts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DllLibDts.h; sourceTree = ""; }; - E38E15040D25F9F900618676 /* DllLibFaad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DllLibFaad.h; sourceTree = ""; }; E38E15050D25F9F900618676 /* DllLibMad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DllLibMad.h; sourceTree = ""; }; E38E15060D25F9F900618676 /* DVDAudioCodec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDAudioCodec.h; sourceTree = ""; }; E38E15070D25F9F900618676 /* DVDAudioCodecFFmpeg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDAudioCodecFFmpeg.cpp; sourceTree = ""; }; @@ -2622,8 +2619,6 @@ E38E150A0D25F9F900618676 /* DVDAudioCodecLiba52.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDAudioCodecLiba52.h; sourceTree = ""; }; E38E150B0D25F9F900618676 /* DVDAudioCodecLibDts.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDAudioCodecLibDts.cpp; sourceTree = ""; }; E38E150C0D25F9F900618676 /* DVDAudioCodecLibDts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDAudioCodecLibDts.h; sourceTree = ""; }; - E38E150D0D25F9F900618676 /* DVDAudioCodecLibFaad.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDAudioCodecLibFaad.cpp; sourceTree = ""; }; - E38E150E0D25F9F900618676 /* DVDAudioCodecLibFaad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDAudioCodecLibFaad.h; sourceTree = ""; }; E38E150F0D25F9F900618676 /* DVDAudioCodecLibMad.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDAudioCodecLibMad.cpp; sourceTree = ""; }; E38E15100D25F9F900618676 /* DVDAudioCodecLibMad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDAudioCodecLibMad.h; sourceTree = ""; }; E38E15110D25F9F900618676 /* DVDAudioCodecLPcm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDAudioCodecLPcm.cpp; sourceTree = ""; }; @@ -5288,7 +5283,6 @@ children = ( E38E15020D25F9F900618676 /* DllLiba52.h */, E38E15030D25F9F900618676 /* DllLibDts.h */, - E38E15040D25F9F900618676 /* DllLibFaad.h */, E38E15050D25F9F900618676 /* DllLibMad.h */, E38E15060D25F9F900618676 /* DVDAudioCodec.h */, E38E15070D25F9F900618676 /* DVDAudioCodecFFmpeg.cpp */, @@ -5297,8 +5291,6 @@ E38E150A0D25F9F900618676 /* DVDAudioCodecLiba52.h */, E38E150B0D25F9F900618676 /* DVDAudioCodecLibDts.cpp */, E38E150C0D25F9F900618676 /* DVDAudioCodecLibDts.h */, - E38E150D0D25F9F900618676 /* DVDAudioCodecLibFaad.cpp */, - E38E150E0D25F9F900618676 /* DVDAudioCodecLibFaad.h */, E38E150F0D25F9F900618676 /* DVDAudioCodecLibMad.cpp */, E38E15100D25F9F900618676 /* DVDAudioCodecLibMad.h */, E38E15110D25F9F900618676 /* DVDAudioCodecLPcm.cpp */, @@ -5312,7 +5304,6 @@ F5F24E801123242B009126C6 /* Encoders */, E38E15170D25F9F900618676 /* liba52 */, E38E15190D25F9F900618676 /* libdts */, - E38E151B0D25F9F900618676 /* libfaad */, E38E151D0D25F9F900618676 /* libmad */, ); path = Audio; @@ -5334,13 +5325,6 @@ path = libdts; sourceTree = ""; }; - E38E151B0D25F9F900618676 /* libfaad */ = { - isa = PBXGroup; - children = ( - ); - path = libfaad; - sourceTree = ""; - }; E38E151D0D25F9F900618676 /* libmad */ = { isa = PBXGroup; children = ( @@ -7350,7 +7334,6 @@ E38E1F7B0D25F9FD00618676 /* DVDAudioCodecFFmpeg.cpp in Sources */, E38E1F7C0D25F9FD00618676 /* DVDAudioCodecLiba52.cpp in Sources */, E38E1F7D0D25F9FD00618676 /* DVDAudioCodecLibDts.cpp in Sources */, - E38E1F7E0D25F9FD00618676 /* DVDAudioCodecLibFaad.cpp in Sources */, E38E1F7F0D25F9FD00618676 /* DVDAudioCodecLibMad.cpp in Sources */, E38E1F800D25F9FD00618676 /* DVDAudioCodecLPcm.cpp in Sources */, E38E1F810D25F9FD00618676 /* DVDAudioCodecPassthrough.cpp in Sources */, @@ -8230,7 +8213,6 @@ F5A1C8E90F6B06CF00A96ABD /* DVDAudioCodecFFmpeg.cpp in Sources */, F5A1C8EA0F6B06CF00A96ABD /* DVDAudioCodecLiba52.cpp in Sources */, F5A1C8EB0F6B06CF00A96ABD /* DVDAudioCodecLibDts.cpp in Sources */, - F5A1C8EC0F6B06CF00A96ABD /* DVDAudioCodecLibFaad.cpp in Sources */, F5A1C8ED0F6B06CF00A96ABD /* DVDAudioCodecLibMad.cpp in Sources */, F5A1C8EE0F6B06CF00A96ABD /* DVDAudioCodecLPcm.cpp in Sources */, F5A1C8EF0F6B06CF00A96ABD /* DVDAudioCodecPassthrough.cpp in Sources */, diff --git a/configure.in b/configure.in index d0c282686aca8..3dfc4e0a3b995 100644 --- a/configure.in +++ b/configure.in @@ -637,7 +637,6 @@ else # paths from mysql_config AC_CHECK_LIB([modplug], [main],, AC_MSG_ERROR($missing_library)) AC_CHECK_LIB([mysqlclient],[main],, AC_MSG_ERROR($missing_library)) - AC_CHECK_LIB([faad], [main],, AC_MSG_ERROR($missing_library)) AC_CHECK_HEADER([FLAC/stream_decoder.h],, AC_MSG_ERROR($missing_library)) AC_CHECK_LIB([smbclient], [main],, AC_MSG_ERROR($missing_library)) AC_CHECK_LIB([SDL_mixer], [main],, AC_MSG_ERROR($missing_library)) @@ -687,7 +686,6 @@ if test "$host_vendor" != "apple"; then XB_FIND_SONAME([CURL], [curl]) XB_FIND_SONAME([FLAC], [FLAC]) XB_FIND_SONAME([MODPLUG], [modplug]) - XB_FIND_SONAME([FAAD], [faad]) XB_FIND_SONAME([MAD], [mad]) fi XB_FIND_SONAME([OGG], [ogg]) @@ -1509,7 +1507,6 @@ AC_SUBST(LIBCURL_BASENAME) AC_SUBST(LIBFLAC_BASENAME) AC_SUBST(LIBVORBISFILE_BASENAME) AC_SUBST(LIBMODPLUG_BASENAME) -AC_SUBST(LIBFAAD_BASENAME) AC_SUBST(LIBMAD_BASENAME) AC_SUBST(LIBOGG_BASENAME) AC_SUBST(LIBVORBISENC_BASENAME) @@ -1797,14 +1794,6 @@ XB_CONFIG_MODULE([lib/libdvd/libdvdnav], [ fi ], [0]) -XB_CONFIG_MODULE([lib/libfaad2], [ - if test "$host_vendor" = "apple" ; then - CFLAGS="$CFLAGS -O3 -fno-common" \ - ./configure MACOSX_DEPLOYMENT_TARGET=10.4 \ - --with-pic - fi -], [$HOST_NOT_APPLE]) - XB_CONFIG_MODULE([lib/liba52], [ if test "$host_vendor" = "apple" ; then CFLAGS="$CFLAGS -fno-common" \ diff --git a/lib/Makefile.in b/lib/Makefile.in index d1e3a8ea88df0..fe3066ec88842 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -36,9 +36,7 @@ endif ifeq ($(findstring osx,$(ARCH)),osx) DIRS+=libmad - DIRS+=libfaad2 LIBS+=libmad-$(ARCH).so - LIBS+=libfaad-$(ARCH).so endif ifneq (,$(findstring powerpc,$(ARCH))) @@ -117,11 +115,6 @@ $(SYSDIR)/libdts-$(ARCH).so: $(WRAPPER_OSX) libdts/libdts/libdts.a $(WRAPPER_OSX) $@;mv output.so $@ chmod +x $@ -$(SYSDIR)/libfaad-$(ARCH).so: $(WRAPPER_OSX) libfaad2/libfaad/libfaad.la - ld -bundle -flat_namespace -undefined suppress -o $@ \ - libfaad2/libfaad/*.o $(BUNDLE1_O) - $(WRAPPER_OSX) $@;mv output.so $@ - $(SYSDIR)/libmad-$(ARCH).so: $(WRAPPER_OSX) libmad/libmad.la ld -bundle -flat_namespace -undefined suppress -o $@ \ libmad/.libs/*.o $(BUNDLE1_O) @@ -141,10 +134,6 @@ libdts/libdts/libdts.a : libdts; libdts: $(MAKE) -C $@ -libfaad2/libfaad/libfaad.la: libfaad2; -libfaad2: - $(MAKE) -C $@ - libmad/libmad.la: libmad; libmad: $(MAKE) -C $@ diff --git a/project/VS2010Express/XBMC for Windows.sln b/project/VS2010Express/XBMC for Windows.sln index ac308df744182..fee530de9967b 100644 --- a/project/VS2010Express/XBMC for Windows.sln +++ b/project/VS2010Express/XBMC for Windows.sln @@ -18,8 +18,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libass_dll", "..\..\lib\lib EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "visMilkdrop", "..\..\xbmc\visualizations\Milkdrop\Plugin.vcxproj", "{5E479372-4F34-426D-AA1E-9879E94C105D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfaad2_dll", "..\..\lib\libfaad2\libfaad\libfaad2_dll.vcxproj", "{482DA264-EE88-4575-B208-87C4CB80CD08}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcmyth_dll", "..\..\lib\cmyth\Win32\libcmyth.vcxproj", "{F9E6874D-60A8-49BA-9393-A2105E63ABCF}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsamplerate", "..\..\lib\win32\libsamplerate\libsamplerate_win32\libsamplerate_win32.vcxproj", "{5013769A-0784-4CE8-9D9D-09AC7F731B4F}" diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj index c4db94107aa25..a80ea568dd28e 100644 --- a/project/VS2010Express/XBMC.vcxproj +++ b/project/VS2010Express/XBMC.vcxproj @@ -770,7 +770,6 @@ - @@ -1612,11 +1611,9 @@ - - diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters index b575913d999e3..e93ced528140b 100644 --- a/project/VS2010Express/XBMC.vcxproj.filters +++ b/project/VS2010Express/XBMC.vcxproj.filters @@ -336,9 +336,6 @@ cores\dvdplayer\DVDCodecs\Audio - - cores\dvdplayer\DVDCodecs\Audio - cores\dvdplayer\DVDCodecs\Audio @@ -2584,9 +2581,6 @@ cores\dvdplayer\DVDCodecs\Audio - - cores\dvdplayer\DVDCodecs\Audio - cores\dvdplayer\DVDCodecs\Audio @@ -2596,9 +2590,6 @@ cores\dvdplayer\DVDCodecs\Audio - - cores\dvdplayer\DVDCodecs\Audio - cores\dvdplayer\DVDCodecs\Audio diff --git a/tools/arm/arm-scripts/pkg-paths.txt b/tools/arm/arm-scripts/pkg-paths.txt index 1420a8924bb3a..6c9f69410e0f3 100644 --- a/tools/arm/arm-scripts/pkg-paths.txt +++ b/tools/arm/arm-scripts/pkg-paths.txt @@ -60,8 +60,6 @@ http://security.debian.org/debian-security/pool/updates/main/s/samba/libsmbclien http://security.debian.org/debian-security/pool/updates/main/s/samba/libsmbclient_3.2.5-4lenny7_armel.deb http://security.debian.org/debian-security/pool/updates/main/s/samba/libwbclient0_3.2.5-4lenny7_armel.deb http://ftp.uk.debian.org/debian/pool/main/t/talloc/libtalloc1_1.2.0~git20080616-1_armel.deb -http://ftp.uk.debian.org/debian/pool/main/f/faad2/libfaad-dev_2.6.1-3.1_armel.deb -http://ftp.uk.debian.org/debian/pool/main/f/faad2/libfaad0_2.6.1-3.1_armel.deb http://ftp.uk.debian.org/debian/pool/main/f/flac/libflac-dev_1.2.1-1.2_armel.deb http://ftp.uk.debian.org/debian/pool/main/libc/libcdio/libiso9660-dev_0.78.2+dfsg1-3_armel.deb http://security.debian.org/debian-security/pool/updates/main/d/dbus/libdbus-1-dev_1.2.1-5+lenny1_armel.deb diff --git a/xbmc/DllPaths_generated.h.in b/xbmc/DllPaths_generated.h.in index bf30d9524f2aa..37b2665e6ce73 100644 --- a/xbmc/DllPaths_generated.h.in +++ b/xbmc/DllPaths_generated.h.in @@ -81,10 +81,8 @@ #define DLL_PATH_LIBMPEG2 "special://xbmcbin/system/players/dvdplayer/libmpeg2-@ARCH@.so" #define DLL_PATH_LIBDVDNAV "special://xbmcbin/system/players/dvdplayer/libdvdnav-@ARCH@.so" #if defined(_LINUX) && !defined(__APPLE__) -#define DLL_PATH_LIBFAAD "@FAAD_SONAME@" #define DLL_PATH_LIBMAD "@MAD_SONAME@" #else -#define DLL_PATH_LIBFAAD "special://xbmcbin/system/players/dvdplayer/libfaad-@ARCH@.so" #define DLL_PATH_LIBMAD "special://xbmcbin/system/players/dvdplayer/libmad-@ARCH@.so" #endif diff --git a/xbmc/DllPaths_win32.h b/xbmc/DllPaths_win32.h index 12be1c7037dad..0b13e628e965d 100644 --- a/xbmc/DllPaths_win32.h +++ b/xbmc/DllPaths_win32.h @@ -57,7 +57,6 @@ #define DLL_PATH_LIBASS "special://xbmcbin/system/players/dvdplayer/libass.dll" #define DLL_PATH_LIBA52 "special://xbmcbin/system/players/dvdplayer/liba52.dll" #define DLL_PATH_LIBDTS "special://xbmcbin/system/players/dvdplayer/libdts.dll" -#define DLL_PATH_LIBFAAD "special://xbmcbin/system/players/dvdplayer/libfaad.dll" #define DLL_PATH_LIBMAD "special://xbmcbin/system/players/dvdplayer/libmad.dll" #define DLL_PATH_LIBMPEG2 "special://xbmcbin/system/players/dvdplayer/libmpeg2.dll" #define DLL_PATH_LIBDVDNAV "special://xbmcbin/system/players/dvdplayer/libdvdnav.dll" diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLibFaad.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLibFaad.cpp deleted file mode 100644 index 33f819fdef664..0000000000000 --- a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLibFaad.cpp +++ /dev/null @@ -1,266 +0,0 @@ -/* - * Copyright (C) 2005-2008 Team XBMC - * http://www.xbmc.org - * - * This Program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This Program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with XBMC; see the file COPYING. If not, write to - * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - * http://www.gnu.org/copyleft/gpl.html - * - */ - -#include "DVDAudioCodecLibFaad.h" -#ifdef USE_LIBFAAD_DECODER - -#include "DVDStreamInfo.h" -#include "GUISettings.h" -#include "utils/log.h" - -CDVDAudioCodecLibFaad::CDVDAudioCodecLibFaad() : CDVDAudioCodec() -{ - m_bInitializedDecoder = false; - - m_pHandle = NULL; -} - -CDVDAudioCodecLibFaad::~CDVDAudioCodecLibFaad() -{ - Dispose(); -} - -bool CDVDAudioCodecLibFaad::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options) -{ - // for safety - if (m_pHandle) Dispose(); - - if (!m_dll.Load()) - return false; - - memset(&m_frameInfo, 0, sizeof(m_frameInfo)); - - if (!OpenDecoder() ) - return false; - - m_bRawAACStream = true;; - - if( hints.extrasize ) - { - m_bRawAACStream = false; - - unsigned long samplerate; - unsigned char channels; - - int res = m_dll.faacDecInit2(m_pHandle, (unsigned char*)hints.extradata, hints.extrasize, &samplerate, &channels); - if (res < 0) - return false; - - m_iSourceSampleRate = samplerate; - m_iSourceChannels = channels; - m_iSourceBitrate = 0; - - m_bInitializedDecoder = true; - } - return true; -} - -void CDVDAudioCodecLibFaad::Dispose() -{ - CloseDecoder(); -} - -bool CDVDAudioCodecLibFaad::SyncStream() -{ - BYTE* p = m_InputBuffer; - - while (m_InputBufferSize > 4) - { - // Check if an ADIF or ADTS header is present - if (((p[0] == 'A') && (p[1] == 'D') && (p[2] == 'I') && (p[3] == 'F')) || - ((p[1] | p[0] << 8) & 0xfff0) == 0xfff0) - { - // sync found, update our buffer if needed - if (p != m_InputBuffer) - { - CLog::Log(LOGINFO, "CDVDAudioCodecLibFaad::SyncStream(), stream synced at offset %d", (int)(p - m_InputBuffer)); - memmove(m_InputBuffer, p, m_InputBufferSize); - } - return true; - } - p++; - m_InputBufferSize--; - } - - // no sync found - CLog::Log(LOGWARNING, "CDVDAudioCodecLibFaad::SyncStream(), no sync found (ADIF or ADTS header) in stream"); - return false; -} - -enum PCMChannels* CDVDAudioCodecLibFaad::GetChannelMap() -{ - int index = 0; - for(int i = 0; i < m_iSourceChannels; ++i) - switch(m_frameInfo.channel_position[i]) - { - case FRONT_CHANNEL_CENTER: m_pChannelMap[index++] = PCM_FRONT_CENTER ; break; - case FRONT_CHANNEL_LEFT : m_pChannelMap[index++] = PCM_FRONT_LEFT ; break; - case FRONT_CHANNEL_RIGHT : m_pChannelMap[index++] = PCM_FRONT_RIGHT ; break; - case SIDE_CHANNEL_LEFT : m_pChannelMap[index++] = PCM_SIDE_LEFT ; break; - case SIDE_CHANNEL_RIGHT : m_pChannelMap[index++] = PCM_SIDE_RIGHT ; break; - case BACK_CHANNEL_LEFT : m_pChannelMap[index++] = PCM_BACK_LEFT ; break; - case BACK_CHANNEL_RIGHT : m_pChannelMap[index++] = PCM_BACK_RIGHT ; break; - case BACK_CHANNEL_CENTER : m_pChannelMap[index++] = PCM_BACK_CENTER ; break; - case LFE_CHANNEL : m_pChannelMap[index++] = PCM_LOW_FREQUENCY; break; - } - - if (index < m_iSourceChannels) - return NULL; - - assert(index == m_iSourceChannels); - return m_pChannelMap; -} - -int CDVDAudioCodecLibFaad::Decode(BYTE* pData, int iSize) -{ - m_DecodedDataSize = 0; - - if (!m_pHandle) - return -1; - - int iBytesToCopy = std::min(iSize, LIBFAAD_INPUT_SIZE - m_InputBufferSize); - memcpy(m_InputBuffer + m_InputBufferSize, pData, iBytesToCopy); - m_InputBufferSize += iBytesToCopy; - - // if the caller does not supply enough data, return - if (m_InputBufferSize < FAAD_MIN_STREAMSIZE) - return iBytesToCopy; - - if(m_bRawAACStream) - { - // attempt to sync stream - if (!SyncStream()) - return iBytesToCopy; - - // initialize decoder if needed - if (!m_bInitializedDecoder) - { - unsigned long samplerate; - unsigned char channels; - - int res = m_dll.faacDecInit(m_pHandle, m_InputBuffer, m_InputBufferSize, &samplerate, &channels); - if(res < 0) - { - CLog::Log(LOGERROR, "CDVDAudioCodecLibFaad() : unable to init faad"); - m_InputBufferSize = 0; - - // faac leeks when faacDecInit is called multiple times on same handle - CloseDecoder(); - if(!OpenDecoder()) - return -1; - } - else - { - m_iSourceSampleRate = samplerate; - m_iSourceChannels = channels; - m_iSourceBitrate = 0; - - m_bInitializedDecoder = true; - } - } - } - - // if we haven't succeded in initing now, keep going - if (!m_bInitializedDecoder) - return iBytesToCopy; - - m_DecodedData = (short*)m_dll.faacDecDecode(m_pHandle, &m_frameInfo, m_InputBuffer, m_InputBufferSize); - m_DecodedDataSize = m_frameInfo.samples * sizeof(short); - - if (m_frameInfo.error) - { - char* strError = m_dll.faacDecGetErrorMessage(m_frameInfo.error); - m_dll.faacDecPostSeekReset(m_pHandle, 0); - CLog::Log(LOGERROR, "CDVDAudioCodecLibFaad() : %s", strError); - m_InputBufferSize = 0; - return iBytesToCopy; - } - - // we set this info again, it could be this info changed - m_iSourceSampleRate = m_frameInfo.samplerate; - m_iSourceChannels = m_frameInfo.channels; - m_iSourceBitrate = 0; - - // move remaining data along - m_InputBufferSize -= m_frameInfo.bytesconsumed; - memcpy(m_InputBuffer, m_InputBuffer+m_frameInfo.bytesconsumed, m_InputBufferSize); - - return iBytesToCopy; -} - -int CDVDAudioCodecLibFaad::GetData(BYTE** dst) -{ - *dst = (BYTE*)m_DecodedData; - return m_DecodedDataSize; -} - -void CDVDAudioCodecLibFaad::Reset() -{ - if (m_pHandle) - m_dll.faacDecPostSeekReset(m_pHandle, 0); -} - -void CDVDAudioCodecLibFaad::CloseDecoder() -{ - if (m_pHandle) - { - m_dll.faacDecClose(m_pHandle); - m_pHandle = NULL; - } -} - -bool CDVDAudioCodecLibFaad::OpenDecoder() -{ - if (m_pHandle) - { - CLog::Log(LOGWARNING, "CDVDAudioCodecLibFaad : Decoder already opened"); - return false; - } - - m_bInitializedDecoder = false; - - m_InputBufferSize = 0; - m_DecodedDataSize = 0; - - m_iSourceSampleRate = 0; - m_iSourceChannels = 0; - m_iSourceBitrate = 0; - - m_pHandle = m_dll.faacDecOpen(); - - if (m_pHandle) - { - faacDecConfigurationPtr pConfiguration; - pConfiguration = m_dll.faacDecGetCurrentConfiguration(m_pHandle); - - // modify some stuff here - pConfiguration->outputFormat = FAAD_FMT_16BIT; // already default - pConfiguration->downMatrix = 0; - - m_dll.faacDecSetConfiguration(m_pHandle, pConfiguration); - - return true; - } - - return false; -} - -#endif diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLibFaad.h b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLibFaad.h deleted file mode 100644 index 5297e9089e84c..0000000000000 --- a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLibFaad.h +++ /dev/null @@ -1,75 +0,0 @@ -#pragma once - -/* - * Copyright (C) 2005-2008 Team XBMC - * http://www.xbmc.org - * - * This Program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This Program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with XBMC; see the file COPYING. If not, write to - * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - * http://www.gnu.org/copyleft/gpl.html - * - */ -#include "system.h" -#ifdef USE_LIBFAAD_DECODER -#include "DVDAudioCodec.h" -#include "DllLibFaad.h" - -#define LIBFAAD_INPUT_SIZE (FAAD_MIN_STREAMSIZE * 8) // 6144 bytes / 6k -#define LIBFAAD_DECODED_SIZE (16 * LIBFAAD_INPUT_SIZE) - -class CDVDAudioCodecLibFaad : public CDVDAudioCodec -{ -public: - CDVDAudioCodecLibFaad(); - virtual ~CDVDAudioCodecLibFaad(); - virtual bool Open(CDVDStreamInfo &hints, CDVDCodecOptions &options); - virtual void Dispose(); - virtual int Decode(BYTE* pData, int iSize); - virtual int GetData(BYTE** dst); - virtual void Reset(); - virtual int GetChannels() { return m_iSourceChannels; } - virtual enum PCMChannels* GetChannelMap(); - virtual int GetSampleRate() { return m_iSourceSampleRate; } - virtual int GetBitsPerSample() { return 16; } - virtual const char* GetName() { return "libfaad"; } - virtual int GetBufferSize() { return m_InputBufferSize; } - -private: - - void CloseDecoder(); - bool OpenDecoder(); - - bool SyncStream(); - - int m_iSourceSampleRate; - int m_iSourceChannels; - enum PCMChannels m_pChannelMap[64]; - int m_iSourceBitrate; - - bool m_bInitializedDecoder; - bool m_bRawAACStream; - - faacDecHandle m_pHandle; - faacDecFrameInfo m_frameInfo; - - short* m_DecodedData; - int m_DecodedDataSize; - - BYTE m_InputBuffer[LIBFAAD_INPUT_SIZE]; - int m_InputBufferSize; - - DllLibFaad m_dll; -}; - -#endif diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibFaad.h b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibFaad.h deleted file mode 100644 index d425fa60b557e..0000000000000 --- a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibFaad.h +++ /dev/null @@ -1,74 +0,0 @@ -#pragma once - -/* - * Copyright (C) 2005-2008 Team XBMC - * http://www.xbmc.org - * - * This Program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This Program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with XBMC; see the file COPYING. If not, write to - * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - * http://www.gnu.org/copyleft/gpl.html - * - */ - -#if (defined HAVE_CONFIG_H) && (!defined WIN32) - #include "config.h" -#endif -#if defined(_LINUX) && !defined(__APPLE__) - #include -#else - #include "libfaad/neaacdec.h" -#endif -#include "DynamicDll.h" -#include "utils/log.h" - -class DllLibFaadInterface -{ -public: - virtual ~DllLibFaadInterface() {} - virtual NeAACDecHandle NeAACDecOpen(void)=0; - virtual NeAACDecConfigurationPtr NeAACDecGetCurrentConfiguration(NeAACDecHandle hDecoder)=0; - virtual unsigned char NeAACDecSetConfiguration(NeAACDecHandle hDecoder, NeAACDecConfigurationPtr config)=0; - virtual void NeAACDecClose(NeAACDecHandle hDecoder)=0; - virtual void* NeAACDecDecode(NeAACDecHandle hDecoder, NeAACDecFrameInfo *hInfo, unsigned char *buffer, unsigned long buffer_size)=0; - virtual long NeAACDecInit(NeAACDecHandle hDecoder, unsigned char *buffer, unsigned long buffer_size, unsigned long *samplerate, unsigned char *channels)=0; - virtual char NeAACDecInit2(NeAACDecHandle hDecoder, unsigned char *pBuffer, unsigned long SizeOfDecoderSpecificInfo, unsigned long *samplerate, unsigned char *channels)=0; - virtual char* NeAACDecGetErrorMessage(unsigned char errcode)=0; - virtual void NeAACDecPostSeekReset(NeAACDecHandle hDecoder, long frame)=0; -}; - -class DllLibFaad : public DllDynamic, DllLibFaadInterface -{ - DECLARE_DLL_WRAPPER(DllLibFaad, DLL_PATH_LIBFAAD) - DEFINE_METHOD0(NeAACDecHandle, NeAACDecOpen) - DEFINE_METHOD1(NeAACDecConfigurationPtr, NeAACDecGetCurrentConfiguration, (NeAACDecHandle p1)) - DEFINE_METHOD2(unsigned char, NeAACDecSetConfiguration, (NeAACDecHandle p1, NeAACDecConfigurationPtr p2)) - DEFINE_METHOD1(void, NeAACDecClose, (NeAACDecHandle p1)) - DEFINE_METHOD4(void*, NeAACDecDecode, (NeAACDecHandle p1, NeAACDecFrameInfo *p2, unsigned char *p3, unsigned long p4)) - DEFINE_METHOD5(long, NeAACDecInit, (NeAACDecHandle p1, unsigned char *p2, unsigned long p3, unsigned long *p4, unsigned char *p5)) - DEFINE_METHOD5(char, NeAACDecInit2, (NeAACDecHandle p1, unsigned char *p2, unsigned long p3, unsigned long *p4, unsigned char *p5)) - DEFINE_METHOD1(char*, NeAACDecGetErrorMessage, (unsigned char p1)) - DEFINE_METHOD2(void, NeAACDecPostSeekReset, (NeAACDecHandle p1, long p2)) - BEGIN_METHOD_RESOLVE() - RESOLVE_METHOD(NeAACDecOpen) - RESOLVE_METHOD(NeAACDecGetCurrentConfiguration) - RESOLVE_METHOD(NeAACDecSetConfiguration) - RESOLVE_METHOD(NeAACDecClose) - RESOLVE_METHOD(NeAACDecDecode) - RESOLVE_METHOD(NeAACDecInit) - RESOLVE_METHOD(NeAACDecInit2) - RESOLVE_METHOD(NeAACDecGetErrorMessage) - RESOLVE_METHOD(NeAACDecPostSeekReset) - END_METHOD_RESOLVE() -}; - diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Audio/Makefile.in b/xbmc/cores/dvdplayer/DVDCodecs/Audio/Makefile.in index 4eaa124e7cd80..5ce27f83807e5 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Audio/Makefile.in +++ b/xbmc/cores/dvdplayer/DVDCodecs/Audio/Makefile.in @@ -5,7 +5,6 @@ CXXFLAGS+=-DHAVE_MMX SRCS= DVDAudioCodecFFmpeg.cpp \ DVDAudioCodecLiba52.cpp \ DVDAudioCodecLibDts.cpp \ - DVDAudioCodecLibFaad.cpp \ DVDAudioCodecLibMad.cpp \ DVDAudioCodecLPcm.cpp \ DVDAudioCodecPassthrough.cpp \ diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Audio/libfaad/neaacdec.h b/xbmc/cores/dvdplayer/DVDCodecs/Audio/libfaad/neaacdec.h deleted file mode 100644 index 6ffa54f227bb1..0000000000000 --- a/xbmc/cores/dvdplayer/DVDCodecs/Audio/libfaad/neaacdec.h +++ /dev/null @@ -1,255 +0,0 @@ -/* -** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding -** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com -** -** This program is free software; you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2 of the License, or -** (at your option) any later version. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with this program; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -** -** Any non-GPL usage of this software or parts of this software is strictly -** forbidden. -** -** The "appropriate copyright message" mentioned in section 2c of the GPLv2 -** must read: "Code from FAAD2 is copyright (c) Nero AG, www.nero.com" -** -** Commercial non-GPL licensing of this software is possible. -** For more info contact Nero AG through Mpeg4AAClicense@nero.com. -** -** $Id: neaacdec.h,v 1.11 2007/11/01 12:33:29 menno Exp $ -**/ - -#ifndef __NEAACDEC_H__ -#define __NEAACDEC_H__ - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - - -#if 1 -/* MACROS FOR BACKWARDS COMPATIBILITY */ -/* structs */ -#define faacDecHandle NeAACDecHandle -#define faacDecConfiguration NeAACDecConfiguration -#define faacDecConfigurationPtr NeAACDecConfigurationPtr -#define faacDecFrameInfo NeAACDecFrameInfo -/* functions */ -#define faacDecGetErrorMessage NeAACDecGetErrorMessage -#define faacDecSetConfiguration NeAACDecSetConfiguration -#define faacDecGetCurrentConfiguration NeAACDecGetCurrentConfiguration -#define faacDecInit NeAACDecInit -#define faacDecInit2 NeAACDecInit2 -#define faacDecInitDRM NeAACDecInitDRM -#define faacDecPostSeekReset NeAACDecPostSeekReset -#define faacDecOpen NeAACDecOpen -#define faacDecClose NeAACDecClose -#define faacDecDecode NeAACDecDecode -#define AudioSpecificConfig NeAACDecAudioSpecificConfig -#endif - - -#ifdef _WIN32 - #pragma pack(push, 8) - #ifndef NEAACDECAPI - #define NEAACDECAPI __cdecl - #endif -#else - #ifndef NEAACDECAPI - #define NEAACDECAPI - #endif -#endif - -#define FAAD2_VERSION "2.6" - -/* object types for AAC */ -#define MAIN 1 -#define LC 2 -#define SSR 3 -#define LTP 4 -#define HE_AAC 5 -#define ER_LC 17 -#define ER_LTP 19 -#define LD 23 -#define DRM_ER_LC 27 /* special object type for DRM */ - -/* header types */ -#define RAW 0 -#define ADIF 1 -#define ADTS 2 - -/* SBR signalling */ -#define NO_SBR 0 -#define SBR_UPSAMPLED 1 -#define SBR_DOWNSAMPLED 2 -#define NO_SBR_UPSAMPLED 3 - -/* library output formats */ -#define FAAD_FMT_16BIT 1 -#define FAAD_FMT_24BIT 2 -#define FAAD_FMT_32BIT 3 -#define FAAD_FMT_FLOAT 4 -#define FAAD_FMT_FIXED FAAD_FMT_FLOAT -#define FAAD_FMT_DOUBLE 5 - -/* Capabilities */ -#define LC_DEC_CAP (1<<0) /* Can decode LC */ -#define MAIN_DEC_CAP (1<<1) /* Can decode MAIN */ -#define LTP_DEC_CAP (1<<2) /* Can decode LTP */ -#define LD_DEC_CAP (1<<3) /* Can decode LD */ -#define ERROR_RESILIENCE_CAP (1<<4) /* Can decode ER */ -#define FIXED_POINT_CAP (1<<5) /* Fixed point */ - -/* Channel definitions */ -#define FRONT_CHANNEL_CENTER (1) -#define FRONT_CHANNEL_LEFT (2) -#define FRONT_CHANNEL_RIGHT (3) -#define SIDE_CHANNEL_LEFT (4) -#define SIDE_CHANNEL_RIGHT (5) -#define BACK_CHANNEL_LEFT (6) -#define BACK_CHANNEL_RIGHT (7) -#define BACK_CHANNEL_CENTER (8) -#define LFE_CHANNEL (9) -#define UNKNOWN_CHANNEL (0) - -/* DRM channel definitions */ -#define DRMCH_MONO 1 -#define DRMCH_STEREO 2 -#define DRMCH_SBR_MONO 3 -#define DRMCH_SBR_STEREO 4 -#define DRMCH_SBR_PS_STEREO 5 - - -/* A decode call can eat up to FAAD_MIN_STREAMSIZE bytes per decoded channel, - so at least so much bytes per channel should be available in this stream */ -#define FAAD_MIN_STREAMSIZE 768 /* 6144 bits/channel */ - - -typedef void *NeAACDecHandle; - -typedef struct mp4AudioSpecificConfig -{ - /* Audio Specific Info */ - unsigned char objectTypeIndex; - unsigned char samplingFrequencyIndex; - unsigned long samplingFrequency; - unsigned char channelsConfiguration; - - /* GA Specific Info */ - unsigned char frameLengthFlag; - unsigned char dependsOnCoreCoder; - unsigned short coreCoderDelay; - unsigned char extensionFlag; - unsigned char aacSectionDataResilienceFlag; - unsigned char aacScalefactorDataResilienceFlag; - unsigned char aacSpectralDataResilienceFlag; - unsigned char epConfig; - - char sbr_present_flag; - char forceUpSampling; - char downSampledSBR; -} mp4AudioSpecificConfig; - -typedef struct NeAACDecConfiguration -{ - unsigned char defObjectType; - unsigned long defSampleRate; - unsigned char outputFormat; - unsigned char downMatrix; - unsigned char useOldADTSFormat; - unsigned char dontUpSampleImplicitSBR; -} NeAACDecConfiguration, *NeAACDecConfigurationPtr; - -typedef struct NeAACDecFrameInfo -{ - unsigned long bytesconsumed; - unsigned long samples; - unsigned char channels; - unsigned char error; - unsigned long samplerate; - - /* SBR: 0: off, 1: on; upsample, 2: on; downsampled, 3: off; upsampled */ - unsigned char sbr; - - /* MPEG-4 ObjectType */ - unsigned char object_type; - - /* AAC header type; MP4 will be signalled as RAW also */ - unsigned char header_type; - - /* multichannel configuration */ - unsigned char num_front_channels; - unsigned char num_side_channels; - unsigned char num_back_channels; - unsigned char num_lfe_channels; - unsigned char channel_position[64]; - - /* PS: 0: off, 1: on */ - unsigned char ps; -} NeAACDecFrameInfo; - -char* NEAACDECAPI NeAACDecGetErrorMessage(unsigned char errcode); - -unsigned long NEAACDECAPI NeAACDecGetCapabilities(void); - -NeAACDecHandle NEAACDECAPI NeAACDecOpen(void); - -NeAACDecConfigurationPtr NEAACDECAPI NeAACDecGetCurrentConfiguration(NeAACDecHandle hDecoder); - -unsigned char NEAACDECAPI NeAACDecSetConfiguration(NeAACDecHandle hDecoder, - NeAACDecConfigurationPtr config); - -/* Init the library based on info from the AAC file (ADTS/ADIF) */ -long NEAACDECAPI NeAACDecInit(NeAACDecHandle hDecoder, - unsigned char *buffer, - unsigned long buffer_size, - unsigned long *samplerate, - unsigned char *channels); - -/* Init the library using a DecoderSpecificInfo */ -char NEAACDECAPI NeAACDecInit2(NeAACDecHandle hDecoder, unsigned char *pBuffer, - unsigned long SizeOfDecoderSpecificInfo, - unsigned long *samplerate, unsigned char *channels); - -/* Init the library for DRM */ -char NEAACDECAPI NeAACDecInitDRM(NeAACDecHandle *hDecoder, unsigned long samplerate, - unsigned char channels); - -void NEAACDECAPI NeAACDecPostSeekReset(NeAACDecHandle hDecoder, long frame); - -void NEAACDECAPI NeAACDecClose(NeAACDecHandle hDecoder); - -void* NEAACDECAPI NeAACDecDecode(NeAACDecHandle hDecoder, - NeAACDecFrameInfo *hInfo, - unsigned char *buffer, - unsigned long buffer_size); - -void* NEAACDECAPI NeAACDecDecode2(NeAACDecHandle hDecoder, - NeAACDecFrameInfo *hInfo, - unsigned char *buffer, - unsigned long buffer_size, - void **sample_buffer, - unsigned long sample_buffer_size); - -char NEAACDECAPI NeAACDecAudioSpecificConfig(unsigned char *pBuffer, - unsigned long buffer_size, - mp4AudioSpecificConfig *mp4ASC); - -#ifdef _WIN32 - #pragma pack(pop) -#endif - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif diff --git a/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp b/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp index e831d28b95fef..d69ea055be7fe 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp @@ -42,9 +42,6 @@ #include "Audio/DVDAudioCodecLibDts.h" #endif #include "Audio/DVDAudioCodecLibMad.h" -#ifdef USE_LIBFAAD_DECODER - #include "Audio/DVDAudioCodecLibFaad.h" -#endif #include "Audio/DVDAudioCodecPcm.h" #include "Audio/DVDAudioCodecLPcm.h" #if defined(USE_LIBA52_DECODER) || defined(USE_LIBDTS_DECODER) @@ -275,15 +272,6 @@ CDVDAudioCodec* CDVDFactoryCodec::CreateAudioCodec( CDVDStreamInfo &hint, bool p if( pCodec ) return pCodec; break; } -#ifdef USE_LIBFAAD_DECODER - case CODEC_ID_AAC: - //case CODEC_ID_MPEG4AAC: - { - pCodec = OpenCodec( new CDVDAudioCodecLibFaad(), hint, options ); - if( pCodec ) return pCodec; - break; - } -#endif case CODEC_ID_PCM_S32LE: case CODEC_ID_PCM_S32BE: case CODEC_ID_PCM_U32LE: