Revert of Roll opus to opus-HEAD-66611f1. (patchset #3 id:40001 of https://codereview.chromium.org/865853005/)

Reason for revert:
This CL breaks WebRTC in Chrome since the new Opus version is not bit-exact with the previous version.

Original issue's description:
> Roll opus to opus-HEAD-66611f1.
>
> The third_party/opus/src CL is https://codereview.chromium.org/882843002.
>
> Support MIPS optimizations in opus.
>
> R=henrika@chromium.org,sergeyu@chromium.org
> BUG=452984
>
> Committed: https://crrev.com/ebbf54dafa1be134a4d45fc30c103388dfaa8ff0
> Cr-Commit-Position: refs/heads/master@{#313646}

TBR=sergeyu@chromium.org,tlegrand@chromium.org,wtc@chromium.org
BUG=452984

Review URL: https://codereview.chromium.org/899623002

Cr-Commit-Position: refs/heads/master@{#314322}

5 files changed, 5 insertions, 73 deletions

diff --git a/DEPS b/DEPS
index 0b90a45..3f5f3f8 100644
--- a/DEPS
+++ b/DEPS
@@ -274,7 +274,7 @@ deps = {
     Var('chromium_git') + '/external/pywebsocket/src.git' + '@' + 'cb349e87ddb30ff8d1fa1a89be39cec901f4a29c',
 
   'src/third_party/opus/src':
-   Var('chromium_git') + '/chromium/deps/opus.git' + '@' + '7245f1704acd521caa51be952df0fc9d7107bdff',
+   Var('chromium_git') + '/chromium/deps/opus.git' + '@' + 'cae696156f1e60006e39821e79a1811ae1933c69',
 
   'src/media/cdm/ppapi/api':
    Var('chromium_git') + '/chromium/cdm.git' + '@' + '7b7c6cc620e13c8057b4b6bff19e5955feb2c8fa', # from svn revision 293617
diff --git a/third_party/opus/BUILD.gn b/third_party/opus/BUILD.gn
index 8f51d09..2905a49 100644
--- a/third_party/opus/BUILD.gn
+++ b/third_party/opus/BUILD.gn
@@ -3,20 +3,13 @@
 # found in the LICENSE file.
 
 import("//build/config/arm.gni")
-import("//build/config/mips.gni")
 
 # If fixed point implementation shall be used (otherwise float).
-# TODO(wtc): change "mipselx" to "mipsel" in this file when the compilation
-# errors in the MIPS optimizations are fixed.
-use_opus_fixed_point =
-    cpu_arch == "arm" || cpu_arch == "arm64" || cpu_arch == "mipselx"
+use_opus_fixed_point = cpu_arch == "arm" || cpu_arch == "arm64"
 
 # If ARM optimizations shall be used to accelerate performance.
 use_opus_arm_optimization = cpu_arch == "arm"
 
-# If MIPS optimizations shall be used to accelerate performance.
-use_opus_mips_optimization = cpu_arch == "mipselx"
-
 # If OPUS Run Time CPU Detections (RTCD) shall be used.
 # Based on the conditions in celt/arm/armcpu.c:
 # defined(_MSC_VER) || defined(__linux__).
@@ -142,29 +135,6 @@ source_set("opus") {
       ]
     }
   }
-
-  if (use_opus_mips_optimization) {
-    sources += [
-      "src/celt/mips/celt_mipsr1.h",
-      "src/celt/mips/fixed_generic_mipsr1.h",
-      "src/celt/mips/kiss_fft_mipsr1.h",
-      "src/celt/mips/mdct_mipsr1.h",
-      "src/celt/mips/pitch_mipsr1.h",
-      "src/celt/mips/vq_mipsr1.c",
-      "src/celt/mips/vq_mipsr1.h",
-      "src/silk/fixed/mips/noise_shape_analysis_FIX_mipsr1.h",
-      "src/silk/fixed/mips/prefilter_FIX_mipsr1.h",
-      "src/silk/fixed/mips/warped_autocorrelation_FIX_mipsr1.h",
-      "src/silk/mips/NSQ_del_dec_mipsr1.h",
-      "src/silk/mips/macros_mipsr1.h",
-      "src/silk/mips/sigproc_fix_mipsr1.h",
-    ]
-
-    defines += [
-      "MIPSr1_ASM",
-      "USE_ALLOCA",
-    ]
-  }
 }
 
 executable("opus_compare") {
diff --git a/third_party/opus/README.chromium b/third_party/opus/README.chromium
index f04756e..fa93b8d 100644
--- a/third_party/opus/README.chromium
+++ b/third_party/opus/README.chromium
@@ -1,6 +1,6 @@
 Name: opus
 URL: http://git.xiph.org/?p=opus.git
-Version: 1.1.1-beta
+Version: 1.1.0
 License: BSD
 License File: src/COPYING
 Security Critical: yes
@@ -12,4 +12,4 @@ This library is used by Chrome Remote Desktop and WebRTC for audio stream
 encoding/decoding.
 
 Local changes:
-- merged http://git.xiph.org/?p=opus.git;a=commitdiff;h=66611f136733ca7f52c26f1f1ab11d506cc6e752
+- merged http://git.xiph.org/?p=opus.git;a=commitdiff;h=e70faf98b0465e4f278c72ce2d7b4ad10221a2f2
diff --git a/third_party/opus/opus.gyp b/third_party/opus/opus.gyp
index 5fdeea6..b64f990 100644
--- a/third_party/opus/opus.gyp
+++ b/third_party/opus/opus.gyp
@@ -5,9 +5,7 @@
 {
   'variables': {
     'conditions': [
-      # TODO(wtc): change "mipselx" to "mipsel" in this file when the
-      # compilation errors in the MIPS optimizations are fixed.
-      ['target_arch=="arm" or target_arch=="arm64" or target_arch=="mipselx"', {
+      ['target_arch=="arm" or target_arch=="arm64"', {
         'use_opus_fixed_point%': 1,
       }, {
         'use_opus_fixed_point%': 0,
@@ -17,11 +15,6 @@
       }, {
         'use_opus_arm_optimization%': 0,
       }],
-      ['target_arch=="mipselx"', {
-        'use_opus_mips_optimization%': 1,
-      }, {
-        'use_opus_mips_optimization%': 0,
-      }],
       ['target_arch=="arm" and (OS=="win" or OS=="android" or OS=="linux")', {
         # Based on the conditions in celt/arm/armcpu.c:
         # defined(_MSC_VER) || defined(__linux__).
@@ -131,16 +124,6 @@
                 }],
               ],
             }],
-            ['use_opus_mips_optimization==1', {
-              'defines': [
-                'MIPSr1_ASM',
-                'USE_ALLOCA',
-              ],
-
-              'includes': [
-                'opus_srcs_mips.gypi',
-              ],
-            }],
           ],
         }],
       ],
diff --git a/third_party/opus/opus_srcs_mips.gypi b/third_party/opus/opus_srcs_mips.gypi
deleted file mode 100644
index 68f4f14..0000000
--- a/third_party/opus/opus_srcs_mips.gypi
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2015 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-{
-  'sources': [
-    'src/celt/mips/celt_mipsr1.h',
-    'src/celt/mips/fixed_generic_mipsr1.h',
-    'src/celt/mips/kiss_fft_mipsr1.h',
-    'src/celt/mips/mdct_mipsr1.h',
-    'src/celt/mips/pitch_mipsr1.h',
-    'src/celt/mips/vq_mipsr1.c',
-    'src/celt/mips/vq_mipsr1.h',
-    'src/silk/fixed/mips/noise_shape_analysis_FIX_mipsr1.h',
-    'src/silk/fixed/mips/prefilter_FIX_mipsr1.h',
-    'src/silk/fixed/mips/warped_autocorrelation_FIX_mipsr1.h',
-    'src/silk/mips/NSQ_del_dec_mipsr1.h',
-    'src/silk/mips/macros_mipsr1.h',
-    'src/silk/mips/sigproc_fix_mipsr1.h',
-  ],
-}