diff options
Diffstat (limited to 'drivers/opus')
236 files changed, 995 insertions, 1000 deletions
diff --git a/drivers/opus/SCsub b/drivers/opus/SCsub index a2bebf62b..59c746209 100644 --- a/drivers/opus/SCsub +++ b/drivers/opus/SCsub @@ -124,7 +124,7 @@ opus_sources_lib = [ ] if("opus_fixed_point" in env and env.opus_fixed_point=="yes"): - env.Append(CPPPATH=["#drivers/opus/silk/fixed"], CFLAGS=["-DOPUS_FIXED_POINT"]) + env.Append(CFLAGS=["-DOPUS_FIXED_POINT"]) opus_sources_silk = [ "opus/silk/fixed/apply_sine_window_FIX.c", "opus/silk/fixed/k2a_FIX.c", @@ -153,7 +153,6 @@ if("opus_fixed_point" in env and env.opus_fixed_point=="yes"): "opus/silk/fixed/regularize_correlations_FIX.c" ] else: - env.Append(CPPPATH=["#drivers/opus/silk/float"]) opus_sources_silk = [ "opus/silk/float/apply_sine_window_FLP.c", "opus/silk/float/inner_product_FLP.c", @@ -193,8 +192,4 @@ opus_sources_lib+=opus_sources_silk env.drivers_sources+=opus_sources_lib env.drivers_sources+=opus_sources -env.Append(CPPPATH=["#drivers/opus"]) -env.Append(CPPPATH=["#drivers/opus/celt","#drivers/opus/silk","#drivers/opus/silk/float"]) -env.Append(CFLAGS=["-DOPUS_HAVE_CONFIG_H"]) - Export('env') diff --git a/drivers/opus/analysis.c b/drivers/opus/analysis.c index 47e8668b8..e27e94817 100644 --- a/drivers/opus/analysis.c +++ b/drivers/opus/analysis.c @@ -25,19 +25,19 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "kiss_fft.h" -#include "celt.h" -#include "opus_modes.h" -#include "arch.h" -#include "quant_bands.h" +#include "opus/celt/kiss_fft.h" +#include "opus/celt/celt.h" +#include "opus/celt/opus_modes.h" +#include "opus/celt/arch.h" +#include "opus/celt/quant_bands.h" #include <stdio.h> -#include "analysis.h" -#include "mlp.h" -#include "stack_alloc.h" +#include "opus/analysis.h" +#include "opus/mlp.h" +#include "opus/celt/stack_alloc.h" extern const MLP net; diff --git a/drivers/opus/analysis.h b/drivers/opus/analysis.h index be0388faa..548614d52 100644 --- a/drivers/opus/analysis.h +++ b/drivers/opus/analysis.h @@ -28,8 +28,8 @@ #ifndef ANALYSIS_H #define ANALYSIS_H -#include "celt.h" -#include "opus_private.h" +#include "opus/celt/celt.h" +#include "opus/opus_private.h" #define NB_FRAMES 8 #define NB_TBANDS 18 diff --git a/drivers/opus/celt/_kiss_fft_guts.h b/drivers/opus/celt/_kiss_fft_guts.h index 21bea8a9b..2a4ee744e 100644 --- a/drivers/opus/celt/_kiss_fft_guts.h +++ b/drivers/opus/celt/_kiss_fft_guts.h @@ -33,7 +33,7 @@ defines kiss_fft_scalar as either short or a float type and defines typedef struct { kiss_fft_scalar r; kiss_fft_scalar i; }kiss_fft_cpx; */ -#include "kiss_fft.h" +#include "opus/celt/kiss_fft.h" /* Explanation of macros dealing with complex math: @@ -45,7 +45,7 @@ C_ADDTO( res , a) : res += a * */ #ifdef OPUS_FIXED_POINT -#include "arch.h" +#include "opus/celt/arch.h" #define SAMP_MAX 2147483647 diff --git a/drivers/opus/celt/arch.h b/drivers/opus/celt/arch.h index 83e370500..d964f8d90 100644 --- a/drivers/opus/celt/arch.h +++ b/drivers/opus/celt/arch.h @@ -34,8 +34,8 @@ #ifndef ARCH_H #define ARCH_H -#include "opus_types.h" -#include "opus_defines.h" +#include "opus/opus_types.h" +#include "opus/opus_defines.h" # if !defined(__GNUC_PREREQ) # if defined(__GNUC__)&&defined(__GNUC_MINOR__) @@ -109,10 +109,10 @@ typedef opus_val32 celt_ener; #define SCALEOUT(a) (a) #ifdef FIXED_DEBUG -#include "fixed_debug.h" +#include "opus/celt/fixed_debug.h" #else -#include "fixed_generic.h" +#include "opus/celt/fixed_generic.h" #ifdef OPUS_ARM_INLINE_EDSP #include "arm/fixed_armv5e.h" diff --git a/drivers/opus/celt/arm/arm_celt_map.c b/drivers/opus/celt/arm/arm_celt_map.c index b18734515..31e7d5b31 100644 --- a/drivers/opus/celt/arm/arm_celt_map.c +++ b/drivers/opus/celt/arm/arm_celt_map.c @@ -25,11 +25,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "pitch.h" +#include "opus/celt/pitch.h" #if defined(OPUS_HAVE_RTCD) diff --git a/drivers/opus/celt/arm/armcpu.c b/drivers/opus/celt/arm/armcpu.c index 7f0af631b..fb7f2421f 100644 --- a/drivers/opus/celt/arm/armcpu.c +++ b/drivers/opus/celt/arm/armcpu.c @@ -27,16 +27,16 @@ /* Original code from libtheora modified to suit to Opus */ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif #ifdef OPUS_HAVE_RTCD -#include "armcpu.h" -#include "cpu_support.h" -#include "os_support.h" -#include "opus_types.h" +#include "opus/celt/arm/armcpu.h" +#include "opus/celt/cpu_support.h" +#include "opus/celt/os_support.h" +#include "opus/opus_types.h" #define OPUS_CPU_ARM_V4 (1) #define OPUS_CPU_ARM_EDSP (1<<1) diff --git a/drivers/opus/celt/arm/fixed_armv5e.h b/drivers/opus/celt/arm/fixed_armv5e.h index 1194a7d3e..cb6e4c1da 100644 --- a/drivers/opus/celt/arm/fixed_armv5e.h +++ b/drivers/opus/celt/arm/fixed_armv5e.h @@ -30,7 +30,7 @@ #ifndef FIXED_ARMv5E_H #define FIXED_ARMv5E_H -#include "fixed_armv4.h" +#include "opus/celt/arm/fixed_armv4.h" /** 16x32 multiplication, followed by a 16-bit shift right. Results fits in 32 bits */ #undef MULT16_32_Q16 diff --git a/drivers/opus/celt/arm/pitch_arm.h b/drivers/opus/celt/arm/pitch_arm.h index df5e82ef0..18d1f2e75 100644 --- a/drivers/opus/celt/arm/pitch_arm.h +++ b/drivers/opus/celt/arm/pitch_arm.h @@ -28,7 +28,7 @@ #if !defined(PITCH_ARM_H) # define PITCH_ARM_H -# include "armcpu.h" +# include "opus/celt/arm/armcpu.h" # if defined(OPUS_FIXED_POINT) diff --git a/drivers/opus/celt/bands.c b/drivers/opus/celt/bands.c index 87280c833..5a6b23d87 100644 --- a/drivers/opus/celt/bands.c +++ b/drivers/opus/celt/bands.c @@ -27,21 +27,21 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif #include <math.h> -#include "bands.h" -#include "opus_modes.h" -#include "vq.h" -#include "cwrs.h" -#include "stack_alloc.h" -#include "os_support.h" -#include "mathops.h" -#include "rate.h" -#include "quant_bands.h" -#include "pitch.h" +#include "opus/celt/bands.h" +#include "opus/celt/opus_modes.h" +#include "opus/celt/vq.h" +#include "opus/celt/cwrs.h" +#include "opus/celt/stack_alloc.h" +#include "opus/celt/os_support.h" +#include "opus/celt/mathops.h" +#include "opus/celt/rate.h" +#include "opus/celt/quant_bands.h" +#include "opus/celt/pitch.h" int hysteresis_decision(opus_val16 val, const opus_val16 *thresholds, const opus_val16 *hysteresis, int N, int prev) { diff --git a/drivers/opus/celt/bands.h b/drivers/opus/celt/bands.h index fe1e47097..1ef7cbc8e 100644 --- a/drivers/opus/celt/bands.h +++ b/drivers/opus/celt/bands.h @@ -30,11 +30,11 @@ #ifndef BANDS_H #define BANDS_H -#include "arch.h" -#include "opus_modes.h" -#include "entenc.h" -#include "entdec.h" -#include "rate.h" +#include "opus/celt/arch.h" +#include "opus/celt/opus_modes.h" +#include "opus/celt/entenc.h" +#include "opus/celt/entdec.h" +#include "opus/celt/rate.h" /** Compute the amplitude (sqrt energy) in each of the bands * @param m Mode data diff --git a/drivers/opus/celt/celt.c b/drivers/opus/celt/celt.c index b894e1e13..d99a91ba2 100644 --- a/drivers/opus/celt/celt.c +++ b/drivers/opus/celt/celt.c @@ -27,28 +27,28 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif #define CELT_C -#include "os_support.h" -#include "mdct.h" +#include "opus/celt/os_support.h" +#include "opus/celt/mdct.h" #include <math.h> -#include "celt.h" -#include "pitch.h" -#include "bands.h" -#include "opus_modes.h" -#include "entcode.h" -#include "quant_bands.h" -#include "rate.h" -#include "stack_alloc.h" -#include "mathops.h" -#include "float_cast.h" +#include "opus/celt/celt.h" +#include "opus/celt/pitch.h" +#include "opus/celt/bands.h" +#include "opus/celt/opus_modes.h" +#include "opus/celt/entcode.h" +#include "opus/celt/quant_bands.h" +#include "opus/celt/rate.h" +#include "opus/celt/stack_alloc.h" +#include "opus/celt/mathops.h" +#include "opus/celt/float_cast.h" #include <stdarg.h> -#include "celt_lpc.h" -#include "vq.h" +#include "opus/celt/celt_lpc.h" +#include "opus/celt/vq.h" #ifndef PACKAGE_VERSION #define PACKAGE_VERSION "unknown" diff --git a/drivers/opus/celt/celt.h b/drivers/opus/celt/celt.h index 5deea1f0a..2b7dc3fa7 100644 --- a/drivers/opus/celt/celt.h +++ b/drivers/opus/celt/celt.h @@ -35,12 +35,12 @@ #ifndef CELT_H #define CELT_H -#include "opus_types.h" -#include "opus_defines.h" -#include "opus_custom.h" -#include "entenc.h" -#include "entdec.h" -#include "arch.h" +#include "opus/opus_types.h" +#include "opus/opus_defines.h" +#include "opus/opus_custom.h" +#include "opus/celt/entenc.h" +#include "opus/celt/entdec.h" +#include "opus/celt/arch.h" #ifdef __cplusplus extern "C" { diff --git a/drivers/opus/celt/celt_decoder.c b/drivers/opus/celt/celt_decoder.c index 93791feab..67c378943 100644 --- a/drivers/opus/celt/celt_decoder.c +++ b/drivers/opus/celt/celt_decoder.c @@ -27,29 +27,29 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif #define CELT_DECODER_C -#include "cpu_support.h" -#include "os_support.h" -#include "mdct.h" +#include "opus/celt/cpu_support.h" +#include "opus/celt/os_support.h" +#include "opus/celt/mdct.h" #include <math.h> -#include "celt.h" -#include "pitch.h" -#include "bands.h" -#include "opus_modes.h" -#include "entcode.h" -#include "quant_bands.h" -#include "rate.h" -#include "stack_alloc.h" -#include "mathops.h" -#include "float_cast.h" +#include "opus/celt/celt.h" +#include "opus/celt/pitch.h" +#include "opus/celt/bands.h" +#include "opus/celt/opus_modes.h" +#include "opus/celt/entcode.h" +#include "opus/celt/quant_bands.h" +#include "opus/celt/rate.h" +#include "opus/celt/stack_alloc.h" +#include "opus/celt/mathops.h" +#include "opus/celt/float_cast.h" #include <stdarg.h> -#include "celt_lpc.h" -#include "vq.h" +#include "opus/celt/celt_lpc.h" +#include "opus/celt/vq.h" /**********************************************************************/ /* */ diff --git a/drivers/opus/celt/celt_encoder.c b/drivers/opus/celt/celt_encoder.c index a61e41f42..810ee5d74 100644 --- a/drivers/opus/celt/celt_encoder.c +++ b/drivers/opus/celt/celt_encoder.c @@ -27,29 +27,29 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif #define CELT_ENCODER_C -#include "cpu_support.h" -#include "os_support.h" -#include "mdct.h" +#include "opus/celt/cpu_support.h" +#include "opus/celt/os_support.h" +#include "opus/celt/mdct.h" #include <math.h> -#include "celt.h" -#include "pitch.h" -#include "bands.h" -#include "opus_modes.h" -#include "entcode.h" -#include "quant_bands.h" -#include "rate.h" -#include "stack_alloc.h" -#include "mathops.h" -#include "float_cast.h" +#include "opus/celt/celt.h" +#include "opus/celt/pitch.h" +#include "opus/celt/bands.h" +#include "opus/celt/opus_modes.h" +#include "opus/celt/entcode.h" +#include "opus/celt/quant_bands.h" +#include "opus/celt/rate.h" +#include "opus/celt/stack_alloc.h" +#include "opus/celt/mathops.h" +#include "opus/celt/float_cast.h" #include <stdarg.h> -#include "celt_lpc.h" -#include "vq.h" +#include "opus/celt/celt_lpc.h" +#include "opus/celt/vq.h" /** Encoder state diff --git a/drivers/opus/celt/celt_lpc.c b/drivers/opus/celt/celt_lpc.c index 1fa4406bc..ad0a6dfd4 100644 --- a/drivers/opus/celt/celt_lpc.c +++ b/drivers/opus/celt/celt_lpc.c @@ -25,14 +25,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "celt_lpc.h" -#include "stack_alloc.h" -#include "mathops.h" -#include "pitch.h" +#include "opus/celt/celt_lpc.h" +#include "opus/celt/stack_alloc.h" +#include "opus/celt/mathops.h" +#include "opus/celt/pitch.h" void _celt_lpc( opus_val16 *_lpc, /* out: [0...p-1] LPC coefficients */ diff --git a/drivers/opus/celt/celt_lpc.h b/drivers/opus/celt/celt_lpc.h index dc2a0a3d2..12bb78a6f 100644 --- a/drivers/opus/celt/celt_lpc.h +++ b/drivers/opus/celt/celt_lpc.h @@ -28,7 +28,7 @@ #ifndef PLC_H #define PLC_H -#include "arch.h" +#include "opus/celt/arch.h" #define LPC_ORDER 24 diff --git a/drivers/opus/celt/cpu_support.h b/drivers/opus/celt/cpu_support.h index d68dbe62c..f682a1d19 100644 --- a/drivers/opus/celt/cpu_support.h +++ b/drivers/opus/celt/cpu_support.h @@ -28,8 +28,8 @@ #ifndef CPU_SUPPORT_H #define CPU_SUPPORT_H -#include "opus_types.h" -#include "opus_defines.h" +#include "opus/opus_types.h" +#include "opus/opus_defines.h" #if defined(OPUS_HAVE_RTCD) && defined(OPUS_ARM_ASM) #include "arm/armcpu.h" diff --git a/drivers/opus/celt/cwrs.c b/drivers/opus/celt/cwrs.c index b866aa921..bae9d21b9 100644 --- a/drivers/opus/celt/cwrs.c +++ b/drivers/opus/celt/cwrs.c @@ -27,14 +27,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "os_support.h" -#include "cwrs.h" -#include "mathops.h" -#include "arch.h" +#include "opus/celt/os_support.h" +#include "opus/celt/cwrs.h" +#include "opus/celt/mathops.h" +#include "opus/celt/arch.h" #ifdef CUSTOM_MODES diff --git a/drivers/opus/celt/cwrs.h b/drivers/opus/celt/cwrs.h index 7dfbd076d..5400afa6a 100644 --- a/drivers/opus/celt/cwrs.h +++ b/drivers/opus/celt/cwrs.h @@ -30,10 +30,10 @@ #ifndef CWRS_H #define CWRS_H -#include "arch.h" -#include "stack_alloc.h" -#include "entenc.h" -#include "entdec.h" +#include "opus/celt/arch.h" +#include "opus/celt/stack_alloc.h" +#include "opus/celt/entenc.h" +#include "opus/celt/entdec.h" #ifdef CUSTOM_MODES int log2_frac(opus_uint32 val, int frac); diff --git a/drivers/opus/celt/ecintrin.h b/drivers/opus/celt/ecintrin.h index 2263cff6b..6ed8fb280 100644 --- a/drivers/opus/celt/ecintrin.h +++ b/drivers/opus/celt/ecintrin.h @@ -26,10 +26,10 @@ */ /*Some common macros for potential platform-specific optimization.*/ -#include "opus_types.h" +#include "opus/opus_types.h" #include <math.h> #include <limits.h> -#include "arch.h" +#include "opus/celt/arch.h" #if !defined(_ecintrin_H) # define _ecintrin_H (1) diff --git a/drivers/opus/celt/entcode.c b/drivers/opus/celt/entcode.c index fd817a9db..5c9874908 100644 --- a/drivers/opus/celt/entcode.c +++ b/drivers/opus/celt/entcode.c @@ -25,12 +25,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "entcode.h" -#include "arch.h" +#include "opus/celt/entcode.h" +#include "opus/celt/arch.h" #if !defined(EC_CLZ) /*This is a fallback for systems where we don't know how to access diff --git a/drivers/opus/celt/entcode.h b/drivers/opus/celt/entcode.h index dd13e49e5..c129f9b7d 100644 --- a/drivers/opus/celt/entcode.h +++ b/drivers/opus/celt/entcode.h @@ -25,14 +25,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "opus_types.h" -#include "opus_defines.h" +#include "opus/opus_types.h" +#include "opus/opus_defines.h" #if !defined(_entcode_H) # define _entcode_H (1) # include <limits.h> # include <stddef.h> -# include "ecintrin.h" +# include "opus/celt/ecintrin.h" /*OPT: ec_window must be at least 32 bits, but if you have fast arithmetic on a larger type, you can speed up the decoder by using it here.*/ diff --git a/drivers/opus/celt/entdec.c b/drivers/opus/celt/entdec.c index 383da571c..0ec4d460d 100644 --- a/drivers/opus/celt/entdec.c +++ b/drivers/opus/celt/entdec.c @@ -25,15 +25,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif #include <stddef.h> -#include "os_support.h" -#include "arch.h" -#include "entdec.h" -#include "mfrngcod.h" +#include "opus/celt/os_support.h" +#include "opus/celt/arch.h" +#include "opus/celt/entdec.h" +#include "opus/celt/mfrngcod.h" /*A range decoder. This is an entropy decoder based upon \cite{Mar79}, which is itself a diff --git a/drivers/opus/celt/entdec.h b/drivers/opus/celt/entdec.h index d8ab31873..fda60ab32 100644 --- a/drivers/opus/celt/entdec.h +++ b/drivers/opus/celt/entdec.h @@ -28,7 +28,7 @@ #if !defined(_entdec_H) # define _entdec_H (1) # include <limits.h> -# include "entcode.h" +# include "opus/celt/entcode.h" /*Initializes the decoder. _buf: The input buffer to use. diff --git a/drivers/opus/celt/entenc.c b/drivers/opus/celt/entenc.c index 299329c63..085b2b281 100644 --- a/drivers/opus/celt/entenc.c +++ b/drivers/opus/celt/entenc.c @@ -25,13 +25,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if defined(OPUS_HAVE_CONFIG_H) -# include "opus_config.h" +#if defined(OPUS_ENABLED) +# include "opus/opus_config.h" #endif -#include "os_support.h" -#include "arch.h" -#include "entenc.h" -#include "mfrngcod.h" +#include "opus/celt/os_support.h" +#include "opus/celt/arch.h" +#include "opus/celt/entenc.h" +#include "opus/celt/mfrngcod.h" /*A range encoder. See entdec.c and the references for implementation details \cite{Mar79,MNW98}. diff --git a/drivers/opus/celt/entenc.h b/drivers/opus/celt/entenc.h index 796bc4d57..3f4a3acc9 100644 --- a/drivers/opus/celt/entenc.h +++ b/drivers/opus/celt/entenc.h @@ -28,7 +28,7 @@ #if !defined(_entenc_H) # define _entenc_H (1) # include <stddef.h> -# include "entcode.h" +# include "opus/celt/entcode.h" /*Initializes the encoder. _buf: The buffer to store output bytes in. diff --git a/drivers/opus/celt/fixed_debug.h b/drivers/opus/celt/fixed_debug.h index 80bc94910..0ed16baa1 100644 --- a/drivers/opus/celt/fixed_debug.h +++ b/drivers/opus/celt/fixed_debug.h @@ -33,7 +33,7 @@ #define FIXED_DEBUG_H #include <stdio.h> -#include "opus_defines.h" +#include "opus/opus_defines.h" #ifdef CELT_C OPUS_EXPORT opus_int64 celt_mips=0; diff --git a/drivers/opus/celt/float_cast.h b/drivers/opus/celt/float_cast.h index ede657486..86e80a93f 100644 --- a/drivers/opus/celt/float_cast.h +++ b/drivers/opus/celt/float_cast.h @@ -30,7 +30,7 @@ #define FLOAT_CAST_H -#include "arch.h" +#include "opus/celt/arch.h" /*============================================================================ ** On Intel Pentium processors (especially PIII and probably P4), converting diff --git a/drivers/opus/celt/kiss_fft.c b/drivers/opus/celt/kiss_fft.c index 333be975d..89a1790b2 100644 --- a/drivers/opus/celt/kiss_fft.c +++ b/drivers/opus/celt/kiss_fft.c @@ -30,16 +30,16 @@ heavily modified to better suit Opus */ #ifndef SKIP_CONFIG_H -# ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +# ifdef OPUS_ENABLED +#include "opus/opus_config.h" # endif #endif -#include "_kiss_fft_guts.h" -#include "arch.h" -#include "os_support.h" -#include "mathops.h" -#include "stack_alloc.h" +#include "opus/celt/_kiss_fft_guts.h" +#include "opus/celt/arch.h" +#include "opus/celt/os_support.h" +#include "opus/celt/mathops.h" +#include "opus/celt/stack_alloc.h" /* The guts header contains all the multiplication and addition macros that are defined for complex numbers. It also delares the kf_ internal functions. diff --git a/drivers/opus/celt/kiss_fft.h b/drivers/opus/celt/kiss_fft.h index aa22b3a41..db2532c69 100644 --- a/drivers/opus/celt/kiss_fft.h +++ b/drivers/opus/celt/kiss_fft.h @@ -31,7 +31,7 @@ #include <stdlib.h> #include <math.h> -#include "arch.h" +#include "opus/celt/arch.h" #ifdef __cplusplus extern "C" { @@ -46,7 +46,7 @@ extern "C" { #endif #ifdef OPUS_FIXED_POINT -#include "arch.h" +#include "opus/celt/arch.h" # define kiss_fft_scalar opus_int32 # define kiss_twiddle_scalar opus_int16 diff --git a/drivers/opus/celt/laplace.c b/drivers/opus/celt/laplace.c index c6d293f29..9dc4d94d2 100644 --- a/drivers/opus/celt/laplace.c +++ b/drivers/opus/celt/laplace.c @@ -26,12 +26,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "laplace.h" -#include "mathops.h" +#include "opus/celt/laplace.h" +#include "opus/celt/mathops.h" /* The minimum probability of an energy delta (out of 32768). */ #define LAPLACE_LOG_MINP (0) diff --git a/drivers/opus/celt/laplace.h b/drivers/opus/celt/laplace.h index 46c14b5da..9efcc73aa 100644 --- a/drivers/opus/celt/laplace.h +++ b/drivers/opus/celt/laplace.h @@ -26,8 +26,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "entenc.h" -#include "entdec.h" +#include "opus/celt/entenc.h" +#include "opus/celt/entdec.h" /** Encode a value that is assumed to be the realisation of a Laplace-distributed random process diff --git a/drivers/opus/celt/mathops.c b/drivers/opus/celt/mathops.c index 49be746d8..88e5aea12 100644 --- a/drivers/opus/celt/mathops.c +++ b/drivers/opus/celt/mathops.c @@ -31,11 +31,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "mathops.h" +#include "opus/celt/mathops.h" /*Compute floor(sqrt(_val)) with exact arithmetic. This has been tested on all possible 32-bit inputs.*/ diff --git a/drivers/opus/celt/mathops.h b/drivers/opus/celt/mathops.h index 4a6bc539b..759f58d1b 100644 --- a/drivers/opus/celt/mathops.h +++ b/drivers/opus/celt/mathops.h @@ -34,9 +34,9 @@ #ifndef MATHOPS_H #define MATHOPS_H -#include "arch.h" -#include "entcode.h" -#include "os_support.h" +#include "opus/celt/arch.h" +#include "opus/celt/entcode.h" +#include "opus/celt/os_support.h" /* Multiplies two 16-bit fractional values. Bit-exactness of this macro is important */ #define FRAC_MUL16(a,b) ((16384+((opus_int32)(opus_int16)(a)*(opus_int16)(b)))>>15) @@ -141,7 +141,7 @@ static OPUS_INLINE float celt_exp2(float x) #ifdef OPUS_FIXED_POINT -#include "os_support.h" +#include "opus/celt/os_support.h" #ifndef OVERRIDE_CELT_ILOG2 /** Integer log in base2. Undefined for zero and negative numbers */ diff --git a/drivers/opus/celt/mdct.c b/drivers/opus/celt/mdct.c index d08d026fa..ae34538d6 100644 --- a/drivers/opus/celt/mdct.c +++ b/drivers/opus/celt/mdct.c @@ -40,18 +40,18 @@ */ #ifndef SKIP_CONFIG_H -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif #endif -#include "mdct.h" -#include "kiss_fft.h" -#include "_kiss_fft_guts.h" +#include "opus/celt/mdct.h" +#include "opus/celt/kiss_fft.h" +#include "opus/celt/_kiss_fft_guts.h" #include <math.h> -#include "os_support.h" -#include "mathops.h" -#include "stack_alloc.h" +#include "opus/celt/os_support.h" +#include "opus/celt/mathops.h" +#include "opus/celt/stack_alloc.h" #ifdef CUSTOM_MODES diff --git a/drivers/opus/celt/mdct.h b/drivers/opus/celt/mdct.h index 4e7a19924..492afeae1 100644 --- a/drivers/opus/celt/mdct.h +++ b/drivers/opus/celt/mdct.h @@ -42,9 +42,9 @@ #ifndef MDCT_H #define MDCT_H -#include "opus_defines.h" -#include "kiss_fft.h" -#include "arch.h" +#include "opus/opus_defines.h" +#include "opus/celt/kiss_fft.h" +#include "opus/celt/arch.h" typedef struct { int n; diff --git a/drivers/opus/celt/mfrngcod.h b/drivers/opus/celt/mfrngcod.h index 809152a59..c24d98cde 100644 --- a/drivers/opus/celt/mfrngcod.h +++ b/drivers/opus/celt/mfrngcod.h @@ -27,7 +27,7 @@ #if !defined(_mfrngcode_H) # define _mfrngcode_H (1) -# include "entcode.h" +# include "opus/celt/entcode.h" /*Constants used by the entropy encoder/decoder.*/ diff --git a/drivers/opus/celt/modes.c b/drivers/opus/celt/modes.c index 3794074aa..aef268144 100644 --- a/drivers/opus/celt/modes.c +++ b/drivers/opus/celt/modes.c @@ -27,16 +27,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "celt.h" -#include "opus_modes.h" -#include "rate.h" -#include "os_support.h" -#include "stack_alloc.h" -#include "quant_bands.h" +#include "opus/celt/celt.h" +#include "opus/celt/opus_modes.h" +#include "opus/celt/rate.h" +#include "opus/celt/os_support.h" +#include "opus/celt/stack_alloc.h" +#include "opus/celt/quant_bands.h" static const opus_int16 eband5ms[] = { /*0 200 400 600 800 1k 1.2 1.4 1.6 2k 2.4 2.8 3.2 4k 4.8 5.6 6.8 8k 9.6 12k 15.6 */ @@ -63,9 +63,9 @@ static const unsigned char band_allocation[] = { #ifndef CUSTOM_MODES_ONLY #ifdef OPUS_FIXED_POINT - #include "static_modes_fixed.h" + #include "opus/celt/static_modes_fixed.h" #else - #include "static_modes_float.h" + #include "opus/celt/static_modes_float.h" #endif #endif /* CUSTOM_MODES_ONLY */ diff --git a/drivers/opus/celt/opus_custom_demo.c b/drivers/opus/celt/opus_custom_demo.c index 8c7f58b6e..b3129de77 100644 --- a/drivers/opus/celt/opus_custom_demo.c +++ b/drivers/opus/celt/opus_custom_demo.c @@ -26,12 +26,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "opus_custom.h" -#include "arch.h" +#include "opus/opus_custom.h" +#include "opus/celt/arch.h" #include <stdio.h> #include <stdlib.h> #include <math.h> diff --git a/drivers/opus/celt/opus_modes.h b/drivers/opus/celt/opus_modes.h index a1df46265..38e584453 100644 --- a/drivers/opus/celt/opus_modes.h +++ b/drivers/opus/celt/opus_modes.h @@ -30,12 +30,12 @@ #ifndef OPUS_MODES_H #define OPUS_MODES_H -#include "opus_types.h" -#include "celt.h" -#include "arch.h" -#include "mdct.h" -#include "entenc.h" -#include "entdec.h" +#include "opus/opus_types.h" +#include "opus/celt/celt.h" +#include "opus/celt/arch.h" +#include "opus/celt/mdct.h" +#include "opus/celt/entenc.h" +#include "opus/celt/entdec.h" #define MAX_PERIOD 1024 diff --git a/drivers/opus/celt/os_support.h b/drivers/opus/celt/os_support.h index 5e47e3cff..e1cf88446 100644 --- a/drivers/opus/celt/os_support.h +++ b/drivers/opus/celt/os_support.h @@ -35,8 +35,8 @@ # include "custom_support.h" #endif -#include "opus_types.h" -#include "opus_defines.h" +#include "opus/opus_types.h" +#include "opus/opus_defines.h" #include <string.h> #include <stdio.h> diff --git a/drivers/opus/celt/pitch.c b/drivers/opus/celt/pitch.c index 48cd02fb2..c7c2b98c0 100644 --- a/drivers/opus/celt/pitch.c +++ b/drivers/opus/celt/pitch.c @@ -31,16 +31,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "pitch.h" -#include "os_support.h" -#include "opus_modes.h" -#include "stack_alloc.h" -#include "mathops.h" -#include "celt_lpc.h" +#include "opus/celt/pitch.h" +#include "opus/celt/os_support.h" +#include "opus/celt/opus_modes.h" +#include "opus/celt/stack_alloc.h" +#include "opus/celt/mathops.h" +#include "opus/celt/celt_lpc.h" static void find_best_pitch(opus_val32 *xcorr, opus_val16 *y, int len, int max_pitch, int *best_pitch diff --git a/drivers/opus/celt/pitch.h b/drivers/opus/celt/pitch.h index 3a7d30542..f599f5fc7 100644 --- a/drivers/opus/celt/pitch.h +++ b/drivers/opus/celt/pitch.h @@ -34,8 +34,8 @@ #ifndef PITCH_H #define PITCH_H -#include "opus_modes.h" -#include "cpu_support.h" +#include "opus/celt/opus_modes.h" +#include "opus/celt/cpu_support.h" #if defined(__SSE__) && !defined(OPUS_FIXED_POINT) #include "x86/pitch_sse.h" diff --git a/drivers/opus/celt/quant_bands.c b/drivers/opus/celt/quant_bands.c index 0a170e850..e64ed28f2 100644 --- a/drivers/opus/celt/quant_bands.c +++ b/drivers/opus/celt/quant_bands.c @@ -26,18 +26,18 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "quant_bands.h" -#include "laplace.h" +#include "opus/celt/quant_bands.h" +#include "opus/celt/laplace.h" #include <math.h> -#include "os_support.h" -#include "arch.h" -#include "mathops.h" -#include "stack_alloc.h" -#include "rate.h" +#include "opus/celt/os_support.h" +#include "opus/celt/arch.h" +#include "opus/celt/mathops.h" +#include "opus/celt/stack_alloc.h" +#include "opus/celt/rate.h" #ifdef OPUS_FIXED_POINT /* Mean energy in each band quantized in Q4 */ diff --git a/drivers/opus/celt/quant_bands.h b/drivers/opus/celt/quant_bands.h index 840df8723..85d011e6e 100644 --- a/drivers/opus/celt/quant_bands.h +++ b/drivers/opus/celt/quant_bands.h @@ -29,11 +29,11 @@ #ifndef QUANT_BANDS #define QUANT_BANDS -#include "arch.h" -#include "opus_modes.h" -#include "entenc.h" -#include "entdec.h" -#include "mathops.h" +#include "opus/celt/arch.h" +#include "opus/celt/opus_modes.h" +#include "opus/celt/entenc.h" +#include "opus/celt/entdec.h" +#include "opus/celt/mathops.h" #ifdef OPUS_FIXED_POINT extern const signed char eMeans[25]; diff --git a/drivers/opus/celt/rate.c b/drivers/opus/celt/rate.c index cca585ad9..ecc0ab2a4 100644 --- a/drivers/opus/celt/rate.c +++ b/drivers/opus/celt/rate.c @@ -26,18 +26,18 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif #include <math.h> -#include "opus_modes.h" -#include "cwrs.h" -#include "arch.h" -#include "os_support.h" +#include "opus/celt/opus_modes.h" +#include "opus/celt/cwrs.h" +#include "opus/celt/arch.h" +#include "opus/celt/os_support.h" -#include "entcode.h" -#include "rate.h" +#include "opus/celt/entcode.h" +#include "opus/celt/rate.h" static const unsigned char LOG2_FRAC_TABLE[24]={ 0, diff --git a/drivers/opus/celt/rate.h b/drivers/opus/celt/rate.h index 7ced23ea0..e12dd29db 100644 --- a/drivers/opus/celt/rate.h +++ b/drivers/opus/celt/rate.h @@ -40,8 +40,8 @@ #define QTHETA_OFFSET 4 #define QTHETA_OFFSET_TWOPHASE 16 -#include "cwrs.h" -#include "opus_modes.h" +#include "opus/celt/cwrs.h" +#include "opus/celt/opus_modes.h" void compute_pulse_cache(CELTMode *m, int LM); diff --git a/drivers/opus/celt/stack_alloc.h b/drivers/opus/celt/stack_alloc.h index d500c4dab..464a6d0b7 100644 --- a/drivers/opus/celt/stack_alloc.h +++ b/drivers/opus/celt/stack_alloc.h @@ -32,8 +32,8 @@ #ifndef STACK_ALLOC_H #define STACK_ALLOC_H -#include "opus_types.h" -#include "opus_defines.h" +#include "opus/opus_types.h" +#include "opus/opus_defines.h" #if (!defined (VAR_ARRAYS) && !defined (USE_ALLOCA) && !defined (NONTHREADSAFE_PSEUDOSTACK)) #define VAR_ARRAYS @@ -149,7 +149,7 @@ extern char *global_stack_top; #endif /* ENABLE_VALGRIND */ -#include "os_support.h" +#include "opus/celt/os_support.h" #define VARDECL(type, var) type *var #define ALLOC(var, size, type) var = PUSH(global_stack, size, type) #define SAVE_STACK char *_saved_stack = global_stack; diff --git a/drivers/opus/celt/static_modes_fixed.h b/drivers/opus/celt/static_modes_fixed.h index d23e2a66f..1d92fc4b2 100644 --- a/drivers/opus/celt/static_modes_fixed.h +++ b/drivers/opus/celt/static_modes_fixed.h @@ -1,8 +1,8 @@ /* The contents of this file was automatically generated by dump_modes.c with arguments: 48000 960 It contains static definitions for some pre-defined modes. */ -#include "opus_modes.h" -#include "rate.h" +#include "opus/celt/opus_modes.h" +#include "opus/celt/rate.h" #ifndef DEF_WINDOW120 #define DEF_WINDOW120 diff --git a/drivers/opus/celt/static_modes_float.h b/drivers/opus/celt/static_modes_float.h index fe6bb4c8a..362be6cca 100644 --- a/drivers/opus/celt/static_modes_float.h +++ b/drivers/opus/celt/static_modes_float.h @@ -1,8 +1,8 @@ /* The contents of this file was automatically generated by dump_modes.c with arguments: 48000 960 It contains static definitions for some pre-defined modes. */ -#include "opus_modes.h" -#include "rate.h" +#include "opus/celt/opus_modes.h" +#include "opus/celt/rate.h" #ifndef DEF_WINDOW120 #define DEF_WINDOW120 diff --git a/drivers/opus/celt/tests/test_unit_cwrs32.c b/drivers/opus/celt/tests/test_unit_cwrs32.c index 9cf124336..db43e3392 100644 --- a/drivers/opus/celt/tests/test_unit_cwrs32.c +++ b/drivers/opus/celt/tests/test_unit_cwrs32.c @@ -26,8 +26,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif #include <stdio.h> @@ -40,13 +40,13 @@ #endif #define CELT_C -#include "stack_alloc.h" -#include "entenc.c" -#include "entdec.c" -#include "entcode.c" -#include "cwrs.c" -#include "mathops.c" -#include "rate.h" +#include "opus/celt/stack_alloc.h" +#include "opus/celt/entenc.c" +#include "opus/celt/entdec.c" +#include "opus/celt/entcode.c" +#include "opus/celt/cwrs.c" +#include "opus/celt/mathops.c" +#include "opus/celt/rate.h" #define NMAX (240) #define KMAX (128) diff --git a/drivers/opus/celt/tests/test_unit_dft.c b/drivers/opus/celt/tests/test_unit_dft.c index 4a00013b2..9c0db3e9a 100644 --- a/drivers/opus/celt/tests/test_unit_dft.c +++ b/drivers/opus/celt/tests/test_unit_dft.c @@ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif #define SKIP_CONFIG_H @@ -38,11 +38,11 @@ #include <stdio.h> #define CELT_C -#include "stack_alloc.h" -#include "kiss_fft.h" -#include "kiss_fft.c" -#include "mathops.c" -#include "entcode.c" +#include "opus/celt/stack_alloc.h" +#include "opus/celt/kiss_fft.h" +#include "opus/celt/kiss_fft.c" +#include "opus/celt/mathops.c" +#include "opus/celt/entcode.c" #ifndef M_PI diff --git a/drivers/opus/celt/tests/test_unit_entropy.c b/drivers/opus/celt/tests/test_unit_entropy.c index 62268b156..8c2defa8b 100644 --- a/drivers/opus/celt/tests/test_unit_entropy.c +++ b/drivers/opus/celt/tests/test_unit_entropy.c @@ -26,22 +26,22 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif #include <stdlib.h> #include <stdio.h> #include <math.h> #include <time.h> -#include "entcode.h" -#include "entenc.h" -#include "entdec.h" +#include "opus/celt/entcode.h" +#include "opus/celt/entenc.h" +#include "opus/celt/entdec.h" #include <string.h> -#include "entenc.c" -#include "entdec.c" -#include "entcode.c" +#include "opus/celt/entenc.c" +#include "opus/celt/entdec.c" +#include "opus/celt/entcode.c" #ifndef M_LOG2E # define M_LOG2E 1.4426950408889634074 diff --git a/drivers/opus/celt/tests/test_unit_laplace.c b/drivers/opus/celt/tests/test_unit_laplace.c index af7d47104..e4fe83c4d 100644 --- a/drivers/opus/celt/tests/test_unit_laplace.c +++ b/drivers/opus/celt/tests/test_unit_laplace.c @@ -25,20 +25,20 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif #include <stdio.h> #include <stdlib.h> -#include "laplace.h" +#include "opus/celt/laplace.h" #define CELT_C -#include "stack_alloc.h" +#include "opus/celt/stack_alloc.h" -#include "entenc.c" -#include "entdec.c" -#include "entcode.c" -#include "laplace.c" +#include "opus/celt/entenc.c" +#include "opus/celt/entdec.c" +#include "opus/celt/entcode.c" +#include "opus/celt/laplace.c" #define DATA_SIZE 40000 diff --git a/drivers/opus/celt/tests/test_unit_mathops.c b/drivers/opus/celt/tests/test_unit_mathops.c index 36d6a4bfb..0e3f300d4 100644 --- a/drivers/opus/celt/tests/test_unit_mathops.c +++ b/drivers/opus/celt/tests/test_unit_mathops.c @@ -26,8 +26,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif #ifndef CUSTOM_MODES @@ -36,15 +36,15 @@ #define CELT_C -#include "mathops.c" -#include "entenc.c" -#include "entdec.c" -#include "entcode.c" -#include "bands.c" -#include "quant_bands.c" -#include "laplace.c" -#include "vq.c" -#include "cwrs.c" +#include "opus/celt/mathops.c" +#include "opus/celt/entenc.c" +#include "opus/celt/entdec.c" +#include "opus/celt/entcode.c" +#include "opus/celt/bands.c" +#include "opus/celt/quant_bands.c" +#include "opus/celt/laplace.c" +#include "opus/celt/vq.c" +#include "opus/celt/cwrs.c" #include <stdio.h> #include <math.h> diff --git a/drivers/opus/celt/tests/test_unit_mdct.c b/drivers/opus/celt/tests/test_unit_mdct.c index e3b5eec11..0be03db2e 100644 --- a/drivers/opus/celt/tests/test_unit_mdct.c +++ b/drivers/opus/celt/tests/test_unit_mdct.c @@ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif #define SKIP_CONFIG_H @@ -38,13 +38,13 @@ #include <stdio.h> #define CELT_C -#include "mdct.h" -#include "stack_alloc.h" +#include "opus/celt/mdct.h" +#include "opus/celt/stack_alloc.h" -#include "kiss_fft.c" -#include "mdct.c" -#include "mathops.c" -#include "entcode.c" +#include "opus/celt/kiss_fft.c" +#include "opus/celt/mdct.c" +#include "opus/celt/mathops.c" +#include "opus/celt/entcode.c" #ifndef M_PI #define M_PI 3.141592653 diff --git a/drivers/opus/celt/tests/test_unit_rotation.c b/drivers/opus/celt/tests/test_unit_rotation.c index c12cc3f02..a57bf11e7 100644 --- a/drivers/opus/celt/tests/test_unit_rotation.c +++ b/drivers/opus/celt/tests/test_unit_rotation.c @@ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif #ifndef CUSTOM_MODES @@ -37,13 +37,13 @@ #include <stdio.h> #include <stdlib.h> -#include "vq.c" -#include "cwrs.c" -#include "entcode.c" -#include "entenc.c" -#include "entdec.c" -#include "mathops.c" -#include "bands.h" +#include "opus/celt/vq.c" +#include "opus/celt/cwrs.c" +#include "opus/celt/entcode.c" +#include "opus/celt/entenc.c" +#include "opus/celt/entdec.c" +#include "opus/celt/mathops.c" +#include "opus/celt/bands.h" #include <math.h> #define MAX_SIZE 100 diff --git a/drivers/opus/celt/tests/test_unit_types.c b/drivers/opus/celt/tests/test_unit_types.c index 29e671067..12d5ca72f 100644 --- a/drivers/opus/celt/tests/test_unit_types.c +++ b/drivers/opus/celt/tests/test_unit_types.c @@ -25,11 +25,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "opus_types.h" +#include "opus/opus_types.h" #include <stdio.h> int main(void) diff --git a/drivers/opus/celt/vq.c b/drivers/opus/celt/vq.c index 20b0b8272..29a98a3a6 100644 --- a/drivers/opus/celt/vq.c +++ b/drivers/opus/celt/vq.c @@ -26,17 +26,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "mathops.h" -#include "cwrs.h" -#include "vq.h" -#include "arch.h" -#include "os_support.h" -#include "bands.h" -#include "rate.h" +#include "opus/celt/mathops.h" +#include "opus/celt/cwrs.h" +#include "opus/celt/vq.h" +#include "opus/celt/arch.h" +#include "opus/celt/os_support.h" +#include "opus/celt/bands.h" +#include "opus/celt/rate.h" static void exp_rotation1(celt_norm *X, int len, int stride, opus_val16 c, opus_val16 s) { diff --git a/drivers/opus/celt/vq.h b/drivers/opus/celt/vq.h index 8bab59c5e..b52b1a098 100644 --- a/drivers/opus/celt/vq.h +++ b/drivers/opus/celt/vq.h @@ -33,9 +33,9 @@ #ifndef VQ_H #define VQ_H -#include "entenc.h" -#include "entdec.h" -#include "opus_modes.h" +#include "opus/celt/entenc.h" +#include "opus/celt/entdec.h" +#include "opus/celt/opus_modes.h" /** Algebraic pulse-vector quantiser. The signal x is replaced by the sum of * the pitch and a combination of pulses such that its norm is still equal diff --git a/drivers/opus/celt/x86/pitch_sse.h b/drivers/opus/celt/x86/pitch_sse.h index 695122a5a..1542b8723 100644 --- a/drivers/opus/celt/x86/pitch_sse.h +++ b/drivers/opus/celt/x86/pitch_sse.h @@ -33,7 +33,7 @@ #define PITCH_SSE_H #include <xmmintrin.h> -#include "arch.h" +#include "opus/celt/arch.h" #define OVERRIDE_XCORR_KERNEL static OPUS_INLINE void xcorr_kernel(const opus_val16 *x, const opus_val16 *y, opus_val32 sum[4], int len) diff --git a/drivers/opus/http.c b/drivers/opus/http.c index 803db044a..24991b040 100644 --- a/drivers/opus/http.c +++ b/drivers/opus/http.c @@ -9,11 +9,11 @@ * by the Xiph.Org Foundation and contributors http://www.xiph.org/ * * * ********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "internal.h" +#include "opus/internal.h" #include <ctype.h> #include <errno.h> #include <limits.h> @@ -214,7 +214,7 @@ static const char *op_parse_file_url(const char *_src){ # include <winsock2.h> # include <ws2tcpip.h> # include <openssl/ssl.h> -# include "winerrno.h" +# include "opus/winerrno.h" typedef SOCKET op_sock; diff --git a/drivers/opus/info.c b/drivers/opus/info.c index f5ad2110b..8175a013a 100644 --- a/drivers/opus/info.c +++ b/drivers/opus/info.c @@ -9,11 +9,11 @@ * by the Xiph.Org Foundation and contributors http://www.xiph.org/ * * * ********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "internal.h" +#include "opus/internal.h" #include <limits.h> #include <string.h> diff --git a/drivers/opus/internal.c b/drivers/opus/internal.c index a9c367117..d73628ec5 100644 --- a/drivers/opus/internal.c +++ b/drivers/opus/internal.c @@ -9,11 +9,11 @@ * by the Xiph.Org Foundation and contributors http://www.xiph.org/ * * * ********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "internal.h" +#include "opus/internal.h" #if defined(OP_ENABLE_ASSERTIONS) void op_fatal_impl(const char *_str,const char *_file,int _line){ diff --git a/drivers/opus/mlp.c b/drivers/opus/mlp.c index 7220a23d4..d4d497179 100644 --- a/drivers/opus/mlp.c +++ b/drivers/opus/mlp.c @@ -25,17 +25,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "opus_types.h" -#include "opus_defines.h" +#include "opus/opus_types.h" +#include "opus/opus_defines.h" #include <math.h> -#include "mlp.h" -#include "arch.h" -#include "tansig_table.h" +#include "opus/mlp.h" +#include "opus/celt/arch.h" +#include "opus/tansig_table.h" #define MAX_NEURONS 100 #if 0 diff --git a/drivers/opus/mlp.h b/drivers/opus/mlp.h index 86c8e0617..3f9ca73bb 100644 --- a/drivers/opus/mlp.h +++ b/drivers/opus/mlp.h @@ -28,7 +28,7 @@ #ifndef _MLP_H_ #define _MLP_H_ -#include "arch.h" +#include "opus/celt/arch.h" typedef struct { int layers; diff --git a/drivers/opus/mlp_data.c b/drivers/opus/mlp_data.c index 401c4c025..127c62ce8 100644 --- a/drivers/opus/mlp_data.c +++ b/drivers/opus/mlp_data.c @@ -1,7 +1,7 @@ /* The contents of this file was automatically generated by mlp_train.c It contains multi-layer perceptron (MLP) weights. */ -#include "mlp.h" +#include "opus/mlp.h" /* RMS error was 0.138320, seed was 1361535663 */ diff --git a/drivers/opus/opus.c b/drivers/opus/opus.c index 8978e3b06..5af71b478 100644 --- a/drivers/opus/opus.c +++ b/drivers/opus/opus.c @@ -25,12 +25,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "opus.h" -#include "opus_private.h" +#include "opus/opus.h" +#include "opus/opus_private.h" #ifndef DISABLE_FLOAT_API OPUS_EXPORT void opus_pcm_soft_clip(float *_x, int N, int C, float *declip_mem) diff --git a/drivers/opus/opus.h b/drivers/opus/opus.h index 93a53a2ff..b99f55301 100644 --- a/drivers/opus/opus.h +++ b/drivers/opus/opus.h @@ -33,8 +33,8 @@ #ifndef OPUS_H #define OPUS_H -#include "opus_types.h" -#include "opus_defines.h" +#include "opus/opus_types.h" +#include "opus/opus_defines.h" #ifdef __cplusplus extern "C" { diff --git a/drivers/opus/opus_custom.h b/drivers/opus/opus_custom.h index 41f36bf2f..32fcb81ac 100644 --- a/drivers/opus/opus_custom.h +++ b/drivers/opus/opus_custom.h @@ -35,7 +35,7 @@ #ifndef OPUS_CUSTOM_H #define OPUS_CUSTOM_H -#include "opus_defines.h" +#include "opus/opus_defines.h" #ifdef __cplusplus extern "C" { diff --git a/drivers/opus/opus_decoder.c b/drivers/opus/opus_decoder.c index c5d4cc6aa..dea56015c 100644 --- a/drivers/opus/opus_decoder.c +++ b/drivers/opus/opus_decoder.c @@ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef OPUS_HAVE_CONFIG_H -# include "opus_config.h" +#ifdef OPUS_ENABLED +# include "opus/opus_config.h" #endif #ifndef OPUS_BUILD @@ -38,19 +38,19 @@ #endif #include <stdarg.h> -#include "celt.h" -#include "opus.h" -#include "entdec.h" -#include "opus_modes.h" -#include "API.h" -#include "stack_alloc.h" -#include "float_cast.h" -#include "opus_private.h" -#include "os_support.h" -#include "structs.h" -#include "define.h" -#include "mathops.h" -#include "cpu_support.h" +#include "opus/celt/celt.h" +#include "opus/opus.h" +#include "opus/celt/entdec.h" +#include "opus/celt/opus_modes.h" +#include "opus/silk/API.h" +#include "opus/celt/stack_alloc.h" +#include "opus/celt/float_cast.h" +#include "opus/opus_private.h" +#include "opus/celt/os_support.h" +#include "opus/silk/structs.h" +#include "opus/silk/define.h" +#include "opus/celt/mathops.h" +#include "opus/celt/cpu_support.h" struct OpusDecoder { int celt_dec_offset; diff --git a/drivers/opus/opus_defines.h b/drivers/opus/opus_defines.h index 265089f65..9d089d839 100644 --- a/drivers/opus/opus_defines.h +++ b/drivers/opus/opus_defines.h @@ -33,7 +33,7 @@ #ifndef OPUS_DEFINES_H #define OPUS_DEFINES_H -#include "opus_types.h" +#include "opus/opus_types.h" #ifdef __cplusplus extern "C" { diff --git a/drivers/opus/opus_demo.c b/drivers/opus/opus_demo.c index 7fcf65fd8..a0c5a5f86 100644 --- a/drivers/opus/opus_demo.c +++ b/drivers/opus/opus_demo.c @@ -26,19 +26,19 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif #include <stdio.h> #include <stdlib.h> #include <math.h> #include <string.h> -#include "opus.h" -#include "debug.h" -#include "opus_types.h" -#include "opus_private.h" -#include "opus_multistream.h" +#include "opus/opus.h" +#include "opus/silk/debug.h" +#include "opus/opus_types.h" +#include "opus/opus_private.h" +#include "opus/opus_multistream.h" #define MAX_PACKET 1500 diff --git a/drivers/opus/opus_encoder.c b/drivers/opus/opus_encoder.c index f739daa25..890a2514d 100644 --- a/drivers/opus/opus_encoder.c +++ b/drivers/opus/opus_encoder.c @@ -25,29 +25,29 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif #include <stdarg.h> -#include "celt.h" -#include "entenc.h" -#include "opus_modes.h" -#include "API.h" -#include "stack_alloc.h" -#include "float_cast.h" -#include "opus.h" -#include "arch.h" -#include "opus_private.h" -#include "os_support.h" -#include "cpu_support.h" -#include "analysis.h" -#include "mathops.h" -#include "tuning_parameters.h" +#include "opus/celt/celt.h" +#include "opus/celt/entenc.h" +#include "opus/celt/opus_modes.h" +#include "opus/silk/API.h" +#include "opus/celt/stack_alloc.h" +#include "opus/celt/float_cast.h" +#include "opus/opus.h" +#include "opus/celt/arch.h" +#include "opus/opus_private.h" +#include "opus/celt/os_support.h" +#include "opus/celt/cpu_support.h" +#include "opus/analysis.h" +#include "opus/celt/mathops.h" +#include "opus/silk/tuning_parameters.h" #ifdef OPUS_FIXED_POINT -#include "fixed/structs_FIX.h" +#include "opus/silk/fixed/structs_FIX.h" #else -#include "float/structs_FLP.h" +#include "opus/silk/float/structs_FLP.h" #endif #define MAX_ENCODER_BUFFER 480 diff --git a/drivers/opus/opus_multistream.c b/drivers/opus/opus_multistream.c index 8211c0b47..10c42dd56 100644 --- a/drivers/opus/opus_multistream.c +++ b/drivers/opus/opus_multistream.c @@ -25,17 +25,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "opus_multistream.h" -#include "opus.h" -#include "opus_private.h" -#include "stack_alloc.h" +#include "opus/opus_multistream.h" +#include "opus/opus.h" +#include "opus/opus_private.h" +#include "opus/celt/stack_alloc.h" #include <stdarg.h> -#include "float_cast.h" -#include "os_support.h" +#include "opus/celt/float_cast.h" +#include "opus/celt/os_support.h" int validate_layout(const ChannelLayout *layout) diff --git a/drivers/opus/opus_multistream.h b/drivers/opus/opus_multistream.h index ae5997934..f736c99c8 100644 --- a/drivers/opus/opus_multistream.h +++ b/drivers/opus/opus_multistream.h @@ -33,7 +33,7 @@ #ifndef OPUS_MULTISTREAM_H #define OPUS_MULTISTREAM_H -#include "opus.h" +#include "opus/opus.h" #ifdef __cplusplus extern "C" { diff --git a/drivers/opus/opus_multistream_decoder.c b/drivers/opus/opus_multistream_decoder.c index 64a0c2406..43c695d81 100644 --- a/drivers/opus/opus_multistream_decoder.c +++ b/drivers/opus/opus_multistream_decoder.c @@ -25,17 +25,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "opus_multistream.h" -#include "opus.h" -#include "opus_private.h" -#include "stack_alloc.h" +#include "opus/opus_multistream.h" +#include "opus/opus.h" +#include "opus/opus_private.h" +#include "opus/celt/stack_alloc.h" #include <stdarg.h> -#include "float_cast.h" -#include "os_support.h" +#include "opus/celt/float_cast.h" +#include "opus/celt/os_support.h" struct OpusMSDecoder { ChannelLayout layout; diff --git a/drivers/opus/opus_multistream_encoder.c b/drivers/opus/opus_multistream_encoder.c index 8d559743e..685d2de27 100644 --- a/drivers/opus/opus_multistream_encoder.c +++ b/drivers/opus/opus_multistream_encoder.c @@ -25,22 +25,22 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "opus_multistream.h" -#include "opus.h" -#include "opus_private.h" -#include "stack_alloc.h" +#include "opus/opus_multistream.h" +#include "opus/opus.h" +#include "opus/opus_private.h" +#include "opus/celt/stack_alloc.h" #include <stdarg.h> -#include "float_cast.h" -#include "os_support.h" -#include "mathops.h" -#include "mdct.h" -#include "opus_modes.h" -#include "bands.h" -#include "quant_bands.h" +#include "opus/celt/float_cast.h" +#include "opus/celt/os_support.h" +#include "opus/celt/mathops.h" +#include "opus/celt/mdct.h" +#include "opus/celt/opus_modes.h" +#include "opus/celt/bands.h" +#include "opus/celt/quant_bands.h" typedef struct { int nb_streams; diff --git a/drivers/opus/opus_private.h b/drivers/opus/opus_private.h index 83225f2b6..d63ed4f05 100644 --- a/drivers/opus/opus_private.h +++ b/drivers/opus/opus_private.h @@ -29,9 +29,9 @@ #ifndef OPUS_PRIVATE_H #define OPUS_PRIVATE_H -#include "arch.h" -#include "opus.h" -#include "celt.h" +#include "opus/celt/arch.h" +#include "opus/opus.h" +#include "opus/celt/celt.h" struct OpusRepacketizer { unsigned char toc; diff --git a/drivers/opus/opusfile.c b/drivers/opus/opusfile.c index 1e7497f6c..a38e8cd5a 100644 --- a/drivers/opus/opusfile.c +++ b/drivers/opus/opusfile.c @@ -14,11 +14,11 @@ last mod: $Id: vorbisfile.c 17573 2010-10-27 14:53:59Z xiphmont $ ********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "internal.h" +#include "opus/internal.h" #include <stdio.h> #include <stdlib.h> #include <errno.h> @@ -26,7 +26,7 @@ #include <string.h> #include <math.h> -#include "opusfile.h" +#include "opus/opusfile.h" /*This implementation is largely based off of libvorbisfile. All of the Ogg bits work roughly the same, though I have made some diff --git a/drivers/opus/repacketizer.c b/drivers/opus/repacketizer.c index 01406bb39..eb0c0c737 100644 --- a/drivers/opus/repacketizer.c +++ b/drivers/opus/repacketizer.c @@ -25,13 +25,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "opus.h" -#include "opus_private.h" -#include "os_support.h" +#include "opus/opus.h" +#include "opus/opus_private.h" +#include "opus/celt/os_support.h" int opus_repacketizer_get_size(void) diff --git a/drivers/opus/repacketizer_demo.c b/drivers/opus/repacketizer_demo.c index 1ca9cc3c9..5df4f2695 100644 --- a/drivers/opus/repacketizer_demo.c +++ b/drivers/opus/repacketizer_demo.c @@ -25,11 +25,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "opus.h" +#include "opus/opus.h" #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/drivers/opus/silk/A2NLSF.c b/drivers/opus/silk/A2NLSF.c index cec53a5cd..18b0e3092 100644 --- a/drivers/opus/silk/A2NLSF.c +++ b/drivers/opus/silk/A2NLSF.c @@ -31,12 +31,12 @@ POSSIBILITY OF SUCH DAMAGE. /* Therefore the result is not accurate NLSFs, but the two */ /* functions are accurate inverses of each other */ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" -#include "tables.h" +#include "opus/silk/SigProc_FIX.h" +#include "opus/silk/tables.h" /* Number of binary divisions, when not in low complexity mode */ #define BIN_DIV_STEPS_A2NLSF_FIX 3 /* must be no higher than 16 - log2( LSF_COS_TAB_SZ_FIX ) */ diff --git a/drivers/opus/silk/API.h b/drivers/opus/silk/API.h index f0601bcf6..70f81a0c4 100644 --- a/drivers/opus/silk/API.h +++ b/drivers/opus/silk/API.h @@ -28,11 +28,11 @@ POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_API_H #define SILK_API_H -#include "control.h" -#include "typedef.h" -#include "errors.h" -#include "entenc.h" -#include "entdec.h" +#include "opus/silk/control.h" +#include "opus/silk/typedef.h" +#include "opus/silk/errors.h" +#include "opus/celt/entenc.h" +#include "opus/celt/entdec.h" #ifdef __cplusplus extern "C" diff --git a/drivers/opus/silk/CNG.c b/drivers/opus/silk/CNG.c index 8b8dbf882..253ae7db4 100644 --- a/drivers/opus/silk/CNG.c +++ b/drivers/opus/silk/CNG.c @@ -25,12 +25,12 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "silk_main.h" -#include "stack_alloc.h" +#include "opus/silk/silk_main.h" +#include "opus/celt/stack_alloc.h" /* Generates excitation for CNG LPC synthesis */ static OPUS_INLINE void silk_CNG_exc( diff --git a/drivers/opus/silk/HP_variable_cutoff.c b/drivers/opus/silk/HP_variable_cutoff.c index 379752bb1..9da203286 100644 --- a/drivers/opus/silk/HP_variable_cutoff.c +++ b/drivers/opus/silk/HP_variable_cutoff.c @@ -25,15 +25,15 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif #ifdef OPUS_FIXED_POINT -#include "main_FIX.h" +#include "opus/silk/fixed/main_FIX.h" #else -#include "main_FLP.h" +#include "opus/silk/float/main_FLP.h" #endif -#include "tuning_parameters.h" +#include "opus/silk/tuning_parameters.h" /* High-pass filter with cutoff frequency adaptation based on pitch lag statistics */ void silk_HP_variable_cutoff( diff --git a/drivers/opus/silk/LPC_analysis_filter.c b/drivers/opus/silk/LPC_analysis_filter.c index 98ef509e4..4976d9d3c 100644 --- a/drivers/opus/silk/LPC_analysis_filter.c +++ b/drivers/opus/silk/LPC_analysis_filter.c @@ -25,12 +25,12 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" -#include "celt_lpc.h" +#include "opus/silk/SigProc_FIX.h" +#include "opus/celt/celt_lpc.h" /*******************************************/ /* LPC analysis filter */ diff --git a/drivers/opus/silk/LPC_inv_pred_gain.c b/drivers/opus/silk/LPC_inv_pred_gain.c index 6dc9a4986..aa6787575 100644 --- a/drivers/opus/silk/LPC_inv_pred_gain.c +++ b/drivers/opus/silk/LPC_inv_pred_gain.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" +#include "opus/silk/SigProc_FIX.h" #define QA 24 #define A_LIMIT SILK_FIX_CONST( 0.99975, QA ) diff --git a/drivers/opus/silk/LP_variable_cutoff.c b/drivers/opus/silk/LP_variable_cutoff.c index 098c19d34..65c4a6b06 100644 --- a/drivers/opus/silk/LP_variable_cutoff.c +++ b/drivers/opus/silk/LP_variable_cutoff.c @@ -25,8 +25,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif /* @@ -35,7 +35,7 @@ POSSIBILITY OF SUCH DAMAGE. [0.95 : 0.15 : 0.35] normalized cut off frequencies. */ -#include "silk_main.h" +#include "opus/silk/silk_main.h" /* Helper function, interpolates the filter taps */ static OPUS_INLINE void silk_LP_interpolate_filter_taps( diff --git a/drivers/opus/silk/NLSF2A.c b/drivers/opus/silk/NLSF2A.c index 2b6f685f4..c3b8568a0 100644 --- a/drivers/opus/silk/NLSF2A.c +++ b/drivers/opus/silk/NLSF2A.c @@ -25,8 +25,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif /* conversion between prediction filter coefficients and LSFs */ @@ -35,8 +35,8 @@ POSSIBILITY OF SUCH DAMAGE. /* therefore the result is not accurate LSFs, but the two */ /* functions are accurate inverses of each other */ -#include "SigProc_FIX.h" -#include "tables.h" +#include "opus/silk/SigProc_FIX.h" +#include "opus/silk/tables.h" #define QA 16 diff --git a/drivers/opus/silk/NLSF_VQ.c b/drivers/opus/silk/NLSF_VQ.c index e4ca79fbf..9420f5bfb 100644 --- a/drivers/opus/silk/NLSF_VQ.c +++ b/drivers/opus/silk/NLSF_VQ.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "silk_main.h" +#include "opus/silk/silk_main.h" /* Compute quantization errors for an LPC_order element input vector for a VQ codebook */ void silk_NLSF_VQ( diff --git a/drivers/opus/silk/NLSF_VQ_weights_laroia.c b/drivers/opus/silk/NLSF_VQ_weights_laroia.c index f461ba01c..d3b4fd640 100644 --- a/drivers/opus/silk/NLSF_VQ_weights_laroia.c +++ b/drivers/opus/silk/NLSF_VQ_weights_laroia.c @@ -25,12 +25,12 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "define.h" -#include "SigProc_FIX.h" +#include "opus/silk/define.h" +#include "opus/silk/SigProc_FIX.h" /* R. Laroia, N. Phamdo and N. Farvardin, "Robust and Efficient Quantization of Speech LSP diff --git a/drivers/opus/silk/NLSF_decode.c b/drivers/opus/silk/NLSF_decode.c index 786a62d27..6868a9385 100644 --- a/drivers/opus/silk/NLSF_decode.c +++ b/drivers/opus/silk/NLSF_decode.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "silk_main.h" +#include "opus/silk/silk_main.h" /* Predictive dequantizer for NLSF residuals */ static OPUS_INLINE void silk_NLSF_residual_dequant( /* O Returns RD value in Q30 */ diff --git a/drivers/opus/silk/NLSF_del_dec_quant.c b/drivers/opus/silk/NLSF_del_dec_quant.c index b74585370..9caeb0a23 100644 --- a/drivers/opus/silk/NLSF_del_dec_quant.c +++ b/drivers/opus/silk/NLSF_del_dec_quant.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "silk_main.h" +#include "opus/silk/silk_main.h" /* Delayed-decision quantizer for NLSF residuals */ opus_int32 silk_NLSF_del_dec_quant( /* O Returns RD value in Q25 */ diff --git a/drivers/opus/silk/NLSF_encode.c b/drivers/opus/silk/NLSF_encode.c index bf67bd5cf..157c0c8ff 100644 --- a/drivers/opus/silk/NLSF_encode.c +++ b/drivers/opus/silk/NLSF_encode.c @@ -25,12 +25,12 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "silk_main.h" -#include "stack_alloc.h" +#include "opus/silk/silk_main.h" +#include "opus/celt/stack_alloc.h" /***********************/ /* NLSF vector encoder */ diff --git a/drivers/opus/silk/NLSF_stabilize.c b/drivers/opus/silk/NLSF_stabilize.c index a1bf20b8d..caeeed975 100644 --- a/drivers/opus/silk/NLSF_stabilize.c +++ b/drivers/opus/silk/NLSF_stabilize.c @@ -25,8 +25,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif /* NLSF stabilizer: */ @@ -38,7 +38,7 @@ POSSIBILITY OF SUCH DAMAGE. /* - Output are sorted NLSF coefficients */ /* */ -#include "SigProc_FIX.h" +#include "opus/silk/SigProc_FIX.h" /* Constant Definitions */ #define MAX_LOOPS 20 diff --git a/drivers/opus/silk/NLSF_unpack.c b/drivers/opus/silk/NLSF_unpack.c index 60242a3b5..20d3020f9 100644 --- a/drivers/opus/silk/NLSF_unpack.c +++ b/drivers/opus/silk/NLSF_unpack.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "silk_main.h" +#include "opus/silk/silk_main.h" /* Unpack predictor values and indices for entropy coding tables */ void silk_NLSF_unpack( diff --git a/drivers/opus/silk/NSQ.c b/drivers/opus/silk/NSQ.c index a08e34e89..6092498a1 100644 --- a/drivers/opus/silk/NSQ.c +++ b/drivers/opus/silk/NSQ.c @@ -25,12 +25,12 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "silk_main.h" -#include "stack_alloc.h" +#include "opus/silk/silk_main.h" +#include "opus/celt/stack_alloc.h" static OPUS_INLINE void silk_nsq_scale_states( const silk_encoder_state *psEncC, /* I Encoder State */ diff --git a/drivers/opus/silk/NSQ_del_dec.c b/drivers/opus/silk/NSQ_del_dec.c index 8ac6311b1..4aa730ed6 100644 --- a/drivers/opus/silk/NSQ_del_dec.c +++ b/drivers/opus/silk/NSQ_del_dec.c @@ -25,12 +25,12 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "silk_main.h" -#include "stack_alloc.h" +#include "opus/silk/silk_main.h" +#include "opus/celt/stack_alloc.h" typedef struct { opus_int32 sLPC_Q14[ MAX_SUB_FRAME_LENGTH + NSQ_LPC_BUF_LENGTH ]; diff --git a/drivers/opus/silk/PLC.c b/drivers/opus/silk/PLC.c index 9fc11adda..1f5ce0992 100644 --- a/drivers/opus/silk/PLC.c +++ b/drivers/opus/silk/PLC.c @@ -25,13 +25,13 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "silk_main.h" -#include "stack_alloc.h" -#include "PLC.h" +#include "opus/silk/silk_main.h" +#include "opus/celt/stack_alloc.h" +#include "opus/silk/PLC.h" #define NB_ATT 2 static const opus_int16 HARM_ATT_Q15[NB_ATT] = { 32440, 31130 }; /* 0.99, 0.95 */ diff --git a/drivers/opus/silk/PLC.h b/drivers/opus/silk/PLC.h index f531cda95..ae573fc00 100644 --- a/drivers/opus/silk/PLC.h +++ b/drivers/opus/silk/PLC.h @@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_PLC_H #define SILK_PLC_H -#include "silk_main.h" +#include "opus/silk/silk_main.h" #define BWE_COEF 0.99 #define V_PITCH_GAIN_START_MIN_Q14 11469 /* 0.7 in Q14 */ diff --git a/drivers/opus/silk/SigProc_FIX.h b/drivers/opus/silk/SigProc_FIX.h index 1b5805791..f4db0fa9a 100644 --- a/drivers/opus/silk/SigProc_FIX.h +++ b/drivers/opus/silk/SigProc_FIX.h @@ -38,9 +38,9 @@ extern "C" #define SILK_MAX_ORDER_LPC 16 /* max order of the LPC analysis in schur() and k2a() */ #include <string.h> /* for memset(), memcpy(), memmove() */ -#include "typedef.h" -#include "resampler_structs.h" -#include "macros.h" +#include "opus/silk/typedef.h" +#include "opus/silk/resampler_structs.h" +#include "opus/silk/macros.h" /********************************************************************/ @@ -575,9 +575,9 @@ static OPUS_INLINE opus_int64 silk_max_64(opus_int64 a, opus_int64 b) /* the following seems faster on x86 */ #define silk_SMMUL(a32, b32) (opus_int32)silk_RSHIFT64(silk_SMULL((a32), (b32)), 32) -#include "Inlines.h" -#include "MacroCount.h" -#include "MacroDebug.h" +#include "opus/silk/Inlines.h" +#include "opus/silk/MacroCount.h" +#include "opus/silk/MacroDebug.h" #ifdef OPUS_ARM_INLINE_ASM #include "arm/SigProc_FIX_armv4.h" diff --git a/drivers/opus/silk/VAD.c b/drivers/opus/silk/VAD.c index 3a5c56662..a789a13d3 100644 --- a/drivers/opus/silk/VAD.c +++ b/drivers/opus/silk/VAD.c @@ -25,12 +25,12 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "silk_main.h" -#include "stack_alloc.h" +#include "opus/silk/silk_main.h" +#include "opus/celt/stack_alloc.h" /* Silk VAD noise level estimation */ static OPUS_INLINE void silk_VAD_GetNoiseLevels( diff --git a/drivers/opus/silk/VQ_WMat_EC.c b/drivers/opus/silk/VQ_WMat_EC.c index 28c5fc7e6..a35b84ef1 100644 --- a/drivers/opus/silk/VQ_WMat_EC.c +++ b/drivers/opus/silk/VQ_WMat_EC.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "silk_main.h" +#include "opus/silk/silk_main.h" /* Entropy constrained matrix-weighted VQ, hard-coded to 5-element vectors, for a single input data vector */ void silk_VQ_WMat_EC( diff --git a/drivers/opus/silk/ana_filt_bank_1.c b/drivers/opus/silk/ana_filt_bank_1.c index 387dcd87e..a2fa720bd 100644 --- a/drivers/opus/silk/ana_filt_bank_1.c +++ b/drivers/opus/silk/ana_filt_bank_1.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" +#include "opus/silk/SigProc_FIX.h" /* Coefficients for 2-band filter bank based on first-order allpass filters */ static opus_int16 A_fb1_20 = 5394 << 1; diff --git a/drivers/opus/silk/biquad_alt.c b/drivers/opus/silk/biquad_alt.c index 5f1d6d25c..85708167d 100644 --- a/drivers/opus/silk/biquad_alt.c +++ b/drivers/opus/silk/biquad_alt.c @@ -32,11 +32,11 @@ POSSIBILITY OF SUCH DAMAGE. * Can handle slowly varying filter coefficients * * */ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" +#include "opus/silk/SigProc_FIX.h" /* Second order ARMA filter, alternative implementation */ void silk_biquad_alt( diff --git a/drivers/opus/silk/bwexpander.c b/drivers/opus/silk/bwexpander.c index d75748387..7f81a2af9 100644 --- a/drivers/opus/silk/bwexpander.c +++ b/drivers/opus/silk/bwexpander.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" +#include "opus/silk/SigProc_FIX.h" /* Chirp (bandwidth expand) LP AR filter */ void silk_bwexpander( diff --git a/drivers/opus/silk/bwexpander_32.c b/drivers/opus/silk/bwexpander_32.c index 8a60767c0..58dfe1f8d 100644 --- a/drivers/opus/silk/bwexpander_32.c +++ b/drivers/opus/silk/bwexpander_32.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" +#include "opus/silk/SigProc_FIX.h" /* Chirp (bandwidth expand) LP AR filter */ void silk_bwexpander_32( diff --git a/drivers/opus/silk/check_control_input.c b/drivers/opus/silk/check_control_input.c index 0e02fff22..9c882334c 100644 --- a/drivers/opus/silk/check_control_input.c +++ b/drivers/opus/silk/check_control_input.c @@ -25,13 +25,13 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "silk_main.h" -#include "control.h" -#include "errors.h" +#include "opus/silk/silk_main.h" +#include "opus/silk/control.h" +#include "opus/silk/errors.h" /* Check encoder control struct */ opus_int check_control_input( diff --git a/drivers/opus/silk/code_signs.c b/drivers/opus/silk/code_signs.c index 8bcc6ecde..e2f671d7c 100644 --- a/drivers/opus/silk/code_signs.c +++ b/drivers/opus/silk/code_signs.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "silk_main.h" +#include "opus/silk/silk_main.h" /*#define silk_enc_map(a) ((a) > 0 ? 1 : 0)*/ /*#define silk_dec_map(a) ((a) > 0 ? 1 : -1)*/ diff --git a/drivers/opus/silk/control.h b/drivers/opus/silk/control.h index 747e5426a..4b20c4a8b 100644 --- a/drivers/opus/silk/control.h +++ b/drivers/opus/silk/control.h @@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_CONTROL_H #define SILK_CONTROL_H -#include "typedef.h" +#include "opus/silk/typedef.h" #ifdef __cplusplus extern "C" diff --git a/drivers/opus/silk/control_SNR.c b/drivers/opus/silk/control_SNR.c index ae6351798..e3983d503 100644 --- a/drivers/opus/silk/control_SNR.c +++ b/drivers/opus/silk/control_SNR.c @@ -25,12 +25,12 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "silk_main.h" -#include "tuning_parameters.h" +#include "opus/silk/silk_main.h" +#include "opus/silk/tuning_parameters.h" /* Control SNR of redidual quantizer */ opus_int silk_control_SNR( diff --git a/drivers/opus/silk/control_audio_bandwidth.c b/drivers/opus/silk/control_audio_bandwidth.c index 6f060bbd2..846a7baa5 100644 --- a/drivers/opus/silk/control_audio_bandwidth.c +++ b/drivers/opus/silk/control_audio_bandwidth.c @@ -25,12 +25,12 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "silk_main.h" -#include "tuning_parameters.h" +#include "opus/silk/silk_main.h" +#include "opus/silk/tuning_parameters.h" /* Control internal sampling rate */ opus_int silk_control_audio_bandwidth( diff --git a/drivers/opus/silk/control_codec.c b/drivers/opus/silk/control_codec.c index 2d7b10e9b..beb6dfe6c 100644 --- a/drivers/opus/silk/control_codec.c +++ b/drivers/opus/silk/control_codec.c @@ -25,19 +25,19 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif #ifdef OPUS_FIXED_POINT -#include "main_FIX.h" +#include "opus/silk/fixed/main_FIX.h" #define silk_encoder_state_Fxx silk_encoder_state_FIX #else -#include "main_FLP.h" +#include "opus/silk/float/main_FLP.h" #define silk_encoder_state_Fxx silk_encoder_state_FLP #endif -#include "stack_alloc.h" -#include "tuning_parameters.h" -#include "pitch_est_defines.h" +#include "opus/celt/stack_alloc.h" +#include "opus/silk/tuning_parameters.h" +#include "opus/silk/pitch_est_defines.h" static opus_int silk_setup_resamplers( silk_encoder_state_Fxx *psEnc, /* I/O */ diff --git a/drivers/opus/silk/debug.c b/drivers/opus/silk/debug.c index 2230813fa..9f31b68f7 100644 --- a/drivers/opus/silk/debug.c +++ b/drivers/opus/silk/debug.c @@ -25,12 +25,12 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "debug.h" -#include "SigProc_FIX.h" +#include "opus/silk/debug.h" +#include "opus/silk/SigProc_FIX.h" #if SILK_TIC_TOC diff --git a/drivers/opus/silk/debug.h b/drivers/opus/silk/debug.h index efb6d3e99..d2eccfa1e 100644 --- a/drivers/opus/silk/debug.h +++ b/drivers/opus/silk/debug.h @@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_DEBUG_H #define SILK_DEBUG_H -#include "typedef.h" +#include "opus/silk/typedef.h" #include <stdio.h> /* file writing */ #include <string.h> /* strcpy, strcmp */ diff --git a/drivers/opus/silk/dec_API.c b/drivers/opus/silk/dec_API.c index cd72115a2..43aeb4faf 100644 --- a/drivers/opus/silk/dec_API.c +++ b/drivers/opus/silk/dec_API.c @@ -25,12 +25,12 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "API.h" -#include "silk_main.h" -#include "stack_alloc.h" +#include "opus/silk/API.h" +#include "opus/silk/silk_main.h" +#include "opus/celt/stack_alloc.h" /************************/ /* Decoder Super Struct */ diff --git a/drivers/opus/silk/decode_core.c b/drivers/opus/silk/decode_core.c index 8f801ea7a..f7cd8db7c 100644 --- a/drivers/opus/silk/decode_core.c +++ b/drivers/opus/silk/decode_core.c @@ -25,12 +25,12 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "silk_main.h" -#include "stack_alloc.h" +#include "opus/silk/silk_main.h" +#include "opus/celt/stack_alloc.h" /**********************************************************/ /* Core decoder. Performs inverse NSQ operation LTP + LPC */ diff --git a/drivers/opus/silk/decode_frame.c b/drivers/opus/silk/decode_frame.c index 38500227c..f16601945 100644 --- a/drivers/opus/silk/decode_frame.c +++ b/drivers/opus/silk/decode_frame.c @@ -25,13 +25,13 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "silk_main.h" -#include "stack_alloc.h" -#include "PLC.h" +#include "opus/silk/silk_main.h" +#include "opus/celt/stack_alloc.h" +#include "opus/silk/PLC.h" /****************/ /* Decode frame */ diff --git a/drivers/opus/silk/decode_indices.c b/drivers/opus/silk/decode_indices.c index c2aaad260..3e09fb416 100644 --- a/drivers/opus/silk/decode_indices.c +++ b/drivers/opus/silk/decode_indices.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "silk_main.h" +#include "opus/silk/silk_main.h" /* Decode side-information parameters from payload */ void silk_decode_indices( diff --git a/drivers/opus/silk/decode_parameters.c b/drivers/opus/silk/decode_parameters.c index 72df4fcdb..7f4cbeec2 100644 --- a/drivers/opus/silk/decode_parameters.c +++ b/drivers/opus/silk/decode_parameters.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "silk_main.h" +#include "opus/silk/silk_main.h" /* Decode parameters from payload */ void silk_decode_parameters( diff --git a/drivers/opus/silk/decode_pitch.c b/drivers/opus/silk/decode_pitch.c index 3e1dd2d35..73e94b4ee 100644 --- a/drivers/opus/silk/decode_pitch.c +++ b/drivers/opus/silk/decode_pitch.c @@ -25,15 +25,15 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif /*********************************************************** * Pitch analyser function ********************************************************** */ -#include "SigProc_FIX.h" -#include "pitch_est_defines.h" +#include "opus/silk/SigProc_FIX.h" +#include "opus/silk/pitch_est_defines.h" void silk_decode_pitch( opus_int16 lagIndex, /* I */ diff --git a/drivers/opus/silk/decode_pulses.c b/drivers/opus/silk/decode_pulses.c index 13772f8a5..24f841881 100644 --- a/drivers/opus/silk/decode_pulses.c +++ b/drivers/opus/silk/decode_pulses.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "silk_main.h" +#include "opus/silk/silk_main.h" /*********************************************/ /* Decode quantization indices of excitation */ diff --git a/drivers/opus/silk/decoder_set_fs.c b/drivers/opus/silk/decoder_set_fs.c index 6d2de5664..97ecd8afd 100644 --- a/drivers/opus/silk/decoder_set_fs.c +++ b/drivers/opus/silk/decoder_set_fs.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "silk_main.h" +#include "opus/silk/silk_main.h" /* Set decoder sampling rate */ opus_int silk_decoder_set_fs( diff --git a/drivers/opus/silk/define.h b/drivers/opus/silk/define.h index c47aca9f5..a38564c83 100644 --- a/drivers/opus/silk/define.h +++ b/drivers/opus/silk/define.h @@ -28,8 +28,8 @@ POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_DEFINE_H #define SILK_DEFINE_H -#include "errors.h" -#include "typedef.h" +#include "opus/silk/errors.h" +#include "opus/silk/typedef.h" #ifdef __cplusplus extern "C" diff --git a/drivers/opus/silk/enc_API.c b/drivers/opus/silk/enc_API.c index 66a9bb67d..ac1a7854f 100644 --- a/drivers/opus/silk/enc_API.c +++ b/drivers/opus/silk/enc_API.c @@ -25,20 +25,20 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "define.h" -#include "API.h" -#include "control.h" -#include "typedef.h" -#include "stack_alloc.h" -#include "structs.h" -#include "tuning_parameters.h" +#include "opus/silk/define.h" +#include "opus/silk/API.h" +#include "opus/silk/control.h" +#include "opus/silk/typedef.h" +#include "opus/celt/stack_alloc.h" +#include "opus/silk/structs.h" +#include "opus/silk/tuning_parameters.h" #ifdef OPUS_FIXED_POINT -#include "main_FIX.h" +#include "opus/silk/fixed/main_FIX.h" #else -#include "main_FLP.h" +#include "opus/silk/float/main_FLP.h" #endif /***************************************/ diff --git a/drivers/opus/silk/encode_indices.c b/drivers/opus/silk/encode_indices.c index c6679b34f..7150325d4 100644 --- a/drivers/opus/silk/encode_indices.c +++ b/drivers/opus/silk/encode_indices.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "silk_main.h" +#include "opus/silk/silk_main.h" /* Encode side-information parameters to payload */ void silk_encode_indices( diff --git a/drivers/opus/silk/encode_pulses.c b/drivers/opus/silk/encode_pulses.c index d148b9d1e..f9fe39eeb 100644 --- a/drivers/opus/silk/encode_pulses.c +++ b/drivers/opus/silk/encode_pulses.c @@ -25,12 +25,12 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "silk_main.h" -#include "stack_alloc.h" +#include "opus/silk/silk_main.h" +#include "opus/celt/stack_alloc.h" /*********************************************/ /* Encode quantization indices of excitation */ diff --git a/drivers/opus/silk/fixed/LTP_analysis_filter_FIX.c b/drivers/opus/silk/fixed/LTP_analysis_filter_FIX.c index 1df4b01d2..19d5defc7 100644 --- a/drivers/opus/silk/fixed/LTP_analysis_filter_FIX.c +++ b/drivers/opus/silk/fixed/LTP_analysis_filter_FIX.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "main_FIX.h" +#include "opus/silk/fixed/main_FIX.h" void silk_LTP_analysis_filter_FIX( opus_int16 *LTP_res, /* O LTP residual signal of length MAX_NB_SUBFR * ( pre_length + subfr_length ) */ diff --git a/drivers/opus/silk/fixed/LTP_scale_ctrl_FIX.c b/drivers/opus/silk/fixed/LTP_scale_ctrl_FIX.c index ab6923c5c..0887fd03f 100644 --- a/drivers/opus/silk/fixed/LTP_scale_ctrl_FIX.c +++ b/drivers/opus/silk/fixed/LTP_scale_ctrl_FIX.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "main_FIX.h" +#include "opus/silk/fixed/main_FIX.h" /* Calculation of LTP state scaling */ void silk_LTP_scale_ctrl_FIX( diff --git a/drivers/opus/silk/fixed/apply_sine_window_FIX.c b/drivers/opus/silk/fixed/apply_sine_window_FIX.c index 0998b49ec..5b4d8ebfd 100644 --- a/drivers/opus/silk/fixed/apply_sine_window_FIX.c +++ b/drivers/opus/silk/fixed/apply_sine_window_FIX.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" +#include "opus/silk/SigProc_FIX.h" /* Apply sine window to signal vector. */ /* Window types: */ diff --git a/drivers/opus/silk/fixed/autocorr_FIX.c b/drivers/opus/silk/fixed/autocorr_FIX.c index 438b42f85..88a849e12 100644 --- a/drivers/opus/silk/fixed/autocorr_FIX.c +++ b/drivers/opus/silk/fixed/autocorr_FIX.c @@ -25,12 +25,12 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" -#include "celt_lpc.h" +#include "opus/silk/SigProc_FIX.h" +#include "opus/celt/celt_lpc.h" /* Compute autocorrelation */ void silk_autocorr( diff --git a/drivers/opus/silk/fixed/burg_modified_FIX.c b/drivers/opus/silk/fixed/burg_modified_FIX.c index ce2a560e6..5ef3ad2c3 100644 --- a/drivers/opus/silk/fixed/burg_modified_FIX.c +++ b/drivers/opus/silk/fixed/burg_modified_FIX.c @@ -25,14 +25,14 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" -#include "define.h" -#include "tuning_parameters.h" -#include "pitch.h" +#include "opus/silk/SigProc_FIX.h" +#include "opus/silk/define.h" +#include "opus/silk/tuning_parameters.h" +#include "opus/celt/pitch.h" #define MAX_FRAME_SIZE 384 /* subfr_length * nb_subfr = ( 0.005 * 16000 + 16 ) * 4 = 384 */ diff --git a/drivers/opus/silk/fixed/corrMatrix_FIX.c b/drivers/opus/silk/fixed/corrMatrix_FIX.c index 28543fc20..9f50153dc 100644 --- a/drivers/opus/silk/fixed/corrMatrix_FIX.c +++ b/drivers/opus/silk/fixed/corrMatrix_FIX.c @@ -25,15 +25,15 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif /********************************************************************** * Correlation Matrix Computations for LS estimate. **********************************************************************/ -#include "main_FIX.h" +#include "opus/silk/fixed/main_FIX.h" /* Calculates correlation vector X'*t */ void silk_corrVector_FIX( diff --git a/drivers/opus/silk/fixed/encode_frame_FIX.c b/drivers/opus/silk/fixed/encode_frame_FIX.c index 2d80ca358..27944729f 100644 --- a/drivers/opus/silk/fixed/encode_frame_FIX.c +++ b/drivers/opus/silk/fixed/encode_frame_FIX.c @@ -25,13 +25,13 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "main_FIX.h" -#include "stack_alloc.h" -#include "tuning_parameters.h" +#include "opus/silk/fixed/main_FIX.h" +#include "opus/celt/stack_alloc.h" +#include "opus/silk/tuning_parameters.h" /* Low Bitrate Redundancy (LBRR) encoding. Reuse all parameters but encode with lower bitrate */ static OPUS_INLINE void silk_LBRR_encode_FIX( diff --git a/drivers/opus/silk/fixed/find_LPC_FIX.c b/drivers/opus/silk/fixed/find_LPC_FIX.c index a46cdb751..df76e17ca 100644 --- a/drivers/opus/silk/fixed/find_LPC_FIX.c +++ b/drivers/opus/silk/fixed/find_LPC_FIX.c @@ -25,13 +25,13 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "main_FIX.h" -#include "stack_alloc.h" -#include "tuning_parameters.h" +#include "opus/silk/fixed/main_FIX.h" +#include "opus/celt/stack_alloc.h" +#include "opus/silk/tuning_parameters.h" /* Finds LPC vector from correlations, and converts to NLSF */ void silk_find_LPC_FIX( diff --git a/drivers/opus/silk/fixed/find_LTP_FIX.c b/drivers/opus/silk/fixed/find_LTP_FIX.c index a1d152eee..d556371ff 100644 --- a/drivers/opus/silk/fixed/find_LTP_FIX.c +++ b/drivers/opus/silk/fixed/find_LTP_FIX.c @@ -25,12 +25,12 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "main_FIX.h" -#include "tuning_parameters.h" +#include "opus/silk/fixed/main_FIX.h" +#include "opus/silk/tuning_parameters.h" /* Head room for correlations */ #define LTP_CORRS_HEAD_ROOM 2 diff --git a/drivers/opus/silk/fixed/find_pitch_lags_FIX.c b/drivers/opus/silk/fixed/find_pitch_lags_FIX.c index 0598477cd..0d00b3edf 100644 --- a/drivers/opus/silk/fixed/find_pitch_lags_FIX.c +++ b/drivers/opus/silk/fixed/find_pitch_lags_FIX.c @@ -25,13 +25,13 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "main_FIX.h" -#include "stack_alloc.h" -#include "tuning_parameters.h" +#include "opus/silk/fixed/main_FIX.h" +#include "opus/celt/stack_alloc.h" +#include "opus/silk/tuning_parameters.h" /* Find pitch lags */ void silk_find_pitch_lags_FIX( diff --git a/drivers/opus/silk/fixed/find_pred_coefs_FIX.c b/drivers/opus/silk/fixed/find_pred_coefs_FIX.c index 0ab70df09..93b506b52 100644 --- a/drivers/opus/silk/fixed/find_pred_coefs_FIX.c +++ b/drivers/opus/silk/fixed/find_pred_coefs_FIX.c @@ -25,12 +25,12 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "main_FIX.h" -#include "stack_alloc.h" +#include "opus/silk/fixed/main_FIX.h" +#include "opus/celt/stack_alloc.h" void silk_find_pred_coefs_FIX( silk_encoder_state_FIX *psEnc, /* I/O encoder state */ diff --git a/drivers/opus/silk/fixed/k2a_FIX.c b/drivers/opus/silk/fixed/k2a_FIX.c index 848666ee3..7d5808f19 100644 --- a/drivers/opus/silk/fixed/k2a_FIX.c +++ b/drivers/opus/silk/fixed/k2a_FIX.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" +#include "opus/silk/SigProc_FIX.h" /* Step up function, converts reflection coefficients to prediction coefficients */ void silk_k2a( diff --git a/drivers/opus/silk/fixed/k2a_Q16_FIX.c b/drivers/opus/silk/fixed/k2a_Q16_FIX.c index f7e62e95f..8df61dc3f 100644 --- a/drivers/opus/silk/fixed/k2a_Q16_FIX.c +++ b/drivers/opus/silk/fixed/k2a_Q16_FIX.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" +#include "opus/silk/SigProc_FIX.h" /* Step up function, converts reflection coefficients to prediction coefficients */ void silk_k2a_Q16( diff --git a/drivers/opus/silk/fixed/main_FIX.h b/drivers/opus/silk/fixed/main_FIX.h index fb47ffe70..71a560ef0 100644 --- a/drivers/opus/silk/fixed/main_FIX.h +++ b/drivers/opus/silk/fixed/main_FIX.h @@ -28,13 +28,13 @@ POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_MAIN_FIX_H #define SILK_MAIN_FIX_H -#include "SigProc_FIX.h" -#include "structs_FIX.h" -#include "control.h" -#include "silk_main.h" -#include "PLC.h" -#include "debug.h" -#include "entenc.h" +#include "opus/silk/SigProc_FIX.h" +#include "opus/silk/fixed/structs_FIX.h" +#include "opus/silk/control.h" +#include "opus/silk/silk_main.h" +#include "opus/silk/PLC.h" +#include "opus/silk/debug.h" +#include "opus/celt/entenc.h" #ifndef FORCE_CPP_BUILD #ifdef __cplusplus diff --git a/drivers/opus/silk/fixed/noise_shape_analysis_FIX.c b/drivers/opus/silk/fixed/noise_shape_analysis_FIX.c index 420cbeedf..862640d2c 100644 --- a/drivers/opus/silk/fixed/noise_shape_analysis_FIX.c +++ b/drivers/opus/silk/fixed/noise_shape_analysis_FIX.c @@ -25,13 +25,13 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "main_FIX.h" -#include "stack_alloc.h" -#include "tuning_parameters.h" +#include "opus/silk/fixed/main_FIX.h" +#include "opus/celt/stack_alloc.h" +#include "opus/silk/tuning_parameters.h" /* Compute gain to make warped filter coefficients have a zero mean log frequency response on a */ /* non-warped frequency scale. (So that it can be implemented with a minimum-phase monic filter.) */ diff --git a/drivers/opus/silk/fixed/pitch_analysis_core_FIX.c b/drivers/opus/silk/fixed/pitch_analysis_core_FIX.c index 4d65c09d1..2acd51db6 100644 --- a/drivers/opus/silk/fixed/pitch_analysis_core_FIX.c +++ b/drivers/opus/silk/fixed/pitch_analysis_core_FIX.c @@ -25,18 +25,18 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif /*********************************************************** * Pitch analyser function ********************************************************** */ -#include "SigProc_FIX.h" -#include "pitch_est_defines.h" -#include "stack_alloc.h" -#include "debug.h" -#include "pitch.h" +#include "opus/silk/SigProc_FIX.h" +#include "opus/silk/pitch_est_defines.h" +#include "opus/celt/stack_alloc.h" +#include "opus/silk/debug.h" +#include "opus/celt/pitch.h" #define SCRATCH_SIZE 22 #define SF_LENGTH_4KHZ ( PE_SUBFR_LENGTH_MS * 4 ) diff --git a/drivers/opus/silk/fixed/prefilter_FIX.c b/drivers/opus/silk/fixed/prefilter_FIX.c index 0b027eb83..195df3da7 100644 --- a/drivers/opus/silk/fixed/prefilter_FIX.c +++ b/drivers/opus/silk/fixed/prefilter_FIX.c @@ -25,13 +25,13 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "main_FIX.h" -#include "stack_alloc.h" -#include "tuning_parameters.h" +#include "opus/silk/fixed/main_FIX.h" +#include "opus/celt/stack_alloc.h" +#include "opus/silk/tuning_parameters.h" /* Prefilter for finding Quantizer input signal */ static OPUS_INLINE void silk_prefilt_FIX( diff --git a/drivers/opus/silk/fixed/process_gains_FIX.c b/drivers/opus/silk/fixed/process_gains_FIX.c index 3a78c475b..2c501a201 100644 --- a/drivers/opus/silk/fixed/process_gains_FIX.c +++ b/drivers/opus/silk/fixed/process_gains_FIX.c @@ -25,12 +25,12 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "main_FIX.h" -#include "tuning_parameters.h" +#include "opus/silk/fixed/main_FIX.h" +#include "opus/silk/tuning_parameters.h" /* Processing of gains */ void silk_process_gains_FIX( diff --git a/drivers/opus/silk/fixed/regularize_correlations_FIX.c b/drivers/opus/silk/fixed/regularize_correlations_FIX.c index a3378fdd1..af34da68f 100644 --- a/drivers/opus/silk/fixed/regularize_correlations_FIX.c +++ b/drivers/opus/silk/fixed/regularize_correlations_FIX.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "main_FIX.h" +#include "opus/silk/fixed/main_FIX.h" /* Add noise to matrix diagonal */ void silk_regularize_correlations_FIX( diff --git a/drivers/opus/silk/fixed/residual_energy16_FIX.c b/drivers/opus/silk/fixed/residual_energy16_FIX.c index 39bdff2a7..9b6e103a5 100644 --- a/drivers/opus/silk/fixed/residual_energy16_FIX.c +++ b/drivers/opus/silk/fixed/residual_energy16_FIX.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "main_FIX.h" +#include "opus/silk/fixed/main_FIX.h" /* Residual energy: nrg = wxx - 2 * wXx * c + c' * wXX * c */ opus_int32 silk_residual_energy16_covar_FIX( diff --git a/drivers/opus/silk/fixed/residual_energy_FIX.c b/drivers/opus/silk/fixed/residual_energy_FIX.c index 13dbc51e3..468bfbab4 100644 --- a/drivers/opus/silk/fixed/residual_energy_FIX.c +++ b/drivers/opus/silk/fixed/residual_energy_FIX.c @@ -25,12 +25,12 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "main_FIX.h" -#include "stack_alloc.h" +#include "opus/silk/fixed/main_FIX.h" +#include "opus/celt/stack_alloc.h" /* Calculates residual energies of input subframes where all subframes have LPC_order */ /* of preceding samples */ diff --git a/drivers/opus/silk/fixed/schur64_FIX.c b/drivers/opus/silk/fixed/schur64_FIX.c index 22c0952ff..fe1278e06 100644 --- a/drivers/opus/silk/fixed/schur64_FIX.c +++ b/drivers/opus/silk/fixed/schur64_FIX.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" +#include "opus/silk/SigProc_FIX.h" /* Slower than schur(), but more accurate. */ /* Uses SMULL(), available on armv4 */ diff --git a/drivers/opus/silk/fixed/schur_FIX.c b/drivers/opus/silk/fixed/schur_FIX.c index e8b24cf06..b0a36e5ad 100644 --- a/drivers/opus/silk/fixed/schur_FIX.c +++ b/drivers/opus/silk/fixed/schur_FIX.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" +#include "opus/silk/SigProc_FIX.h" /* Faster than schur64(), but much less accurate. */ /* uses SMLAWB(), requiring armv5E and higher. */ diff --git a/drivers/opus/silk/fixed/solve_LS_FIX.c b/drivers/opus/silk/fixed/solve_LS_FIX.c index 5d0928493..6e8afaaa8 100644 --- a/drivers/opus/silk/fixed/solve_LS_FIX.c +++ b/drivers/opus/silk/fixed/solve_LS_FIX.c @@ -25,13 +25,13 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "main_FIX.h" -#include "stack_alloc.h" -#include "tuning_parameters.h" +#include "opus/silk/fixed/main_FIX.h" +#include "opus/celt/stack_alloc.h" +#include "opus/silk/tuning_parameters.h" /*****************************/ /* Internal function headers */ diff --git a/drivers/opus/silk/fixed/structs_FIX.h b/drivers/opus/silk/fixed/structs_FIX.h index 0284dfa27..21eab05f0 100644 --- a/drivers/opus/silk/fixed/structs_FIX.h +++ b/drivers/opus/silk/fixed/structs_FIX.h @@ -28,9 +28,9 @@ POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_STRUCTS_FIX_H #define SILK_STRUCTS_FIX_H -#include "typedef.h" -#include "silk_main.h" -#include "structs.h" +#include "opus/silk/typedef.h" +#include "opus/silk/silk_main.h" +#include "opus/silk/structs.h" #ifdef __cplusplus extern "C" diff --git a/drivers/opus/silk/fixed/vector_ops_FIX.c b/drivers/opus/silk/fixed/vector_ops_FIX.c index b1e422eb9..c2725194e 100644 --- a/drivers/opus/silk/fixed/vector_ops_FIX.c +++ b/drivers/opus/silk/fixed/vector_ops_FIX.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" +#include "opus/silk/SigProc_FIX.h" /* Copy and multiply a vector by a constant */ void silk_scale_copy_vector16( diff --git a/drivers/opus/silk/fixed/warped_autocorrelation_FIX.c b/drivers/opus/silk/fixed/warped_autocorrelation_FIX.c index 3f04df775..4e5a7fee5 100644 --- a/drivers/opus/silk/fixed/warped_autocorrelation_FIX.c +++ b/drivers/opus/silk/fixed/warped_autocorrelation_FIX.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "main_FIX.h" +#include "opus/silk/fixed/main_FIX.h" #define QC 10 #define QS 14 diff --git a/drivers/opus/silk/float/LPC_analysis_filter_FLP.c b/drivers/opus/silk/float/LPC_analysis_filter_FLP.c index 8d26c093b..438b704fe 100644 --- a/drivers/opus/silk/float/LPC_analysis_filter_FLP.c +++ b/drivers/opus/silk/float/LPC_analysis_filter_FLP.c @@ -25,12 +25,12 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif #include <stdlib.h> -#include "main_FLP.h" +#include "opus/silk/float/main_FLP.h" /************************************************/ /* LPC analysis filter */ diff --git a/drivers/opus/silk/float/LPC_inv_pred_gain_FLP.c b/drivers/opus/silk/float/LPC_inv_pred_gain_FLP.c index 968edfb18..2e86e269e 100644 --- a/drivers/opus/silk/float/LPC_inv_pred_gain_FLP.c +++ b/drivers/opus/silk/float/LPC_inv_pred_gain_FLP.c @@ -25,12 +25,12 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" -#include "SigProc_FLP.h" +#include "opus/silk/SigProc_FIX.h" +#include "opus/silk/float/SigProc_FLP.h" #define RC_THRESHOLD 0.9999f diff --git a/drivers/opus/silk/float/LTP_analysis_filter_FLP.c b/drivers/opus/silk/float/LTP_analysis_filter_FLP.c index fc729e99b..5919ceb92 100644 --- a/drivers/opus/silk/float/LTP_analysis_filter_FLP.c +++ b/drivers/opus/silk/float/LTP_analysis_filter_FLP.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "main_FLP.h" +#include "opus/silk/float/main_FLP.h" void silk_LTP_analysis_filter_FLP( silk_float *LTP_res, /* O LTP res MAX_NB_SUBFR*(pre_lgth+subfr_lngth) */ diff --git a/drivers/opus/silk/float/LTP_scale_ctrl_FLP.c b/drivers/opus/silk/float/LTP_scale_ctrl_FLP.c index 60e1119d5..c952d810a 100644 --- a/drivers/opus/silk/float/LTP_scale_ctrl_FLP.c +++ b/drivers/opus/silk/float/LTP_scale_ctrl_FLP.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "main_FLP.h" +#include "opus/silk/float/main_FLP.h" void silk_LTP_scale_ctrl_FLP( silk_encoder_state_FLP *psEnc, /* I/O Encoder state FLP */ diff --git a/drivers/opus/silk/float/SigProc_FLP.h b/drivers/opus/silk/float/SigProc_FLP.h index f0cb3733b..9b14f24f2 100644 --- a/drivers/opus/silk/float/SigProc_FLP.h +++ b/drivers/opus/silk/float/SigProc_FLP.h @@ -28,8 +28,8 @@ POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_SIGPROC_FLP_H #define SILK_SIGPROC_FLP_H -#include "SigProc_FIX.h" -#include "float_cast.h" +#include "opus/silk/SigProc_FIX.h" +#include "opus/celt/float_cast.h" #include <math.h> #ifdef __cplusplus diff --git a/drivers/opus/silk/float/apply_sine_window_FLP.c b/drivers/opus/silk/float/apply_sine_window_FLP.c index d904585d1..e8aa197bb 100644 --- a/drivers/opus/silk/float/apply_sine_window_FLP.c +++ b/drivers/opus/silk/float/apply_sine_window_FLP.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "main_FLP.h" +#include "opus/silk/float/main_FLP.h" /* Apply sine window to signal vector */ /* Window types: */ diff --git a/drivers/opus/silk/float/autocorrelation_FLP.c b/drivers/opus/silk/float/autocorrelation_FLP.c index 192a001b1..f4b90ff32 100644 --- a/drivers/opus/silk/float/autocorrelation_FLP.c +++ b/drivers/opus/silk/float/autocorrelation_FLP.c @@ -25,12 +25,12 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "typedef.h" -#include "SigProc_FLP.h" +#include "opus/silk/typedef.h" +#include "opus/silk/float/SigProc_FLP.h" /* compute autocorrelation */ void silk_autocorrelation_FLP( diff --git a/drivers/opus/silk/float/burg_modified_FLP.c b/drivers/opus/silk/float/burg_modified_FLP.c index 0f30ca228..5a1633424 100644 --- a/drivers/opus/silk/float/burg_modified_FLP.c +++ b/drivers/opus/silk/float/burg_modified_FLP.c @@ -25,13 +25,13 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "SigProc_FLP.h" -#include "tuning_parameters.h" -#include "define.h" +#include "opus/silk/float/SigProc_FLP.h" +#include "opus/silk/tuning_parameters.h" +#include "opus/silk/define.h" #define MAX_FRAME_SIZE 384 /* subfr_length * nb_subfr = ( 0.005 * 16000 + 16 ) * 4 = 384*/ diff --git a/drivers/opus/silk/float/bwexpander_FLP.c b/drivers/opus/silk/float/bwexpander_FLP.c index 86154dc3f..b3de4f645 100644 --- a/drivers/opus/silk/float/bwexpander_FLP.c +++ b/drivers/opus/silk/float/bwexpander_FLP.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "SigProc_FLP.h" +#include "opus/silk/float/SigProc_FLP.h" /* Chirp (bw expand) LP AR filter */ void silk_bwexpander_FLP( diff --git a/drivers/opus/silk/float/corrMatrix_FLP.c b/drivers/opus/silk/float/corrMatrix_FLP.c index e193c98f1..551f8578d 100644 --- a/drivers/opus/silk/float/corrMatrix_FLP.c +++ b/drivers/opus/silk/float/corrMatrix_FLP.c @@ -25,15 +25,15 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif /********************************************************************** * Correlation matrix computations for LS estimate. **********************************************************************/ -#include "main_FLP.h" +#include "opus/silk/float/main_FLP.h" /* Calculates correlation vector X'*t */ void silk_corrVector_FLP( diff --git a/drivers/opus/silk/float/encode_frame_FLP.c b/drivers/opus/silk/float/encode_frame_FLP.c index 90e5357ce..c5973b892 100644 --- a/drivers/opus/silk/float/encode_frame_FLP.c +++ b/drivers/opus/silk/float/encode_frame_FLP.c @@ -25,12 +25,12 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "main_FLP.h" -#include "tuning_parameters.h" +#include "opus/silk/float/main_FLP.h" +#include "opus/silk/tuning_parameters.h" /* Low Bitrate Redundancy (LBRR) encoding. Reuse all parameters but encode with lower bitrate */ static OPUS_INLINE void silk_LBRR_encode_FLP( diff --git a/drivers/opus/silk/float/energy_FLP.c b/drivers/opus/silk/float/energy_FLP.c index d441526df..9c6fad48d 100644 --- a/drivers/opus/silk/float/energy_FLP.c +++ b/drivers/opus/silk/float/energy_FLP.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "SigProc_FLP.h" +#include "opus/silk/float/SigProc_FLP.h" /* sum of squares of a silk_float array, with result as double */ double silk_energy_FLP( diff --git a/drivers/opus/silk/float/find_LPC_FLP.c b/drivers/opus/silk/float/find_LPC_FLP.c index 212f2de3c..2b8c54388 100644 --- a/drivers/opus/silk/float/find_LPC_FLP.c +++ b/drivers/opus/silk/float/find_LPC_FLP.c @@ -25,13 +25,13 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "define.h" -#include "main_FLP.h" -#include "tuning_parameters.h" +#include "opus/silk/define.h" +#include "opus/silk/float/main_FLP.h" +#include "opus/silk/tuning_parameters.h" /* LPC analysis */ void silk_find_LPC_FLP( diff --git a/drivers/opus/silk/float/find_LTP_FLP.c b/drivers/opus/silk/float/find_LTP_FLP.c index 5c62851f2..2f66de468 100644 --- a/drivers/opus/silk/float/find_LTP_FLP.c +++ b/drivers/opus/silk/float/find_LTP_FLP.c @@ -25,12 +25,12 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "main_FLP.h" -#include "tuning_parameters.h" +#include "opus/silk/float/main_FLP.h" +#include "opus/silk/tuning_parameters.h" void silk_find_LTP_FLP( silk_float b[ MAX_NB_SUBFR * LTP_ORDER ], /* O LTP coefs */ diff --git a/drivers/opus/silk/float/find_pitch_lags_FLP.c b/drivers/opus/silk/float/find_pitch_lags_FLP.c index d74d5941b..a2d582c73 100644 --- a/drivers/opus/silk/float/find_pitch_lags_FLP.c +++ b/drivers/opus/silk/float/find_pitch_lags_FLP.c @@ -25,13 +25,13 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif #include <stdlib.h> -#include "main_FLP.h" -#include "tuning_parameters.h" +#include "opus/silk/float/main_FLP.h" +#include "opus/silk/tuning_parameters.h" void silk_find_pitch_lags_FLP( silk_encoder_state_FLP *psEnc, /* I/O Encoder state FLP */ diff --git a/drivers/opus/silk/float/find_pred_coefs_FLP.c b/drivers/opus/silk/float/find_pred_coefs_FLP.c index e0d8804cc..61eead757 100644 --- a/drivers/opus/silk/float/find_pred_coefs_FLP.c +++ b/drivers/opus/silk/float/find_pred_coefs_FLP.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "main_FLP.h" +#include "opus/silk/float/main_FLP.h" /* Find LPC and LTP coefficients */ void silk_find_pred_coefs_FLP( diff --git a/drivers/opus/silk/float/inner_product_FLP.c b/drivers/opus/silk/float/inner_product_FLP.c index 57acf5ffb..e5f030844 100644 --- a/drivers/opus/silk/float/inner_product_FLP.c +++ b/drivers/opus/silk/float/inner_product_FLP.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "SigProc_FLP.h" +#include "opus/silk/float/SigProc_FLP.h" /* inner product of two silk_float arrays, with result as double */ double silk_inner_product_FLP( diff --git a/drivers/opus/silk/float/k2a_FLP.c b/drivers/opus/silk/float/k2a_FLP.c index a668a3212..71dc4c3c4 100644 --- a/drivers/opus/silk/float/k2a_FLP.c +++ b/drivers/opus/silk/float/k2a_FLP.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "SigProc_FLP.h" +#include "opus/silk/float/SigProc_FLP.h" /* step up function, converts reflection coefficients to prediction coefficients */ void silk_k2a_FLP( diff --git a/drivers/opus/silk/float/levinsondurbin_FLP.c b/drivers/opus/silk/float/levinsondurbin_FLP.c index 64aaf0fb2..8fbca230a 100644 --- a/drivers/opus/silk/float/levinsondurbin_FLP.c +++ b/drivers/opus/silk/float/levinsondurbin_FLP.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "SigProc_FLP.h" +#include "opus/silk/float/SigProc_FLP.h" /* Solve the normal equations using the Levinson-Durbin recursion */ silk_float silk_levinsondurbin_FLP( /* O prediction error energy */ diff --git a/drivers/opus/silk/float/main_FLP.h b/drivers/opus/silk/float/main_FLP.h index 92d6ec3df..4ec8ddeef 100644 --- a/drivers/opus/silk/float/main_FLP.h +++ b/drivers/opus/silk/float/main_FLP.h @@ -28,13 +28,13 @@ POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_MAIN_FLP_H #define SILK_MAIN_FLP_H -#include "SigProc_FLP.h" -#include "SigProc_FIX.h" -#include "structs_FLP.h" -#include "silk_main.h" -#include "define.h" -#include "debug.h" -#include "entenc.h" +#include "opus/silk/float/SigProc_FLP.h" +#include "opus/silk/SigProc_FIX.h" +#include "opus/silk/float/structs_FLP.h" +#include "opus/silk/silk_main.h" +#include "opus/silk/define.h" +#include "opus/silk/debug.h" +#include "opus/celt/entenc.h" #ifdef __cplusplus extern "C" diff --git a/drivers/opus/silk/float/noise_shape_analysis_FLP.c b/drivers/opus/silk/float/noise_shape_analysis_FLP.c index f80e0b3d0..5d8bc6332 100644 --- a/drivers/opus/silk/float/noise_shape_analysis_FLP.c +++ b/drivers/opus/silk/float/noise_shape_analysis_FLP.c @@ -25,12 +25,12 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "main_FLP.h" -#include "tuning_parameters.h" +#include "opus/silk/float/main_FLP.h" +#include "opus/silk/tuning_parameters.h" /* Compute gain to make warped filter coefficients have a zero mean log frequency response on a */ /* non-warped frequency scale. (So that it can be implemented with a minimum-phase monic filter.) */ diff --git a/drivers/opus/silk/float/pitch_analysis_core_FLP.c b/drivers/opus/silk/float/pitch_analysis_core_FLP.c index 2588094c4..2689c5008 100644 --- a/drivers/opus/silk/float/pitch_analysis_core_FLP.c +++ b/drivers/opus/silk/float/pitch_analysis_core_FLP.c @@ -25,17 +25,17 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif /***************************************************************************** * Pitch analyser function ******************************************************************************/ -#include "SigProc_FLP.h" -#include "SigProc_FIX.h" -#include "pitch_est_defines.h" -#include "pitch.h" +#include "opus/silk/float/SigProc_FLP.h" +#include "opus/silk/SigProc_FIX.h" +#include "opus/silk/pitch_est_defines.h" +#include "opus/celt/pitch.h" #define SCRATCH_SIZE 22 diff --git a/drivers/opus/silk/float/prefilter_FLP.c b/drivers/opus/silk/float/prefilter_FLP.c index aa43852ff..0298ef2f8 100644 --- a/drivers/opus/silk/float/prefilter_FLP.c +++ b/drivers/opus/silk/float/prefilter_FLP.c @@ -25,12 +25,12 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "main_FLP.h" -#include "tuning_parameters.h" +#include "opus/silk/float/main_FLP.h" +#include "opus/silk/tuning_parameters.h" /* * Prefilter for finding Quantizer input signal diff --git a/drivers/opus/silk/float/process_gains_FLP.c b/drivers/opus/silk/float/process_gains_FLP.c index e83d05552..bd5e7ee7a 100644 --- a/drivers/opus/silk/float/process_gains_FLP.c +++ b/drivers/opus/silk/float/process_gains_FLP.c @@ -25,12 +25,12 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "main_FLP.h" -#include "tuning_parameters.h" +#include "opus/silk/float/main_FLP.h" +#include "opus/silk/tuning_parameters.h" /* Processing of gains */ void silk_process_gains_FLP( diff --git a/drivers/opus/silk/float/regularize_correlations_FLP.c b/drivers/opus/silk/float/regularize_correlations_FLP.c index f056eadc5..397e45b10 100644 --- a/drivers/opus/silk/float/regularize_correlations_FLP.c +++ b/drivers/opus/silk/float/regularize_correlations_FLP.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "main_FLP.h" +#include "opus/silk/float/main_FLP.h" /* Add noise to matrix diagonal */ void silk_regularize_correlations_FLP( diff --git a/drivers/opus/silk/float/residual_energy_FLP.c b/drivers/opus/silk/float/residual_energy_FLP.c index 011efcef0..50bc728b7 100644 --- a/drivers/opus/silk/float/residual_energy_FLP.c +++ b/drivers/opus/silk/float/residual_energy_FLP.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "main_FLP.h" +#include "opus/silk/float/main_FLP.h" #define MAX_ITERATIONS_RESIDUAL_NRG 10 #define REGULARIZATION_FACTOR 1e-8f diff --git a/drivers/opus/silk/float/scale_copy_vector_FLP.c b/drivers/opus/silk/float/scale_copy_vector_FLP.c index 7578d4489..8c5bfadb3 100644 --- a/drivers/opus/silk/float/scale_copy_vector_FLP.c +++ b/drivers/opus/silk/float/scale_copy_vector_FLP.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "SigProc_FLP.h" +#include "opus/silk/float/SigProc_FLP.h" /* copy and multiply a vector by a constant */ void silk_scale_copy_vector_FLP( diff --git a/drivers/opus/silk/float/scale_vector_FLP.c b/drivers/opus/silk/float/scale_vector_FLP.c index 03345d519..191b3d604 100644 --- a/drivers/opus/silk/float/scale_vector_FLP.c +++ b/drivers/opus/silk/float/scale_vector_FLP.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "SigProc_FLP.h" +#include "opus/silk/float/SigProc_FLP.h" /* multiply a vector by a constant */ void silk_scale_vector_FLP( diff --git a/drivers/opus/silk/float/schur_FLP.c b/drivers/opus/silk/float/schur_FLP.c index 76b87f130..631dbe093 100644 --- a/drivers/opus/silk/float/schur_FLP.c +++ b/drivers/opus/silk/float/schur_FLP.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "SigProc_FLP.h" +#include "opus/silk/float/SigProc_FLP.h" silk_float silk_schur_FLP( /* O returns residual energy */ silk_float refl_coef[], /* O reflection coefficients (length order) */ diff --git a/drivers/opus/silk/float/solve_LS_FLP.c b/drivers/opus/silk/float/solve_LS_FLP.c index 9fd962b33..b3757ce03 100644 --- a/drivers/opus/silk/float/solve_LS_FLP.c +++ b/drivers/opus/silk/float/solve_LS_FLP.c @@ -25,12 +25,12 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "main_FLP.h" -#include "tuning_parameters.h" +#include "opus/silk/float/main_FLP.h" +#include "opus/silk/tuning_parameters.h" /********************************************************************** * LDL Factorisation. Finds the upper triangular matrix L and the diagonal diff --git a/drivers/opus/silk/float/sort_FLP.c b/drivers/opus/silk/float/sort_FLP.c index 58ea48511..f2570503a 100644 --- a/drivers/opus/silk/float/sort_FLP.c +++ b/drivers/opus/silk/float/sort_FLP.c @@ -25,16 +25,16 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif /* Insertion sort (fast for already almost sorted arrays): */ /* Best case: O(n) for an already sorted array */ /* Worst case: O(n^2) for an inversely sorted array */ -#include "typedef.h" -#include "SigProc_FLP.h" +#include "opus/silk/typedef.h" +#include "opus/silk/float/SigProc_FLP.h" void silk_insertion_sort_decreasing_FLP( silk_float *a, /* I/O Unsorted / Sorted vector */ diff --git a/drivers/opus/silk/float/structs_FLP.h b/drivers/opus/silk/float/structs_FLP.h index 4082914d9..798aec2f4 100644 --- a/drivers/opus/silk/float/structs_FLP.h +++ b/drivers/opus/silk/float/structs_FLP.h @@ -28,9 +28,9 @@ POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_STRUCTS_FLP_H #define SILK_STRUCTS_FLP_H -#include "typedef.h" -#include "silk_main.h" -#include "structs.h" +#include "opus/silk/typedef.h" +#include "opus/silk/silk_main.h" +#include "opus/silk/structs.h" #ifdef __cplusplus extern "C" diff --git a/drivers/opus/silk/float/warped_autocorrelation_FLP.c b/drivers/opus/silk/float/warped_autocorrelation_FLP.c index 6075dfe8d..092b998d9 100644 --- a/drivers/opus/silk/float/warped_autocorrelation_FLP.c +++ b/drivers/opus/silk/float/warped_autocorrelation_FLP.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "main_FLP.h" +#include "opus/silk/float/main_FLP.h" /* Autocorrelations for a warped frequency axis */ void silk_warped_autocorrelation_FLP( diff --git a/drivers/opus/silk/float/wrappers_FLP.c b/drivers/opus/silk/float/wrappers_FLP.c index c4e34e557..31586cf2a 100644 --- a/drivers/opus/silk/float/wrappers_FLP.c +++ b/drivers/opus/silk/float/wrappers_FLP.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "main_FLP.h" +#include "opus/silk/float/main_FLP.h" /* Wrappers. Calls flp / fix code */ diff --git a/drivers/opus/silk/gain_quant.c b/drivers/opus/silk/gain_quant.c index e9467198e..e1d9b9112 100644 --- a/drivers/opus/silk/gain_quant.c +++ b/drivers/opus/silk/gain_quant.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "silk_main.h" +#include "opus/silk/silk_main.h" #define OFFSET ( ( MIN_QGAIN_DB * 128 ) / 6 + 16 * 128 ) #define SCALE_Q16 ( ( 65536 * ( N_LEVELS_QGAIN - 1 ) ) / ( ( ( MAX_QGAIN_DB - MIN_QGAIN_DB ) * 128 ) / 6 ) ) diff --git a/drivers/opus/silk/init_decoder.c b/drivers/opus/silk/init_decoder.c index 88c1ff7b4..43fa1f1c3 100644 --- a/drivers/opus/silk/init_decoder.c +++ b/drivers/opus/silk/init_decoder.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "silk_main.h" +#include "opus/silk/silk_main.h" /************************/ /* Init Decoder State */ diff --git a/drivers/opus/silk/init_encoder.c b/drivers/opus/silk/init_encoder.c index baf97d49e..9ba4524b7 100644 --- a/drivers/opus/silk/init_encoder.c +++ b/drivers/opus/silk/init_encoder.c @@ -25,16 +25,16 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif #ifdef OPUS_FIXED_POINT -#include "main_FIX.h" +#include "opus/silk/fixed/main_FIX.h" #else -#include "main_FLP.h" +#include "opus/silk/float/main_FLP.h" #endif -#include "tuning_parameters.h" -#include "cpu_support.h" +#include "opus/silk/tuning_parameters.h" +#include "opus/celt/cpu_support.h" /*********************************/ /* Initialize Silk Encoder state */ diff --git a/drivers/opus/silk/inner_prod_aligned.c b/drivers/opus/silk/inner_prod_aligned.c index d625001db..86ecf463a 100644 --- a/drivers/opus/silk/inner_prod_aligned.c +++ b/drivers/opus/silk/inner_prod_aligned.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" +#include "opus/silk/SigProc_FIX.h" opus_int32 silk_inner_prod_aligned_scale( const opus_int16 *const inVec1, /* I input vector 1 */ diff --git a/drivers/opus/silk/interpolate.c b/drivers/opus/silk/interpolate.c index d5df0fedd..26c44de49 100644 --- a/drivers/opus/silk/interpolate.c +++ b/drivers/opus/silk/interpolate.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "silk_main.h" +#include "opus/silk/silk_main.h" /* Interpolate two vectors */ void silk_interpolate( diff --git a/drivers/opus/silk/lin2log.c b/drivers/opus/silk/lin2log.c index 77bfc8c8a..ea11f33dd 100644 --- a/drivers/opus/silk/lin2log.c +++ b/drivers/opus/silk/lin2log.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" +#include "opus/silk/SigProc_FIX.h" /* Approximation of 128 * log2() (very close inverse of silk_log2lin()) */ /* Convert input to a log scale */ opus_int32 silk_lin2log( diff --git a/drivers/opus/silk/log2lin.c b/drivers/opus/silk/log2lin.c index 0ed2a12ef..0a33ca48f 100644 --- a/drivers/opus/silk/log2lin.c +++ b/drivers/opus/silk/log2lin.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" +#include "opus/silk/SigProc_FIX.h" /* Approximation of 2^() (very close inverse of silk_lin2log()) */ /* Convert input to a linear scale */ diff --git a/drivers/opus/silk/macros.h b/drivers/opus/silk/macros.h index 6cf2e93db..8986dc8f8 100644 --- a/drivers/opus/silk/macros.h +++ b/drivers/opus/silk/macros.h @@ -28,10 +28,10 @@ POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_MACROS_H #define SILK_MACROS_H -#include "opus_config.h" +#include "opus/opus_config.h" -#include "opus_types.h" -#include "opus_defines.h" +#include "opus/opus_types.h" +#include "opus/opus_defines.h" /* This is an OPUS_INLINE header file for general platform. */ @@ -77,7 +77,7 @@ POSSIBILITY OF SUCH DAMAGE. (( (a) & ((b)^0x80000000) & 0x80000000) ? silk_int32_MIN : (a)-(b)) : \ ((((a)^0x80000000) & (b) & 0x80000000) ? silk_int32_MAX : (a)-(b)) ) -#include "ecintrin.h" +#include "opus/celt/ecintrin.h" static OPUS_INLINE opus_int32 silk_CLZ16(opus_int16 in16) { diff --git a/drivers/opus/silk/pitch_est_defines.h b/drivers/opus/silk/pitch_est_defines.h index e1e4b5d76..e2d9e517c 100644 --- a/drivers/opus/silk/pitch_est_defines.h +++ b/drivers/opus/silk/pitch_est_defines.h @@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_PE_DEFINES_H #define SILK_PE_DEFINES_H -#include "SigProc_FIX.h" +#include "opus/silk/SigProc_FIX.h" /********************************************************/ /* Definitions for pitch estimator */ diff --git a/drivers/opus/silk/pitch_est_tables.c b/drivers/opus/silk/pitch_est_tables.c index 97ddbab01..7555f5b04 100644 --- a/drivers/opus/silk/pitch_est_tables.c +++ b/drivers/opus/silk/pitch_est_tables.c @@ -25,12 +25,12 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "typedef.h" -#include "pitch_est_defines.h" +#include "opus/silk/typedef.h" +#include "opus/silk/pitch_est_defines.h" const opus_int8 silk_CB_lags_stage2_10_ms[ PE_MAX_NB_SUBFR >> 1][ PE_NB_CBKS_STAGE2_10MS ] = { diff --git a/drivers/opus/silk/process_NLSFs.c b/drivers/opus/silk/process_NLSFs.c index 0193fda1f..9e6ebf827 100644 --- a/drivers/opus/silk/process_NLSFs.c +++ b/drivers/opus/silk/process_NLSFs.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "silk_main.h" +#include "opus/silk/silk_main.h" /* Limit, stabilize, convert and quantize NLSFs */ void silk_process_NLSFs( diff --git a/drivers/opus/silk/quant_LTP_gains.c b/drivers/opus/silk/quant_LTP_gains.c index 34bcd3acd..f6fff470f 100644 --- a/drivers/opus/silk/quant_LTP_gains.c +++ b/drivers/opus/silk/quant_LTP_gains.c @@ -25,12 +25,12 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "silk_main.h" -#include "tuning_parameters.h" +#include "opus/silk/silk_main.h" +#include "opus/silk/tuning_parameters.h" void silk_quant_LTP_gains( opus_int16 B_Q14[ MAX_NB_SUBFR * LTP_ORDER ], /* I/O (un)quantized LTP gains */ diff --git a/drivers/opus/silk/resampler.c b/drivers/opus/silk/resampler.c index 14b185c45..dde8fcddb 100644 --- a/drivers/opus/silk/resampler.c +++ b/drivers/opus/silk/resampler.c @@ -25,8 +25,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif /* @@ -47,7 +47,7 @@ POSSIBILITY OF SUCH DAMAGE. * AF -> AR2 filter followed by FIR interpolation */ -#include "resampler_private.h" +#include "opus/silk/resampler_private.h" /* Tables with delay compensation values to equalize total delay for different modes */ static const opus_int8 delay_matrix_enc[ 5 ][ 3 ] = { diff --git a/drivers/opus/silk/resampler_down2.c b/drivers/opus/silk/resampler_down2.c index 5c4b27759..dbc962c5e 100644 --- a/drivers/opus/silk/resampler_down2.c +++ b/drivers/opus/silk/resampler_down2.c @@ -25,12 +25,12 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" -#include "resampler_rom.h" +#include "opus/silk/SigProc_FIX.h" +#include "opus/silk/resampler_rom.h" /* Downsample by a factor 2 */ void silk_resampler_down2( diff --git a/drivers/opus/silk/resampler_down2_3.c b/drivers/opus/silk/resampler_down2_3.c index 2733072fe..6ff32ff33 100644 --- a/drivers/opus/silk/resampler_down2_3.c +++ b/drivers/opus/silk/resampler_down2_3.c @@ -25,13 +25,13 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" -#include "resampler_private.h" -#include "stack_alloc.h" +#include "opus/silk/SigProc_FIX.h" +#include "opus/silk/resampler_private.h" +#include "opus/celt/stack_alloc.h" #define ORDER_FIR 4 diff --git a/drivers/opus/silk/resampler_private.h b/drivers/opus/silk/resampler_private.h index 422a7d9d9..5c0ee110f 100644 --- a/drivers/opus/silk/resampler_private.h +++ b/drivers/opus/silk/resampler_private.h @@ -32,9 +32,9 @@ POSSIBILITY OF SUCH DAMAGE. extern "C" { #endif -#include "SigProc_FIX.h" -#include "resampler_structs.h" -#include "resampler_rom.h" +#include "opus/silk/SigProc_FIX.h" +#include "opus/silk/resampler_structs.h" +#include "opus/silk/resampler_rom.h" /* Number of input samples to process in the inner loop */ #define RESAMPLER_MAX_BATCH_SIZE_MS 10 diff --git a/drivers/opus/silk/resampler_private_AR2.c b/drivers/opus/silk/resampler_private_AR2.c index 84157d17b..e04319da4 100644 --- a/drivers/opus/silk/resampler_private_AR2.c +++ b/drivers/opus/silk/resampler_private_AR2.c @@ -25,12 +25,12 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" -#include "resampler_private.h" +#include "opus/silk/SigProc_FIX.h" +#include "opus/silk/resampler_private.h" /* Second order AR filter with single delay elements */ void silk_resampler_private_AR2( diff --git a/drivers/opus/silk/resampler_private_IIR_FIR.c b/drivers/opus/silk/resampler_private_IIR_FIR.c index f45c3e741..1d71ebd89 100644 --- a/drivers/opus/silk/resampler_private_IIR_FIR.c +++ b/drivers/opus/silk/resampler_private_IIR_FIR.c @@ -25,13 +25,13 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" -#include "resampler_private.h" -#include "stack_alloc.h" +#include "opus/silk/SigProc_FIX.h" +#include "opus/silk/resampler_private.h" +#include "opus/celt/stack_alloc.h" static OPUS_INLINE opus_int16 *silk_resampler_private_IIR_FIR_INTERPOL( opus_int16 *out, diff --git a/drivers/opus/silk/resampler_private_down_FIR.c b/drivers/opus/silk/resampler_private_down_FIR.c index f4de30354..739c91db2 100644 --- a/drivers/opus/silk/resampler_private_down_FIR.c +++ b/drivers/opus/silk/resampler_private_down_FIR.c @@ -25,13 +25,13 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" -#include "resampler_private.h" -#include "stack_alloc.h" +#include "opus/silk/SigProc_FIX.h" +#include "opus/silk/resampler_private.h" +#include "opus/celt/stack_alloc.h" static OPUS_INLINE opus_int16 *silk_resampler_private_down_FIR_INTERPOL( opus_int16 *out, diff --git a/drivers/opus/silk/resampler_private_up2_HQ.c b/drivers/opus/silk/resampler_private_up2_HQ.c index 39f481845..a2b6ad432 100644 --- a/drivers/opus/silk/resampler_private_up2_HQ.c +++ b/drivers/opus/silk/resampler_private_up2_HQ.c @@ -25,12 +25,12 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" -#include "resampler_private.h" +#include "opus/silk/SigProc_FIX.h" +#include "opus/silk/resampler_private.h" /* Upsample by a factor 2, high quality */ /* Uses 2nd order allpass filters for the 2x upsampling, followed by a */ diff --git a/drivers/opus/silk/resampler_rom.c b/drivers/opus/silk/resampler_rom.c index 0098e18ba..d56408705 100644 --- a/drivers/opus/silk/resampler_rom.c +++ b/drivers/opus/silk/resampler_rom.c @@ -25,14 +25,14 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif /* Filter coefficients for IIR/FIR polyphase resampling * * Total size: 179 Words (358 Bytes) */ -#include "resampler_private.h" +#include "opus/silk/resampler_private.h" /* Matlab code for the notch filter coefficients: */ /* B = [1, 0.147, 1]; A = [1, 0.107, 0.89]; G = 0.93; freqz(G * B, A, 2^14, 16e3); axis([0, 8000, -10, 1]) */ diff --git a/drivers/opus/silk/resampler_rom.h b/drivers/opus/silk/resampler_rom.h index 490b3388d..2fa586ebf 100644 --- a/drivers/opus/silk/resampler_rom.h +++ b/drivers/opus/silk/resampler_rom.h @@ -33,8 +33,8 @@ extern "C" { #endif -#include "typedef.h" -#include "resampler_structs.h" +#include "opus/silk/typedef.h" +#include "opus/silk/resampler_structs.h" #define RESAMPLER_DOWN_ORDER_FIR0 18 #define RESAMPLER_DOWN_ORDER_FIR1 24 diff --git a/drivers/opus/silk/shell_coder.c b/drivers/opus/silk/shell_coder.c index 79e392bd9..cd18ed638 100644 --- a/drivers/opus/silk/shell_coder.c +++ b/drivers/opus/silk/shell_coder.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "silk_main.h" +#include "opus/silk/silk_main.h" /* shell coder; pulse-subframe length is hardcoded */ diff --git a/drivers/opus/silk/sigm_Q15.c b/drivers/opus/silk/sigm_Q15.c index 2df5b9695..4c7825047 100644 --- a/drivers/opus/silk/sigm_Q15.c +++ b/drivers/opus/silk/sigm_Q15.c @@ -25,13 +25,13 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif /* Approximate sigmoid function */ -#include "SigProc_FIX.h" +#include "opus/silk/SigProc_FIX.h" /* fprintf(1, '%d, ', round(1024 * ([1 ./ (1 + exp(-(1:5))), 1] - 1 ./ (1 + exp(-(0:5)))))); */ static const opus_int32 sigm_LUT_slope_Q10[ 6 ] = { diff --git a/drivers/opus/silk/silk_main.h b/drivers/opus/silk/silk_main.h index 2bdf89784..14671dcf7 100644 --- a/drivers/opus/silk/silk_main.h +++ b/drivers/opus/silk/silk_main.h @@ -28,15 +28,15 @@ POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_MAIN_H #define SILK_MAIN_H -#include "SigProc_FIX.h" -#include "define.h" -#include "structs.h" -#include "tables.h" -#include "PLC.h" -#include "control.h" -#include "debug.h" -#include "entenc.h" -#include "entdec.h" +#include "opus/silk/SigProc_FIX.h" +#include "opus/silk/define.h" +#include "opus/silk/structs.h" +#include "opus/silk/tables.h" +#include "opus/silk/PLC.h" +#include "opus/silk/control.h" +#include "opus/silk/debug.h" +#include "opus/celt/entenc.h" +#include "opus/celt/entdec.h" /* Convert Left/Right stereo signal to adaptive Mid/Side representation */ void silk_stereo_LR_to_MS( diff --git a/drivers/opus/silk/sort.c b/drivers/opus/silk/sort.c index 5e9ba0861..495292ad5 100644 --- a/drivers/opus/silk/sort.c +++ b/drivers/opus/silk/sort.c @@ -25,8 +25,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif /* Insertion sort (fast for already almost sorted arrays): */ @@ -35,7 +35,7 @@ POSSIBILITY OF SUCH DAMAGE. /* */ /* Shell short: http://en.wikipedia.org/wiki/Shell_sort */ -#include "SigProc_FIX.h" +#include "opus/silk/SigProc_FIX.h" void silk_insertion_sort_increasing( opus_int32 *a, /* I/O Unsorted / Sorted vector */ diff --git a/drivers/opus/silk/stereo_LR_to_MS.c b/drivers/opus/silk/stereo_LR_to_MS.c index 678f46984..e17a36046 100644 --- a/drivers/opus/silk/stereo_LR_to_MS.c +++ b/drivers/opus/silk/stereo_LR_to_MS.c @@ -25,12 +25,12 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "silk_main.h" -#include "stack_alloc.h" +#include "opus/silk/silk_main.h" +#include "opus/celt/stack_alloc.h" /* Convert Left/Right stereo signal to adaptive Mid/Side representation */ void silk_stereo_LR_to_MS( diff --git a/drivers/opus/silk/stereo_MS_to_LR.c b/drivers/opus/silk/stereo_MS_to_LR.c index 34f43cf79..dddb62c78 100644 --- a/drivers/opus/silk/stereo_MS_to_LR.c +++ b/drivers/opus/silk/stereo_MS_to_LR.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "silk_main.h" +#include "opus/silk/silk_main.h" /* Convert adaptive Mid/Side representation to Left/Right stereo signal */ void silk_stereo_MS_to_LR( diff --git a/drivers/opus/silk/stereo_decode_pred.c b/drivers/opus/silk/stereo_decode_pred.c index 56d94e56f..d54faf137 100644 --- a/drivers/opus/silk/stereo_decode_pred.c +++ b/drivers/opus/silk/stereo_decode_pred.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "silk_main.h" +#include "opus/silk/silk_main.h" /* Decode mid/side predictors */ void silk_stereo_decode_pred( diff --git a/drivers/opus/silk/stereo_encode_pred.c b/drivers/opus/silk/stereo_encode_pred.c index bfe75b08e..d68922cf0 100644 --- a/drivers/opus/silk/stereo_encode_pred.c +++ b/drivers/opus/silk/stereo_encode_pred.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "silk_main.h" +#include "opus/silk/silk_main.h" /* Entropy code the mid/side quantization indices */ void silk_stereo_encode_pred( diff --git a/drivers/opus/silk/stereo_find_predictor.c b/drivers/opus/silk/stereo_find_predictor.c index 266293dff..1f529b28d 100644 --- a/drivers/opus/silk/stereo_find_predictor.c +++ b/drivers/opus/silk/stereo_find_predictor.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "silk_main.h" +#include "opus/silk/silk_main.h" /* Find least-squares prediction gain for one signal based on another and quantize it */ opus_int32 silk_stereo_find_predictor( /* O Returns predictor in Q13 */ diff --git a/drivers/opus/silk/stereo_quant_pred.c b/drivers/opus/silk/stereo_quant_pred.c index 834020d71..3a4d9b31d 100644 --- a/drivers/opus/silk/stereo_quant_pred.c +++ b/drivers/opus/silk/stereo_quant_pred.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "silk_main.h" +#include "opus/silk/silk_main.h" /* Quantize mid/side predictors */ void silk_stereo_quant_pred( diff --git a/drivers/opus/silk/structs.h b/drivers/opus/silk/structs.h index 1826b36a8..c8c5dae84 100644 --- a/drivers/opus/silk/structs.h +++ b/drivers/opus/silk/structs.h @@ -28,11 +28,11 @@ POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_STRUCTS_H #define SILK_STRUCTS_H -#include "typedef.h" -#include "SigProc_FIX.h" -#include "define.h" -#include "entenc.h" -#include "entdec.h" +#include "opus/silk/typedef.h" +#include "opus/silk/SigProc_FIX.h" +#include "opus/silk/define.h" +#include "opus/celt/entenc.h" +#include "opus/celt/entdec.h" #ifdef __cplusplus extern "C" diff --git a/drivers/opus/silk/sum_sqr_shift.c b/drivers/opus/silk/sum_sqr_shift.c index 8ec27f8a0..7e2a97b53 100644 --- a/drivers/opus/silk/sum_sqr_shift.c +++ b/drivers/opus/silk/sum_sqr_shift.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" +#include "opus/silk/SigProc_FIX.h" /* Compute number of bits to right shift the sum of squares of a vector */ /* of int16s to make it fit in an int32 */ diff --git a/drivers/opus/silk/table_LSF_cos.c b/drivers/opus/silk/table_LSF_cos.c index 674b6a03e..818a532c2 100644 --- a/drivers/opus/silk/table_LSF_cos.c +++ b/drivers/opus/silk/table_LSF_cos.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "tables.h" +#include "opus/silk/tables.h" /* Cosine approximation table for LSF conversion */ /* Q12 values (even) */ diff --git a/drivers/opus/silk/tables.h b/drivers/opus/silk/tables.h index a91431e85..0dc7c3754 100644 --- a/drivers/opus/silk/tables.h +++ b/drivers/opus/silk/tables.h @@ -28,8 +28,8 @@ POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_TABLES_H #define SILK_TABLES_H -#include "define.h" -#include "structs.h" +#include "opus/silk/define.h" +#include "opus/silk/structs.h" #ifdef __cplusplus extern "C" diff --git a/drivers/opus/silk/tables_LTP.c b/drivers/opus/silk/tables_LTP.c index 56b672db8..6a0569825 100644 --- a/drivers/opus/silk/tables_LTP.c +++ b/drivers/opus/silk/tables_LTP.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "tables.h" +#include "opus/silk/tables.h" const opus_uint8 silk_LTP_per_index_iCDF[3] = { 179, 99, 0 diff --git a/drivers/opus/silk/tables_NLSF_CB_NB_MB.c b/drivers/opus/silk/tables_NLSF_CB_NB_MB.c index ded35eee7..66c2fd403 100644 --- a/drivers/opus/silk/tables_NLSF_CB_NB_MB.c +++ b/drivers/opus/silk/tables_NLSF_CB_NB_MB.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "tables.h" +#include "opus/silk/tables.h" static const opus_uint8 silk_NLSF_CB1_NB_MB_Q8[ 320 ] = { 12, 35, 60, 83, 108, 132, 157, 180, diff --git a/drivers/opus/silk/tables_NLSF_CB_WB.c b/drivers/opus/silk/tables_NLSF_CB_WB.c index d83567ea6..366f1bc88 100644 --- a/drivers/opus/silk/tables_NLSF_CB_WB.c +++ b/drivers/opus/silk/tables_NLSF_CB_WB.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "tables.h" +#include "opus/silk/tables.h" static const opus_uint8 silk_NLSF_CB1_WB_Q8[ 512 ] = { 7, 23, 38, 54, 69, 85, 100, 116, diff --git a/drivers/opus/silk/tables_gain.c b/drivers/opus/silk/tables_gain.c index 6df980616..efb5b899b 100644 --- a/drivers/opus/silk/tables_gain.c +++ b/drivers/opus/silk/tables_gain.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "tables.h" +#include "opus/silk/tables.h" #ifdef __cplusplus extern "C" diff --git a/drivers/opus/silk/tables_other.c b/drivers/opus/silk/tables_other.c index 246e960fa..5e588fbf0 100644 --- a/drivers/opus/silk/tables_other.c +++ b/drivers/opus/silk/tables_other.c @@ -25,13 +25,13 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "structs.h" -#include "define.h" -#include "tables.h" +#include "opus/silk/structs.h" +#include "opus/silk/define.h" +#include "opus/silk/tables.h" #ifdef __cplusplus extern "C" diff --git a/drivers/opus/silk/tables_pitch_lag.c b/drivers/opus/silk/tables_pitch_lag.c index 0af5c5ace..e1c4617d0 100644 --- a/drivers/opus/silk/tables_pitch_lag.c +++ b/drivers/opus/silk/tables_pitch_lag.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "tables.h" +#include "opus/silk/tables.h" const opus_uint8 silk_pitch_lag_iCDF[ 2 * ( PITCH_EST_MAX_LAG_MS - PITCH_EST_MIN_LAG_MS ) ] = { 253, 250, 244, 233, 212, 182, 150, 131, diff --git a/drivers/opus/silk/tables_pulses_per_block.c b/drivers/opus/silk/tables_pulses_per_block.c index 05ba2318f..a1e2fb03d 100644 --- a/drivers/opus/silk/tables_pulses_per_block.c +++ b/drivers/opus/silk/tables_pulses_per_block.c @@ -25,11 +25,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "tables.h" +#include "opus/silk/tables.h" const opus_uint8 silk_max_pulses_table[ 4 ] = { 8, 10, 12, 16 diff --git a/drivers/opus/silk/typedef.h b/drivers/opus/silk/typedef.h index ca2361bc8..3e193b4a4 100644 --- a/drivers/opus/silk/typedef.h +++ b/drivers/opus/silk/typedef.h @@ -28,8 +28,8 @@ POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_TYPEDEF_H #define SILK_TYPEDEF_H -#include "opus_types.h" -#include "opus_defines.h" +#include "opus/opus_types.h" +#include "opus/opus_defines.h" #ifndef OPUS_FIXED_POINT # include <float.h> diff --git a/drivers/opus/stream.c b/drivers/opus/stream.c index 17293f2bc..8dd23e88e 100644 --- a/drivers/opus/stream.c +++ b/drivers/opus/stream.c @@ -14,11 +14,11 @@ last mod: $Id: vorbisfile.c 17573 2010-10-27 14:53:59Z xiphmont $ ********************************************************************/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "internal.h" +#include "opus/internal.h" #include <sys/types.h> #include <stdio.h> #include <stdlib.h> diff --git a/drivers/opus/wincerts.c b/drivers/opus/wincerts.c index 568a085e4..2a04eab6d 100644 --- a/drivers/opus/wincerts.c +++ b/drivers/opus/wincerts.c @@ -16,11 +16,11 @@ [1] <http://rt.openssl.org/Ticket/Display.html?id=2158>*/ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif -#include "internal.h" +#include "opus/internal.h" #if defined(OP_ENABLE_HTTP)&&defined(_WIN32) /*You must include windows.h before wincrypt.h and x509.h.*/ # define WIN32_LEAN_AND_MEAN |