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

Side by Side Diff: webrtc/media/media.gyp

Issue 2272423003: Deactivated the intelligibility enhancement functionality by default (Closed)
Patch Set: Put conditional building on the intelligibility_proc executable Created 4 years, 3 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
OLDNEW
1 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license 3 # Use of this source code is governed by a BSD-style license
4 # that can be found in the LICENSE file in the root of the source 4 # that can be found in the LICENSE file in the root of the source
5 # tree. An additional intellectual property rights grant can be found 5 # tree. An additional intellectual property rights grant can be found
6 # in the file PATENTS. All contributing project authors may 6 # in the file PATENTS. All contributing project authors may
7 # be found in the AUTHORS file in the root of the source tree. 7 # be found in the AUTHORS file in the root of the source tree.
8 8
9 { 9 {
10 'includes': [ '../build/common.gypi', ], 10 'includes': [ '../build/common.gypi', ],
11 'variables': {
12 # Chooses whether the intelligibility enhancer should be used.
13 'intelligibility_enhancer': 0,
14 },
11 'targets': [ 15 'targets': [
12 { 16 {
13 'target_name': 'rtc_media', 17 'target_name': 'rtc_media',
14 'type': 'static_library', 18 'type': 'static_library',
15 'dependencies': [ 19 'dependencies': [
16 '<(webrtc_root)/base/base.gyp:rtc_base_approved', 20 '<(webrtc_root)/base/base.gyp:rtc_base_approved',
17 '<(webrtc_root)/common.gyp:webrtc_common', 21 '<(webrtc_root)/common.gyp:webrtc_common',
18 '<(webrtc_root)/webrtc.gyp:webrtc', 22 '<(webrtc_root)/webrtc.gyp:webrtc',
19 '<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine', 23 '<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine',
20 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', 24 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 ['build_usrsctp==1', { 122 ['build_usrsctp==1', {
119 'include_dirs': [ 123 'include_dirs': [
120 # TODO(jiayl): move this into the direct_dependent_settings of 124 # TODO(jiayl): move this into the direct_dependent_settings of
121 # usrsctp.gyp. 125 # usrsctp.gyp.
122 '<(DEPTH)/third_party/usrsctp/usrsctplib', 126 '<(DEPTH)/third_party/usrsctp/usrsctplib',
123 ], 127 ],
124 'dependencies': [ 128 'dependencies': [
125 '<(DEPTH)/third_party/usrsctp/usrsctp.gyp:usrsctplib', 129 '<(DEPTH)/third_party/usrsctp/usrsctp.gyp:usrsctplib',
126 ], 130 ],
127 }], 131 }],
132 ['intelligibility_enhancer==1', {
133 'defines': ['WEBRTC_INTELLIGIBILITY_ENHANCER=1',],
134 }, {
135 'defines': ['WEBRTC_INTELLIGIBILITY_ENHANCER=0',],
136 }],
137
the sun 2016/08/26 12:08:56 dd
peah-webrtc 2016/08/26 13:09:43 Done.
128 ['build_with_chromium==1', { 138 ['build_with_chromium==1', {
129 'dependencies': [ 139 'dependencies': [
130 '<(webrtc_root)/modules/modules.gyp:video_capture', 140 '<(webrtc_root)/modules/modules.gyp:video_capture',
131 ], 141 ],
132 }, { 142 }, {
133 'defines': [ 143 'defines': [
134 'HAVE_WEBRTC_VIDEO', 144 'HAVE_WEBRTC_VIDEO',
135 'HAVE_WEBRTC_VOICE', 145 'HAVE_WEBRTC_VOICE',
136 ], 146 ],
137 'direct_dependent_settings': { 147 'direct_dependent_settings': {
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 'sources': [ 372 'sources': [
363 'rtc_media_unittests.isolate', 373 'rtc_media_unittests.isolate',
364 ], 374 ],
365 }, 375 },
366 ], 376 ],
367 }], 377 }],
368 ], # conditions 378 ], # conditions
369 }], # include_tests==1 379 }], # include_tests==1
370 ], # conditions 380 ], # conditions
371 } 381 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698