From 51ab7c598b8ea909e04f42bd44bebc062f4f3df2 Mon Sep 17 00:00:00 2001 From: Dimitri Diakopoulos Date: Thu, 11 Feb 2016 21:29:53 -0800 Subject: [PATCH] untangle opus for inline compile --- libnyquist.xcodeproj/project.pbxproj | 96 ++-------------------------- src/OpusDependencies.c | 2 +- src/WavPackDependencies.c | 6 +- third_party/opus/celt/celt.h | 6 +- 4 files changed, 9 insertions(+), 101 deletions(-) diff --git a/libnyquist.xcodeproj/project.pbxproj b/libnyquist.xcodeproj/project.pbxproj index c370a56..beebe8c 100644 --- a/libnyquist.xcodeproj/project.pbxproj +++ b/libnyquist.xcodeproj/project.pbxproj @@ -8,29 +8,12 @@ /* Begin PBXBuildFile section */ 0804D13F1AE69F0100F4B1FD /* OpusDependencies.c in Sources */ = {isa = PBXBuildFile; fileRef = 0804D13E1AE69F0100F4B1FD /* OpusDependencies.c */; }; - 0804D1451AE6BA5100F4B1FD /* celt_decoder.c in Sources */ = {isa = PBXBuildFile; fileRef = 0804D1431AE6BA5100F4B1FD /* celt_decoder.c */; settings = {COMPILER_FLAGS = "-w"; }; }; - 0804D1461AE6BA5100F4B1FD /* celt_encoder.c in Sources */ = {isa = PBXBuildFile; fileRef = 0804D1441AE6BA5100F4B1FD /* celt_encoder.c */; settings = {COMPILER_FLAGS = "-w"; }; }; 080A58581B0866F600302850 /* RiffUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 080A58571B0866F600302850 /* RiffUtils.cpp */; }; 081FFB191ADF803800673073 /* FlacDependencies.c in Sources */ = {isa = PBXBuildFile; fileRef = 081FFB181ADF803800673073 /* FlacDependencies.c */; }; 083730B91BE52B9600216BDC /* MusepackDecoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 083730B81BE52B9600216BDC /* MusepackDecoder.cpp */; settings = {COMPILER_FLAGS = "-w"; }; }; 083730BC1BE5350C00216BDC /* MusepackDependencies.c in Sources */ = {isa = PBXBuildFile; fileRef = 083730BB1BE5350C00216BDC /* MusepackDependencies.c */; }; - 083730C21BE5372300216BDC /* mpc_bits_reader.c in Sources */ = {isa = PBXBuildFile; fileRef = 083730BE1BE5372300216BDC /* mpc_bits_reader.c */; settings = {COMPILER_FLAGS = "-w"; }; }; - 083730C31BE5372300216BDC /* mpc_decoder.c in Sources */ = {isa = PBXBuildFile; fileRef = 083730BF1BE5372300216BDC /* mpc_decoder.c */; settings = {COMPILER_FLAGS = "-w"; }; }; - 083730C41BE5372300216BDC /* mpc_demux.c in Sources */ = {isa = PBXBuildFile; fileRef = 083730C01BE5372300216BDC /* mpc_demux.c */; settings = {COMPILER_FLAGS = "-w"; }; }; - 083730C51BE5372300216BDC /* mpc_reader.c in Sources */ = {isa = PBXBuildFile; fileRef = 083730C11BE5372300216BDC /* mpc_reader.c */; settings = {COMPILER_FLAGS = "-w"; }; }; 083DB3F31B091C1100FB0661 /* WavEncoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 083DB3F21B091C1100FB0661 /* WavEncoder.cpp */; }; 086DADAD1AE029860031F793 /* VorbisDependencies.c in Sources */ = {isa = PBXBuildFile; fileRef = 086DADAB1ADF9DF30031F793 /* VorbisDependencies.c */; }; - 08894F291AEAA5D7007AAF90 /* bits.c in Sources */ = {isa = PBXBuildFile; fileRef = 08894F1E1AEAA5D7007AAF90 /* bits.c */; settings = {COMPILER_FLAGS = "-w"; }; }; - 08894F2A1AEAA5D7007AAF90 /* extra1.c in Sources */ = {isa = PBXBuildFile; fileRef = 08894F1F1AEAA5D7007AAF90 /* extra1.c */; settings = {COMPILER_FLAGS = "-w"; }; }; - 08894F2B1AEAA5D7007AAF90 /* extra2.c in Sources */ = {isa = PBXBuildFile; fileRef = 08894F201AEAA5D7007AAF90 /* extra2.c */; settings = {COMPILER_FLAGS = "-w"; }; }; - 08894F2C1AEAA5D7007AAF90 /* float.c in Sources */ = {isa = PBXBuildFile; fileRef = 08894F211AEAA5D7007AAF90 /* float.c */; settings = {COMPILER_FLAGS = "-w"; }; }; - 08894F2D1AEAA5D7007AAF90 /* metadata.c in Sources */ = {isa = PBXBuildFile; fileRef = 08894F221AEAA5D7007AAF90 /* metadata.c */; settings = {COMPILER_FLAGS = "-w"; }; }; - 08894F2E1AEAA5D7007AAF90 /* pack.c in Sources */ = {isa = PBXBuildFile; fileRef = 08894F231AEAA5D7007AAF90 /* pack.c */; settings = {COMPILER_FLAGS = "-w"; }; }; - 08894F2F1AEAA5D7007AAF90 /* tags.c in Sources */ = {isa = PBXBuildFile; fileRef = 08894F241AEAA5D7007AAF90 /* tags.c */; settings = {COMPILER_FLAGS = "-w"; }; }; - 08894F301AEAA5D7007AAF90 /* unpack.c in Sources */ = {isa = PBXBuildFile; fileRef = 08894F251AEAA5D7007AAF90 /* unpack.c */; settings = {COMPILER_FLAGS = "-w"; }; }; - 08894F311AEAA5D7007AAF90 /* unpack3.c in Sources */ = {isa = PBXBuildFile; fileRef = 08894F261AEAA5D7007AAF90 /* unpack3.c */; settings = {COMPILER_FLAGS = "-w"; }; }; - 08894F321AEAA5D7007AAF90 /* words.c in Sources */ = {isa = PBXBuildFile; fileRef = 08894F271AEAA5D7007AAF90 /* words.c */; settings = {COMPILER_FLAGS = "-w"; }; }; - 08894F331AEAA5D7007AAF90 /* wputils.c in Sources */ = {isa = PBXBuildFile; fileRef = 08894F281AEAA5D7007AAF90 /* wputils.c */; settings = {COMPILER_FLAGS = "-w"; }; }; 08B91D9A1AC73B8A00335131 /* CafDecoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08B91D901AC73B8A00335131 /* CafDecoder.cpp */; }; 08B91D9B1AC73B8A00335131 /* AudioDecoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08B91D911AC73B8A00335131 /* AudioDecoder.cpp */; }; 08B91D9C1AC73B8A00335131 /* AudioDevice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08B91D921AC73B8A00335131 /* AudioDevice.cpp */; }; @@ -40,6 +23,7 @@ 08B91DA11AC73B8A00335131 /* OpusDecoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08B91D971AC73B8A00335131 /* OpusDecoder.cpp */; }; 08B91DA21AC73B8A00335131 /* WavDecoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08B91D981AC73B8A00335131 /* WavDecoder.cpp */; }; 08B91DA31AC73B8A00335131 /* WavPackDecoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08B91D991AC73B8A00335131 /* WavPackDecoder.cpp */; }; + 08D0EC751C6DA41300FCDA23 /* WavPackDependencies.c in Sources */ = {isa = PBXBuildFile; fileRef = 08D0EC741C6DA41300FCDA23 /* WavPackDependencies.c */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -56,32 +40,15 @@ /* Begin PBXFileReference section */ 0804D13E1AE69F0100F4B1FD /* OpusDependencies.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = OpusDependencies.c; path = src/OpusDependencies.c; sourceTree = SOURCE_ROOT; }; - 0804D1431AE6BA5100F4B1FD /* celt_decoder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = celt_decoder.c; path = third_party/opus/celt/celt_decoder.c; sourceTree = SOURCE_ROOT; }; - 0804D1441AE6BA5100F4B1FD /* celt_encoder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = celt_encoder.c; path = third_party/opus/celt/celt_encoder.c; sourceTree = SOURCE_ROOT; }; 080A58561B0866AA00302850 /* RiffUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RiffUtils.h; path = include/libnyquist/RiffUtils.h; sourceTree = SOURCE_ROOT; }; 080A58571B0866F600302850 /* RiffUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RiffUtils.cpp; path = src/RiffUtils.cpp; sourceTree = SOURCE_ROOT; }; 081FFB181ADF803800673073 /* FlacDependencies.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = FlacDependencies.c; path = src/FlacDependencies.c; sourceTree = SOURCE_ROOT; }; 083730B81BE52B9600216BDC /* MusepackDecoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MusepackDecoder.cpp; path = src/MusepackDecoder.cpp; sourceTree = SOURCE_ROOT; }; 083730BA1BE52BA900216BDC /* MusepackDecoder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = MusepackDecoder.h; path = include/libnyquist/MusepackDecoder.h; sourceTree = SOURCE_ROOT; }; 083730BB1BE5350C00216BDC /* MusepackDependencies.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = MusepackDependencies.c; path = src/MusepackDependencies.c; sourceTree = SOURCE_ROOT; }; - 083730BE1BE5372300216BDC /* mpc_bits_reader.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mpc_bits_reader.c; path = third_party/musepack/libmpcdec/mpc_bits_reader.c; sourceTree = SOURCE_ROOT; }; - 083730BF1BE5372300216BDC /* mpc_decoder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mpc_decoder.c; path = third_party/musepack/libmpcdec/mpc_decoder.c; sourceTree = SOURCE_ROOT; }; - 083730C01BE5372300216BDC /* mpc_demux.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mpc_demux.c; path = third_party/musepack/libmpcdec/mpc_demux.c; sourceTree = SOURCE_ROOT; }; - 083730C11BE5372300216BDC /* mpc_reader.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mpc_reader.c; path = third_party/musepack/libmpcdec/mpc_reader.c; sourceTree = SOURCE_ROOT; }; 083DB3F21B091C1100FB0661 /* WavEncoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WavEncoder.cpp; path = src/WavEncoder.cpp; sourceTree = SOURCE_ROOT; }; 083DB3F41B091C1E00FB0661 /* WavEncoder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = WavEncoder.h; path = include/libnyquist/WavEncoder.h; sourceTree = SOURCE_ROOT; }; 086DADAB1ADF9DF30031F793 /* VorbisDependencies.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = VorbisDependencies.c; path = src/VorbisDependencies.c; sourceTree = SOURCE_ROOT; }; - 08894F1E1AEAA5D7007AAF90 /* bits.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = bits.c; path = third_party/wavpack/src/bits.c; sourceTree = SOURCE_ROOT; }; - 08894F1F1AEAA5D7007AAF90 /* extra1.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = extra1.c; path = third_party/wavpack/src/extra1.c; sourceTree = SOURCE_ROOT; }; - 08894F201AEAA5D7007AAF90 /* extra2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = extra2.c; path = third_party/wavpack/src/extra2.c; sourceTree = SOURCE_ROOT; }; - 08894F211AEAA5D7007AAF90 /* float.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = float.c; path = third_party/wavpack/src/float.c; sourceTree = SOURCE_ROOT; }; - 08894F221AEAA5D7007AAF90 /* metadata.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = metadata.c; path = third_party/wavpack/src/metadata.c; sourceTree = SOURCE_ROOT; }; - 08894F231AEAA5D7007AAF90 /* pack.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pack.c; path = third_party/wavpack/src/pack.c; sourceTree = SOURCE_ROOT; }; - 08894F241AEAA5D7007AAF90 /* tags.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = tags.c; path = third_party/wavpack/src/tags.c; sourceTree = SOURCE_ROOT; }; - 08894F251AEAA5D7007AAF90 /* unpack.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = unpack.c; path = third_party/wavpack/src/unpack.c; sourceTree = SOURCE_ROOT; }; - 08894F261AEAA5D7007AAF90 /* unpack3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = unpack3.c; path = third_party/wavpack/src/unpack3.c; sourceTree = SOURCE_ROOT; }; - 08894F271AEAA5D7007AAF90 /* words.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = words.c; path = third_party/wavpack/src/words.c; sourceTree = SOURCE_ROOT; }; - 08894F281AEAA5D7007AAF90 /* wputils.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = wputils.c; path = third_party/wavpack/src/wputils.c; sourceTree = SOURCE_ROOT; }; 08B91D261AC26FC100335131 /* libnyquist.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libnyquist.a; sourceTree = BUILT_PRODUCTS_DIR; }; 08B91D831AC73B8000335131 /* CafDecoder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = CafDecoder.h; path = include/libnyquist/CafDecoder.h; sourceTree = SOURCE_ROOT; }; 08B91D841AC73B8000335131 /* AudioDecoder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AudioDecoder.h; path = include/libnyquist/AudioDecoder.h; sourceTree = SOURCE_ROOT; }; @@ -105,6 +72,7 @@ 08B91D981AC73B8A00335131 /* WavDecoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WavDecoder.cpp; path = src/WavDecoder.cpp; sourceTree = SOURCE_ROOT; }; 08B91D991AC73B8A00335131 /* WavPackDecoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WavPackDecoder.cpp; path = src/WavPackDecoder.cpp; sourceTree = SOURCE_ROOT; }; 08C83B7C1C25D7780071EED6 /* IMA4Util.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = IMA4Util.h; path = include/libnyquist/IMA4Util.h; sourceTree = SOURCE_ROOT; }; + 08D0EC741C6DA41300FCDA23 /* WavPackDependencies.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = WavPackDependencies.c; path = src/WavPackDependencies.c; sourceTree = SOURCE_ROOT; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -118,18 +86,10 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 0804D1421AE6BA2F00F4B1FD /* celt */ = { - isa = PBXGroup; - children = ( - 0804D1431AE6BA5100F4B1FD /* celt_decoder.c */, - 0804D1441AE6BA5100F4B1FD /* celt_encoder.c */, - ); - name = celt; - sourceTree = ""; - }; 080A58551B083D5100302850 /* deps */ = { isa = PBXGroup; children = ( + 08D0EC741C6DA41300FCDA23 /* WavPackDependencies.c */, 081FFB181ADF803800673073 /* FlacDependencies.c */, 086DADAB1ADF9DF30031F793 /* VorbisDependencies.c */, 0804D13E1AE69F0100F4B1FD /* OpusDependencies.c */, @@ -149,35 +109,6 @@ name = util; sourceTree = ""; }; - 083730BD1BE5370400216BDC /* musepack */ = { - isa = PBXGroup; - children = ( - 083730BE1BE5372300216BDC /* mpc_bits_reader.c */, - 083730BF1BE5372300216BDC /* mpc_decoder.c */, - 083730C01BE5372300216BDC /* mpc_demux.c */, - 083730C11BE5372300216BDC /* mpc_reader.c */, - ); - name = musepack; - sourceTree = ""; - }; - 08894F1D1AEAA5B7007AAF90 /* wavpack */ = { - isa = PBXGroup; - children = ( - 08894F1E1AEAA5D7007AAF90 /* bits.c */, - 08894F1F1AEAA5D7007AAF90 /* extra1.c */, - 08894F201AEAA5D7007AAF90 /* extra2.c */, - 08894F211AEAA5D7007AAF90 /* float.c */, - 08894F221AEAA5D7007AAF90 /* metadata.c */, - 08894F231AEAA5D7007AAF90 /* pack.c */, - 08894F241AEAA5D7007AAF90 /* tags.c */, - 08894F251AEAA5D7007AAF90 /* unpack.c */, - 08894F261AEAA5D7007AAF90 /* unpack3.c */, - 08894F271AEAA5D7007AAF90 /* words.c */, - 08894F281AEAA5D7007AAF90 /* wputils.c */, - ); - name = wavpack; - sourceTree = ""; - }; 08B91D1D1AC26FC100335131 = { isa = PBXGroup; children = ( @@ -208,9 +139,6 @@ 08B91D511AC270BB00335131 /* third_party */ = { isa = PBXGroup; children = ( - 083730BD1BE5370400216BDC /* musepack */, - 08894F1D1AEAA5B7007AAF90 /* wavpack */, - 0804D1421AE6BA2F00F4B1FD /* celt */, ); name = third_party; path = libnyquist; @@ -319,24 +247,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 08894F2C1AEAA5D7007AAF90 /* float.c in Sources */, - 083730C51BE5372300216BDC /* mpc_reader.c in Sources */, - 08894F2E1AEAA5D7007AAF90 /* pack.c in Sources */, - 08894F2A1AEAA5D7007AAF90 /* extra1.c in Sources */, - 08894F321AEAA5D7007AAF90 /* words.c in Sources */, - 08894F291AEAA5D7007AAF90 /* bits.c in Sources */, - 08894F2B1AEAA5D7007AAF90 /* extra2.c in Sources */, - 08894F301AEAA5D7007AAF90 /* unpack.c in Sources */, 083730B91BE52B9600216BDC /* MusepackDecoder.cpp in Sources */, - 0804D1451AE6BA5100F4B1FD /* celt_decoder.c in Sources */, - 0804D1461AE6BA5100F4B1FD /* celt_encoder.c in Sources */, - 08894F331AEAA5D7007AAF90 /* wputils.c in Sources */, - 08894F2F1AEAA5D7007AAF90 /* tags.c in Sources */, - 08894F2D1AEAA5D7007AAF90 /* metadata.c in Sources */, - 08894F311AEAA5D7007AAF90 /* unpack3.c in Sources */, - 083730C21BE5372300216BDC /* mpc_bits_reader.c in Sources */, - 083730C41BE5372300216BDC /* mpc_demux.c in Sources */, - 083730C31BE5372300216BDC /* mpc_decoder.c in Sources */, 083730BC1BE5350C00216BDC /* MusepackDependencies.c in Sources */, 081FFB191ADF803800673073 /* FlacDependencies.c in Sources */, 0804D13F1AE69F0100F4B1FD /* OpusDependencies.c in Sources */, @@ -348,6 +259,7 @@ 080A58581B0866F600302850 /* RiffUtils.cpp in Sources */, 08B91DA11AC73B8A00335131 /* OpusDecoder.cpp in Sources */, 08B91D9E1AC73B8A00335131 /* FlacDecoder.cpp in Sources */, + 08D0EC751C6DA41300FCDA23 /* WavPackDependencies.c in Sources */, 08B91D9C1AC73B8A00335131 /* AudioDevice.cpp in Sources */, 086DADAD1AE029860031F793 /* VorbisDependencies.c in Sources */, 08B91DA31AC73B8A00335131 /* WavPackDecoder.cpp in Sources */, diff --git a/src/OpusDependencies.c b/src/OpusDependencies.c index 1550076..bf10d05 100644 --- a/src/OpusDependencies.c +++ b/src/OpusDependencies.c @@ -92,8 +92,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "opus/celt/rate.c" #include "opus/celt/vq.c" +//#define opus_custom_encoder_get_size opus_custom_encoder_get_size_alt #include "opus/celt/celt_decoder.c" -#define opus_custom_encoder_get_size opus_custom_encoder_get_size_alt #include "opus/celt/celt_encoder.c" ///////////////// diff --git a/src/WavPackDependencies.c b/src/WavPackDependencies.c index a5e46a0..1fec6d0 100644 --- a/src/WavPackDependencies.c +++ b/src/WavPackDependencies.c @@ -36,9 +36,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #endif #ifdef _WIN32 -#ifndef WIN32 -#define WIN32 -#endif + #ifndef WIN32 + #define WIN32 + #endif #endif #include "wavpack/src/bits.c" diff --git a/third_party/opus/celt/celt.h b/third_party/opus/celt/celt.h index 5deea1f..ffa2d7a 100644 --- a/third_party/opus/celt/celt.h +++ b/third_party/opus/celt/celt.h @@ -139,12 +139,8 @@ int celt_decode_with_ec(OpusCustomDecoder * OPUS_RESTRICT st, const unsigned cha #define celt_encoder_ctl opus_custom_encoder_ctl #define celt_decoder_ctl opus_custom_decoder_ctl - -#ifdef CUSTOM_MODES +// libnyquist changed #define OPUS_CUSTOM_NOSTATIC -#else -#define OPUS_CUSTOM_NOSTATIC static OPUS_INLINE -#endif static const unsigned char trim_icdf[11] = {126, 124, 119, 109, 87, 41, 19, 9, 4, 2, 0}; /* Probs: NONE: 21.875%, LIGHT: 6.25%, NORMAL: 65.625%, AGGRESSIVE: 6.25% */