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"', {
         'use_opus_fixed_point%': 1,
+        'opus_arm_optimization%': 1,

[tlegrand1, 2014/02/11 15:45:07]

As you see we only enable for Android at the moment.

[Sergey Ulanov, 2014/02/13 20:34:28]

Android is now always ARM (e.g. there are Intel-based Android devices), and ARM
not always Android. So this doesn't look right to me. Should we look for
target_arch=="arm" instead?

       }, {
         '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_ASM',
+                'OPUS_ARM_INLINE_ASM',
+                'OPUS_ARM_INLINE_EDSP',
+                'OPUS_ARM_MAY_HAVE_EDSP',
+                'OPUS_ARM_MAY_HAVE_MEDIA',
+                'OPUS_ARM_MAY_HAVE_NEON',
+                'OPUS_HAVE_RTCD',
+              ],
+              'include_dirs': [
+                'src/celt/arm',
+              ],
+              'includes': [
+                'opus_srcs_arm.gypi',
+              ],
+              'conditions': [
+                ['(target_arch=="arm" and arm_version==7) or target_arch=="armv7"', {

[minyue, 2014/02/18 13:52:56]

We may try to change this line to

['target_arch=="arm" and arm_fpu=="neon"'],

and remove

  88                   'cflags': [
  89                     '-mfpu=neon',
  90                   ],
  91                   'cflags/': [
  92                     ['exclude', '^-mfpu=.*'],
  93                     ['include', '-mfpu=neon'],
  94                   ],

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