From 0c2090c324e4f2ba2a8621c8b083559bab74c7c5 Mon Sep 17 00:00:00 2001
From: Felicia Lim <flim@google.com>
Date: Wed, 5 Jul 2017 17:36:56 -0700
Subject: Opus 1.2.1

Change-Id: I551f1de5c5e121ac1275334e67c7e0f96ab18114

Test: - verified builds for arm*/mips*/x86*
      - checked functionality using an emulator and stagefright
---
 Android.bp | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'Android.bp')

diff --git a/Android.bp b/Android.bp
index b4a89222..4fa26996 100644
--- a/Android.bp
+++ b/Android.bp
@@ -87,6 +87,7 @@ cc_library_shared {
         "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",
@@ -119,12 +120,10 @@ cc_library_shared {
         "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",
@@ -149,8 +148,6 @@ cc_library_shared {
         "src/analysis.c",
         "src/mlp.c",
         "src/mlp_data.c",
-
-        "src/repacketizer_demo.c",
     ],
 
     cflags: [
@@ -188,6 +185,9 @@ cc_library_shared {
                 // supported on target platform.
                 // CELT_SOURCES_ARM_ASM
                 "celt/arm/celt_pitch_xcorr_arm_gnu.s",
+
+                // CELT_AM_SOURCES_ARM_ASM
+                "celt/arm/armopts_gnu.s",
             ],
 
             cflags: [
@@ -197,6 +197,7 @@ cc_library_shared {
                 "-DOPUS_ARM_INLINE_EDSP",
                 "-DOPUS_ARM_MAY_HAVE_MEDIA",
                 "-DOPUS_ARM_INLINE_MEDIA",
+                "-DOPUS_ARM_MAY_HAVE_NEON",
                 "-DOPUS_HAVE_RTCD",
             ],
 
@@ -207,10 +208,17 @@ cc_library_shared {
                 srcs: [
                     // CELT_SOURCES_ARM_NEON_INTR
                     "celt/arm/celt_neon_intr.c",
+                    "celt/arm/pitch_neon_intr.c",
 
                     // SILK_SOURCES_ARM_NEON_INTR,
                     "silk/arm/arm_silk_map.c",
+                    "silk/arm/biquad_alt_neon_intr.c",
+                    "silk/arm/LPC_inv_pred_gain_neon_intr.c",
+                    "silk/arm/NSQ_del_dec_neon_intr.c",
                     "silk/arm/NSQ_neon.c",
+
+                    // SILK_SOURCES_FIXED_ARM_NEON_INTR,
+                    "silk/fixed/arm/warped_autocorrelation_FIX_neon_intr.c",
                 ],
 
                 cflags: [
@@ -233,6 +241,7 @@ cc_library_shared {
 
                     // CELT_SOURCES_SSE2
                     "celt/x86/pitch_sse2.c",
+                    "celt/x86/vq_sse2.c",
                 ],
 
                 cflags: [
@@ -259,7 +268,6 @@ cc_library_shared {
                     // SILK_SOURCES_FIXED_SSE4_1
                     "silk/fixed/x86/vector_ops_FIX_sse.c",
                     "silk/fixed/x86/burg_modified_FIX_sse.c",
-                    "silk/fixed/x86/prefilter_FIX_sse.c",
                 ],
 
                 cflags: [
@@ -305,7 +313,6 @@ cc_library_shared {
                     // SILK_SOURCES_FIXED_SSE4_1
                     "silk/fixed/x86/vector_ops_FIX_sse.c",
                     "silk/fixed/x86/burg_modified_FIX_sse.c",
-                    "silk/fixed/x86/prefilter_FIX_sse.c",
                 ],
 
                 cflags: [
-- 
cgit v1.2.3