Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(52)

Side by Side Diff: third_party/opus/opus.gyp

Issue 899623002: Revert of Roll opus to opus-HEAD-66611f1. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « third_party/opus/README.chromium ('k') | third_party/opus/opus_srcs_mips.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'conditions': [ 7 'conditions': [
8 # TODO(wtc): change "mipselx" to "mipsel" in this file when the 8 ['target_arch=="arm" or target_arch=="arm64"', {
9 # compilation errors in the MIPS optimizations are fixed.
10 ['target_arch=="arm" or target_arch=="arm64" or target_arch=="mipselx"', {
11 'use_opus_fixed_point%': 1, 9 'use_opus_fixed_point%': 1,
12 }, { 10 }, {
13 'use_opus_fixed_point%': 0, 11 'use_opus_fixed_point%': 0,
14 }], 12 }],
15 ['target_arch=="arm"', { 13 ['target_arch=="arm"', {
16 'use_opus_arm_optimization%': 1, 14 'use_opus_arm_optimization%': 1,
17 }, { 15 }, {
18 'use_opus_arm_optimization%': 0, 16 'use_opus_arm_optimization%': 0,
19 }], 17 }],
20 ['target_arch=="mipselx"', {
21 'use_opus_mips_optimization%': 1,
22 }, {
23 'use_opus_mips_optimization%': 0,
24 }],
25 ['target_arch=="arm" and (OS=="win" or OS=="android" or OS=="linux")', { 18 ['target_arch=="arm" and (OS=="win" or OS=="android" or OS=="linux")', {
26 # Based on the conditions in celt/arm/armcpu.c: 19 # Based on the conditions in celt/arm/armcpu.c:
27 # defined(_MSC_VER) || defined(__linux__). 20 # defined(_MSC_VER) || defined(__linux__).
28 'use_opus_rtcd%': 1, 21 'use_opus_rtcd%': 1,
29 }, { 22 }, {
30 'use_opus_rtcd%': 0, 23 'use_opus_rtcd%': 0,
31 }], 24 }],
32 ], 25 ],
33 }, 26 },
34 'targets': [ 27 'targets': [
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 'OPUS_ARM_MAY_HAVE_MEDIA', 117 'OPUS_ARM_MAY_HAVE_MEDIA',
125 'OPUS_ARM_MAY_HAVE_NEON', 118 'OPUS_ARM_MAY_HAVE_NEON',
126 'OPUS_HAVE_RTCD', 119 'OPUS_HAVE_RTCD',
127 ], 120 ],
128 'includes': [ 121 'includes': [
129 'opus_srcs_rtcd.gypi', 122 'opus_srcs_rtcd.gypi',
130 ], 123 ],
131 }], 124 }],
132 ], 125 ],
133 }], 126 }],
134 ['use_opus_mips_optimization==1', {
135 'defines': [
136 'MIPSr1_ASM',
137 'USE_ALLOCA',
138 ],
139
140 'includes': [
141 'opus_srcs_mips.gypi',
142 ],
143 }],
144 ], 127 ],
145 }], 128 }],
146 ], 129 ],
147 }, # target opus 130 }, # target opus
148 { 131 {
149 'target_name': 'opus_compare', 132 'target_name': 'opus_compare',
150 'type': 'executable', 133 'type': 'executable',
151 'dependencies': [ 134 'dependencies': [
152 'opus' 135 'opus'
153 ], 136 ],
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 'sources': [ 185 'sources': [
203 'src/src/opus_demo.c', 186 'src/src/opus_demo.c',
204 ], 187 ],
205 'include_dirs': [ 188 'include_dirs': [
206 'src/celt', 189 'src/celt',
207 'src/silk', 190 'src/silk',
208 ], 191 ],
209 }, # target opus_demo 192 }, # target opus_demo
210 ] 193 ]
211 } 194 }
OLDNEW
« no previous file with comments | « third_party/opus/README.chromium ('k') | third_party/opus/opus_srcs_mips.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698