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"', {
+      ['OS=="android" or chromeos==1', {
         'use_opus_fixed_point%': 1,

[Sergey Ulanov, 2014/03/19 19:21:51]

This will enable fixed-point math on Intel Chromebooks. It doesn't look correct
to me. If fixed-point is faster on Intel CPUs then we should always use it, not
only on ChromeOS. I _think_ we need just one condition that sets both
use_opus_fixed_point and use_opus_arm_optimization on ARM builds. Or is it that
you need fixed-point on Intel Android builds.

[tlegrand1, 2014/03/20 10:11:01]

I wanted to preserve the previous setting for Android, where we always used
fixed point. But I think you are right, we don't need fixed point in Intel CPUs.
Now is the best time to make the change.

On 2014/03/19 19:21:51, Sergey Ulanov wrote:

+        'conditions': [
+          ['target_arch=="arm"', {
+            'use_opus_arm_optimization%': 1,
+          }, {
+            'use_opus_arm_optimization%': 0,
+          }],
+        ],
       }, {
         'use_opus_fixed_point%': 0,
+        'use_opus_arm_optimization%': 0,
       }],
     ],
   },
   'targets': [
     {
       'target_name': 'opus',
       'type': 'static_library',
       'defines': [
         'OPUS_BUILD',
         'OPUS_EXPORT=',
@@ skipping 36 matching lines @@
         }, {
           'defines': [
             'FIXED_POINT',
           ],
           'include_dirs': [
             'src/silk/fixed',
           ],
           'sources/': [
             ['exclude', '/float/[^/]*_FLP.(h|c)$'],
           ],
+          'conditions': [
+            ['use_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',
+              ],
+              'includes': [
+                'opus_arm_srcs.gypi',
+              ],
+            }],
+          ],
         }],
       ],
-    },  # target opus
+    },
     {
       'target_name': 'opus_demo',
       'type': 'executable',
       'dependencies': [
         'opus'
       ],
       'conditions': [
         ['OS == "win"', {
           'defines': [
             'inline=__inline',
           ],
         }],
         ['OS=="android"', {
           'link_settings': {
             'libraries': [
               '-llog',
             ],
           },
         }]
       ],
       'sources': [
         'src/src/opus_demo.c',
       ],
       'include_dirs': [
         'src/celt',
         'src/silk',
       ],
-    },  # target opus_demo
+    },
   ]
 }