contrib: Add Speex decoder libspeex.

diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs
index f05afc6b4153554730e8621f78b33ed762b6f005..e71f8720946d44dfacf665e81a07a9e88222ae4f 100644 (file)
--- a/contrib/ffmpeg/module.defs
+++ b/contrib/ffmpeg/module.defs
@@ -1,4 +1,4 @@
-__deps__ := YASM BZIP2 ZLIB FDKAAC LIBVPX LAME LIBOPUS
+__deps__ := YASM BZIP2 ZLIB FDKAAC LIBVPX LAME LIBOPUS LIBSPEEX
 ifeq (1,$(FEATURE.qsv))
 __deps__ += LIBMFX
 endif
@@ -47,6 +47,9 @@ FFMPEG.CONFIGURE.extra = \
     --enable-encoder=libmp3lame \
     --enable-libopus \
     --enable-encoder=libopus \
+    --enable-libspeex \
+    --disable-encoder=libspeex \
+    --enable-decoder=libspeex \
     --enable-libvpx \
     --enable-encoder=libvpx_vp8 \
     --disable-decoder=libvpx_vp8 \

diff --git a/contrib/libspeex/module.defs b/contrib/libspeex/module.defs
new file mode 100644 (file)
index 0000000..caca6f7
--- /dev/null
+++ b/contrib/libspeex/module.defs
@@ -0,0 +1,7 @@
+$(eval $(call import.MODULE.defs,LIBSPEEX,libspeex))
+$(eval $(call import.CONTRIB.defs,LIBSPEEX,libspeex))
+
+LIBSPEEX.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/speex-1.2.0.tar.gz
+LIBSPEEX.FETCH.url    += https://downloads.us.xiph.org/releases/speex/speex-1.2.0.tar.gz
+LIBSPEEX.FETCH.sha256  = eaae8af0ac742dc7d542c9439ac72f1f385ce838392dc849cae4536af9210094
+LIBSPEEX.EXTRACT.tarbase = speex-1.2.0

diff --git a/contrib/libspeex/module.rules b/contrib/libspeex/module.rules
new file mode 100644 (file)
index 0000000..db28d46
--- /dev/null
+++ b/contrib/libspeex/module.rules
@@ -0,0 +1,2 @@
+$(eval $(call import.MODULE.rules,LIBSPEEX))
+$(eval $(call import.CONTRIB.rules,LIBSPEEX))

diff --git a/libhb/module.defs b/libhb/module.defs
index e575e9117bba173711661f7ea135192f28f7e43a..fae0be2ada8d46532bdb9b4ad9def4fa51ce1e52 100644 (file)
--- a/libhb/module.defs
+++ b/libhb/module.defs
@@ -1,7 +1,7 @@
 __deps__ := A52DEC BZIP2 LIBVPX FFMPEG FREETYPE LAME LIBASS LIBDCA \
     LIBDVDREAD LIBDVDNAV LIBICONV LIBSAMPLERATE LIBTHEORA LIBVORBIS LIBOGG \
     LIBXML2 PTHREADW32 X264 X265 ZLIB LIBBLURAY FDKAAC LIBMFX LIBGNURX JANSSON \
-    HARFBUZZ LIBOPUS
+    HARFBUZZ LIBOPUS LIBSPEEX
 
 ifeq (,$(filter $(BUILD.system),darwin cygwin mingw))
     __deps__ += FONTCONFIG
@@ -132,7 +132,7 @@ LIBHB.lib = $(LIBHB.build/)hb.lib
 LIBHB.dll.libs = $(foreach n, \
         ass avformat avfilter avcodec avutil avresample swresample postproc dvdnav dvdread \
         freetype mp3lame samplerate swscale vpx theora vorbis vorbisenc ogg \
-        x264 xml2 bluray jansson harfbuzz opus, \
+        x264 xml2 bluray jansson harfbuzz opus speex, \
         $(CONTRIB.build/)lib/lib$(n).a )
 
 ifeq (1,$(FEATURE.fdk_aac))

diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj
index b610c948c47651d927a72d0b8dce8c0c09cb09bb..1b0ed4543e2ed1a67114d63ca6441b8ed4f8d552 100644 (file)
--- a/macosx/HandBrake.xcodeproj/project.pbxproj
+++ b/macosx/HandBrake.xcodeproj/project.pbxproj
@@ -11,6 +11,8 @@
                1C0695AD20BD193D001543DA /* libpostproc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1C0695AA20BD193D001543DA /* libpostproc.a */; };
                1C0695AE20BD193D001543DA /* libswresample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1C0695AB20BD193D001543DA /* libswresample.a */; };
                1C0695AF20BD193D001543DA /* libswresample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1C0695AB20BD193D001543DA /* libswresample.a */; };
+               1C53DE8C20BD598D006BBCA8 /* libspeex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1C280BF320BD58DD00D5ECC2 /* libspeex.a */; };
+               1C53DE8D20BD598D006BBCA8 /* libspeex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1C280BF320BD58DD00D5ECC2 /* libspeex.a */; };
                1C6D76551CD7733300F5B943 /* libharfbuzz.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1C15C82B1CD7722500368223 /* libharfbuzz.a */; };
                1C6D76561CD7733400F5B943 /* libharfbuzz.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1C15C82B1CD7722500368223 /* libharfbuzz.a */; };
                1C7776A2202300DD001C31EB /* HBRenamePresetController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C7776A0202300DC001C31EB /* HBRenamePresetController.m */; };
@@ -321,9 +323,10 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-               1C0695AA20BD193D001543DA /* libpostproc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpostproc.a; path = "external/contrib/lib/libpostproc.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-               1C0695AB20BD193D001543DA /* libswresample.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libswresample.a; path = "external/contrib/lib/libswresample.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+               1C0695AA20BD193D001543DA /* libpostproc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpostproc.a; path = external/contrib/lib/libpostproc.a; sourceTree = BUILT_PRODUCTS_DIR; };
+               1C0695AB20BD193D001543DA /* libswresample.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libswresample.a; path = external/contrib/lib/libswresample.a; sourceTree = BUILT_PRODUCTS_DIR; };
                1C15C82B1CD7722500368223 /* libharfbuzz.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libharfbuzz.a; path = external/contrib/lib/libharfbuzz.a; sourceTree = BUILT_PRODUCTS_DIR; };
+               1C280BF320BD58DD00D5ECC2 /* libspeex.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libspeex.a; path = external/contrib/lib/libspeex.a; sourceTree = BUILT_PRODUCTS_DIR; };
                1C7776A0202300DC001C31EB /* HBRenamePresetController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HBRenamePresetController.m; sourceTree = "<group>"; };
                1C7776A1202300DC001C31EB /* HBRenamePresetController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HBRenamePresetController.h; sourceTree = "<group>"; };
                1C7776A4202301D5001C31EB /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/HBRenamePresetController.xib; sourceTree = "<group>"; };
@@ -641,6 +644,7 @@
                                27D6C74C14B102DA00B785E4 /* libbluray.a in Frameworks */,
                                27D6C75014B102DA00B785E4 /* libdvdnav.a in Frameworks */,
                                27D6C75214B102DA00B785E4 /* libdvdread.a in Frameworks */,
+                               1C53DE8C20BD598D006BBCA8 /* libspeex.a in Frameworks */,
                                27D6C75814B102DA00B785E4 /* libfreetype.a in Frameworks */,
                                27D6C75A14B102DA00B785E4 /* libfribidi.a in Frameworks */,
                                27D6C75F14B102DA00B785E4 /* libmp3lame.a in Frameworks */,
@@ -682,6 +686,7 @@
                                A9ABD1A61E2A0F0700EC8B65 /* CoreText.framework in Frameworks */,
                                A91119A31C7DD591001C463C /* IOKit.framework in Frameworks */,
                                A91119A21C7DD58B001C463C /* Cocoa.framework in Frameworks */,
+                               1C53DE8D20BD598D006BBCA8 /* libspeex.a in Frameworks */,
                                A9736F1F1C7DA667008F1D18 /* Foundation.framework in Frameworks */,
                                A91CE2B21C7DAB550068F46F /* AudioToolbox.framework in Frameworks */,
                                A91CE2D41C7DABE40068F46F /* libiconv.tbd in Frameworks */,
@@ -733,6 +738,7 @@
                271BA4C714B1236D00BC1D2C /* Static Libraries */ = {
                        isa = PBXGroup;
                        children = (
+                               1C280BF320BD58DD00D5ECC2 /* libspeex.a */,
                                1C0695AA20BD193D001543DA /* libpostproc.a */,
                                1C0695AB20BD193D001543DA /* libswresample.a */,
                                27D6C72414B1019100B785E4 /* libhandbrake.a */,

diff --git a/make/include/main.defs b/make/include/main.defs
index 8a0b39dbc435ba36a11244b879120ecc9e2ad555..7bbab9bce89f224129af0f58cae0ee46787d7ef4 100644 (file)
--- a/make/include/main.defs
+++ b/make/include/main.defs
@@ -50,6 +50,7 @@ ifneq (,$(filter $(BUILD.system),darwin cygwin mingw))
     MODULES += contrib/libogg
     MODULES += contrib/libvorbis
     MODULES += contrib/libopus
+    MODULES += contrib/libspeex
     MODULES += contrib/libtheora
     MODULES += contrib/libsamplerate
     MODULES += contrib/lame

diff --git a/test/module.defs b/test/module.defs
index 26b9a2883b8df7b276ee3bfe0f7b128e21703887..cc2d048bfd394d50d10ac3123028651bf7b0a010 100644 (file)
--- a/test/module.defs
+++ b/test/module.defs
@@ -17,7 +17,7 @@ TEST.GCC.l = \
         ass avresample avformat avfilter avcodec avutil swresample postproc mp3lame dvdnav \
         dvdread fribidi \
         samplerate swscale vpx theoraenc theoradec vorbis vorbisenc ogg x264 \
-        bluray freetype xml2 bz2 z jansson harfbuzz opus
+        bluray freetype xml2 bz2 z jansson harfbuzz opus speex
 
 ifeq (,$(filter $(BUILD.system),darwin cygwin mingw))
     TEST.GCC.l += fontconfig