Enabling ARM optimizations for Opus on Android and ChromeOS

third_party/opus/opus.gyp

Index: third_party/opus/opus.gyp
diff --git a/third_party/opus/opus.gyp b/third_party/opus/opus.gyp
index be0ae4e01efe77acc50a3ae8d6343e89849926c7..9181cea05a01df29624c25b26dc7a0980d9a107b 100644
--- a/third_party/opus/opus.gyp
+++ b/third_party/opus/opus.gyp
@@ -7,6 +7,7 @@
     'conditions': [
       ['OS=="android"', {

[tlegrand1, 2014/02/07 14:38:43]

We only enable the optimizations for android at the moment.

         'use_opus_fixed_point%': 1,
+        'opus_arm_optimization%': 1,
       }, {
         'use_opus_fixed_point%': 0,
       }],
@@ -65,6 +66,41 @@
           'sources/': [
             ['exclude', '/float/[^/]*_FLP.(h|c)$'],
           ],
+          'conditions': [
+            ['opus_arm_optimization==1', {
+              'defines': [
+                'OPUS_ARM_INLINE_ASM',
+                'OPUS_ARM_INLINE_EDSP',
+                'OPUS_ARM_ASM',
+                'OPUS_HAVE_RTCD',
+                'OPUS_ARM_MAY_HAVE_EDSP',
+                'OPUS_ARM_MAY_HAVE_MEDIA',
+                'OPUS_ARM_MAY_HAVE_NEON',

[Sergey Ulanov, 2014/02/06 18:23:13]

Sort these alphabetically please

[tlegrand1, 2014/02/07 14:38:43]

Done.

+              ], # defines

[Sergey Ulanov, 2014/02/06 18:23:13]

nit: two spaces before comments. Also I don't think this comment and similar
comments below improve readability, so may be remove them completely. They are
not used in the rest of this file (but comments at the end of conditions and
targets are still useful).

[tlegrand1, 2014/02/07 14:38:43]

Done.

+              'include_dirs': [
+                'src/celt/arm',
+              ], # include_dirs
+              'includes': [
+                'opus_arm_srcs.gypi',
+              ], # includes
+              'conditions': [
+                ['(target_arch=="arm" and arm_version==7) or target_arch=="armv7"', {
+                  'cflags': [
+                    '-mfpu=neon',

[Sergey Ulanov, 2014/02/06 18:23:13]

Why do you need this? I think build/common.gypi should add this flag
automatically when arm_neon=1.

[tlegrand1, 2014/02/07 14:38:43]

I think you are right, but I need to verify that it is safe to remove this for
WebRTC too.
On 2014/02/06 18:23:13, Sergey Ulanov wrote:

+                  ], # cflags
+                  'cflags/': [
+                    ['exclude', '^-mfpu=.*'],
+                    ['include', '-mfpu=neon'],
+                  ], # cflags/
+                }, {
+                  'sources!': [
+                    'src/celt/pitch_arm.h',
+                    'src/celt/arm/celt_pitch_xcorr_arm_gnu.S',
+                  ], # sources

[Sergey Ulanov, 2014/02/06 18:23:13]

sources!, but I suggest to just remove this comment.

[tlegrand1, 2014/02/07 14:38:43]

Done.

+                }], # target_arch=="arm" ...
+              ], # conditions
+            }], # opus_arm_optimization==1
+          ], # conditions
         }],
       ],
     },  # target opus