Enable ARM optimizations for Opus in iOS

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" or chromeos==1) and target_arch=="arm"', {
         'use_opus_fixed_point%': 1,
         'use_opus_arm_optimization%': 1,
+        'use_opus_rtcd%': 1,
       }, {
         'use_opus_fixed_point%': 0,
         'use_opus_arm_optimization%': 0,
+        'use_opus_rtcd%': 0,
+      }],
+      ['OS=="ios"', {

[tlegrand1, 2014/04/14 15:30:58]

Do we need to specify ARM here, or do iOS implicitly mean ARM?

[Sergey Ulanov, 2014/04/14 21:42:13]

I think we do. iOS emulator build are normally compiled for x86, not ARM. 

[tlegrand1, 2014/04/15 14:15:21]

Thanks, didn't know that.
On 2014/04/14 21:42:13, Sergey Ulanov wrote:

+        'use_opus_fixed_point%': 1,
+        'use_opus_arm_optimization%': 1,
+        'use_opus_rtcd%': 0,
+      }, {
+        'use_opus_fixed_point%': 0,

[Sergey Ulanov, 2014/04/14 21:42:13]

this duplicates lines 13-15. I suggest formatting this part as follows

["(ios or android or ChromeOS) and arm", {
     'use_opus_fixed_point%': 1,
     'use_opus_arm_optimization%': 1,
}, {
     'use_opus_fixed_point%': 0,
     'use_opus_arm_optimization%': 0,
}],
["android or ChromeOS on arm", {
     'use_opus_rtcd%': 1,
}, {
     'use_opus_rtcd%': 0,
}],

[tlegrand1, 2014/04/15 14:15:21]

Needed to specify armv7 for ios.
On 2014/04/14 21:42:13, Sergey Ulanov wrote:

+        'use_opus_arm_optimization%': 0,
+        'use_opus_rtcd%': 0,
       }],
     ],
   },
   'targets': [
     {
       'target_name': 'opus',
       'type': 'static_library',
       'defines': [
         'OPUS_BUILD',
         'OPUS_EXPORT=',
@@ skipping 54 matching lines @@
           ],
           '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_srcs_arm.gypi',
               ],
+              'conditions': [
+                ['use_opus_rtcd==1', {
+                  'defines': [
+                    'OPUS_ARM_MAY_HAVE_EDSP',
+                    'OPUS_ARM_MAY_HAVE_MEDIA',
+                    'OPUS_ARM_MAY_HAVE_NEON',
+                    'OPUS_HAVE_RTCD',
+                  ],
+                  'includes': [
+                    'opus_srcs_rtcd.gypi',
+                  ],
+                }],
+              ],
             }],
           ],
         }],
       ],
     },  # target opus
     {
       'target_name': 'opus_demo',
       'type': 'executable',
       'dependencies': [
         'opus'
@@ skipping 15 matching lines @@
       'sources': [
         'src/src/opus_demo.c',
       ],
       'include_dirs': [
         'src/celt',
         'src/silk',
       ],
     },  # target opus_demo
   ]
 }