Enabling ARM optimizations for Opus on Android and ChromeOS

third_party/opus/opus.gyp

 # Copyright (c) 2012 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.
 
 {
   'variables': {
     '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,
       }],
     ],
   },
   'targets': [
     {
       'target_name': 'opus',
       'type': 'static_library',
       'defines': [
@@ skipping 38 matching lines @@
         }, {
           'defines': [
             'FIXED_POINT',
           ],
           'include_dirs': [
             'src/silk/fixed',
           ],
           '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
     {
       'target_name': 'opus_demo',
       'type': 'executable',
       'dependencies': [
         'opus'
       ],
       'conditions': [
@@ skipping 13 matching lines @@
       'sources': [
         'src/src/opus_demo.c',
       ],
       'include_dirs': [
         'src/celt',
         'src/silk',
       ],
     },  # target opus_demo
   ]
 }