From 46ae64cd60166ead412bacc1bf03e9c8f8965e2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Mon, 18 Nov 2019 09:56:18 +0100
Subject: Revert "Update opus to 1.3.1 and opusfile to 0.11"

This reverts commit e00426c512a7905f5f925d382c443bab7a0ca693.

The way we handle platform-specific intrinsics is not good, so the
current state will not compile on armv8. This commit also requires
SSE4.1 support, which is likely not a good idea for portable binaries.

We'll have to redo this with more caution after 3.2 is released, or
we might simply drop opus as we're only using it as dependency for
theora right now.

Fixes #33606.
---
 modules/opus/SCsub | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'modules/opus')

diff --git a/modules/opus/SCsub b/modules/opus/SCsub
index 8af4f16a26..1db5b0987e 100644
--- a/modules/opus/SCsub
+++ b/modules/opus/SCsub
@@ -20,9 +20,6 @@ if env['builtin_opus']:
         "opus_multistream.c",
         "opus_multistream_encoder.c",
         "opus_multistream_decoder.c",
-        "opus_projection_encoder.c",
-        "opus_projection_decoder.c",
-        "mapping_matrix.c",
         "repacketizer.c",
 
         "analysis.c",
@@ -56,10 +53,9 @@ if env['builtin_opus']:
         "celt/vq.c",
         #"celt/arm/arm_celt_map.c",
         #"celt/arm/armcpu.c",
-        #"celt/arm/celt_fft_ne10.c",
-        #"celt/arm/celt_mdct_ne10.c",
+        #"celt/arm/celt_ne10_fft.c",
+        #"celt/arm/celt_ne10_mdct.c",
         #"celt/arm/celt_neon_intr.c",
-        #"celt/arm/pitch_neon_intr.c",
 
         # Sync with silk_sources.mk
         "silk/CNG.c",
@@ -117,7 +113,6 @@ if env['builtin_opus']:
         "silk/lin2log.c",
         "silk/log2lin.c",
         "silk/LPC_analysis_filter.c",
-        "silk/LPC_fit.c",
         "silk/LPC_inv_pred_gain.c",
         "silk/table_LSF_cos.c",
         "silk/NLSF2A.c",
@@ -155,10 +150,12 @@ if env['builtin_opus']:
             "silk/fixed/find_pitch_lags_FIX.c",
             "silk/fixed/find_pred_coefs_FIX.c",
             "silk/fixed/noise_shape_analysis_FIX.c",
+            "silk/fixed/prefilter_FIX.c",
             "silk/fixed/process_gains_FIX.c",
             "silk/fixed/regularize_correlations_FIX.c",
             "silk/fixed/residual_energy16_FIX.c",
             "silk/fixed/residual_energy_FIX.c",
+            "silk/fixed/solve_LS_FIX.c",
             "silk/fixed/warped_autocorrelation_FIX.c",
             "silk/fixed/apply_sine_window_FIX.c",
             "silk/fixed/autocorr_FIX.c",
@@ -183,9 +180,11 @@ if env['builtin_opus']:
             "silk/float/LTP_analysis_filter_FLP.c",
             "silk/float/LTP_scale_ctrl_FLP.c",
             "silk/float/noise_shape_analysis_FLP.c",
+            "silk/float/prefilter_FLP.c",
             "silk/float/process_gains_FLP.c",
             "silk/float/regularize_correlations_FLP.c",
             "silk/float/residual_energy_FLP.c",
+            "silk/float/solve_LS_FLP.c",
             "silk/float/warped_autocorrelation_FLP.c",
             "silk/float/wrappers_FLP.c",
             "silk/float/autocorrelation_FLP.c",
@@ -194,6 +193,7 @@ if env['builtin_opus']:
             "silk/float/energy_FLP.c",
             "silk/float/inner_product_FLP.c",
             "silk/float/k2a_FLP.c",
+            "silk/float/levinsondurbin_FLP.c",
             "silk/float/LPC_inv_pred_gain_FLP.c",
             "silk/float/pitch_analysis_core_FLP.c",
             "silk/float/scale_copy_vector_FLP.c",
-- 
cgit v1.2.3