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

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

Issue 2245153002: Revert of Move FilePlayer and FileRecorder to Voice Engine (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 4 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) 2011 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2011 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': [ 10 'includes': [
(...skipping 11 matching lines...) Expand all
22 '<(webrtc_root)/modules/modules.gyp:audio_conference_mixer', 22 '<(webrtc_root)/modules/modules.gyp:audio_conference_mixer',
23 '<(webrtc_root)/modules/modules.gyp:audio_device', 23 '<(webrtc_root)/modules/modules.gyp:audio_device',
24 '<(webrtc_root)/modules/modules.gyp:audio_processing', 24 '<(webrtc_root)/modules/modules.gyp:audio_processing',
25 '<(webrtc_root)/modules/modules.gyp:bitrate_controller', 25 '<(webrtc_root)/modules/modules.gyp:bitrate_controller',
26 '<(webrtc_root)/modules/modules.gyp:media_file', 26 '<(webrtc_root)/modules/modules.gyp:media_file',
27 '<(webrtc_root)/modules/modules.gyp:paced_sender', 27 '<(webrtc_root)/modules/modules.gyp:paced_sender',
28 '<(webrtc_root)/modules/modules.gyp:rtp_rtcp', 28 '<(webrtc_root)/modules/modules.gyp:rtp_rtcp',
29 '<(webrtc_root)/modules/modules.gyp:webrtc_utility', 29 '<(webrtc_root)/modules/modules.gyp:webrtc_utility',
30 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', 30 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
31 '<(webrtc_root)/webrtc.gyp:rtc_event_log', 31 '<(webrtc_root)/webrtc.gyp:rtc_event_log',
32 'file_player',
33 'file_recorder',
34 'level_indicator', 32 'level_indicator',
35 ], 33 ],
36 'export_dependent_settings': [ 34 'export_dependent_settings': [
37 '<(webrtc_root)/modules/modules.gyp:audio_coding_module', 35 '<(webrtc_root)/modules/modules.gyp:audio_coding_module',
38 ], 36 ],
39 'sources': [ 37 'sources': [
40 'include/voe_audio_processing.h', 38 'include/voe_audio_processing.h',
41 'include/voe_base.h', 39 'include/voe_base.h',
42 'include/voe_codec.h', 40 'include/voe_codec.h',
43 'include/voe_errors.h', 41 'include/voe_errors.h',
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 'voe_video_sync_impl.cc', 88 'voe_video_sync_impl.cc',
91 'voe_video_sync_impl.h', 89 'voe_video_sync_impl.h',
92 'voe_volume_control_impl.cc', 90 'voe_volume_control_impl.cc',
93 'voe_volume_control_impl.h', 91 'voe_volume_control_impl.h',
94 'voice_engine_defines.h', 92 'voice_engine_defines.h',
95 'voice_engine_impl.cc', 93 'voice_engine_impl.cc',
96 'voice_engine_impl.h', 94 'voice_engine_impl.h',
97 ], 95 ],
98 }, 96 },
99 { 97 {
100 'target_name': 'audio_coder',
101 'type': 'static_library',
102 'sources': [
103 'coder.cc',
104 'coder.h',
105 ],
106 },
107 {
108 'target_name': 'file_player',
109 'type': 'static_library',
110 'sources': [
111 'file_player.h',
112 'file_player_impl.cc',
113 'file_player_impl.h',
114 ],
115 'dependencies': [
116 'audio_coder',
117 ],
118 },
119 {
120 'target_name': 'file_recorder',
121 'type': 'static_library',
122 'sources': [
123 'file_recorder.h',
124 'file_recorder_impl.cc',
125 'file_recorder_impl.h',
126 ],
127 'dependencies': [
128 'audio_coder',
129 ],
130 },
131 {
132 'target_name': 'level_indicator', 98 'target_name': 'level_indicator',
133 'type': 'static_library', 99 'type': 'static_library',
134 'dependencies': [ 100 'dependencies': [
135 '<(webrtc_root)/base/base.gyp:rtc_base_approved', 101 '<(webrtc_root)/base/base.gyp:rtc_base_approved',
136 '<(webrtc_root)/common.gyp:webrtc_common', 102 '<(webrtc_root)/common.gyp:webrtc_common',
137 '<(webrtc_root)/common_audio/common_audio.gyp:common_audio', 103 '<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
138 ], 104 ],
139 'sources': [ 105 'sources': [
140 'level_indicator.cc', 106 'level_indicator.cc',
141 'level_indicator.h', 107 'level_indicator.h',
142 ] 108 ]
143 } 109 }
144 ], 110 ],
145 'conditions': [ 111 'conditions': [
146 ['OS=="win"', { 112 ['OS=="win"', {
147 'defines': ['WEBRTC_DRIFT_COMPENSATION_SUPPORTED',], 113 'defines': ['WEBRTC_DRIFT_COMPENSATION_SUPPORTED',],
148 }], 114 }],
149 ['include_tests==1', { 115 ['include_tests==1', {
150 'targets': [ 116 'targets': [
151 { 117 {
152 'target_name': 'voice_engine_unittests', 118 'target_name': 'voice_engine_unittests',
153 'type': '<(gtest_target_type)', 119 'type': '<(gtest_target_type)',
154 'dependencies': [ 120 'dependencies': [
155 'voice_engine', 121 'voice_engine',
156 '<(DEPTH)/testing/gmock.gyp:gmock', 122 '<(DEPTH)/testing/gmock.gyp:gmock',
157 '<(DEPTH)/testing/gtest.gyp:gtest', 123 '<(DEPTH)/testing/gtest.gyp:gtest',
158 '<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
159 # The rest are to satisfy the unittests' include chain. 124 # The rest are to satisfy the unittests' include chain.
160 # This would be unnecessary if we used qualified includes. 125 # This would be unnecessary if we used qualified includes.
161 '<(webrtc_root)/common_audio/common_audio.gyp:common_audio', 126 '<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
162 '<(webrtc_root)/modules/modules.gyp:audio_device', 127 '<(webrtc_root)/modules/modules.gyp:audio_device',
163 '<(webrtc_root)/modules/modules.gyp:audio_processing', 128 '<(webrtc_root)/modules/modules.gyp:audio_processing',
164 '<(webrtc_root)/modules/modules.gyp:audio_coding_module', 129 '<(webrtc_root)/modules/modules.gyp:audio_coding_module',
165 '<(webrtc_root)/modules/modules.gyp:audio_conference_mixer', 130 '<(webrtc_root)/modules/modules.gyp:audio_conference_mixer',
166 '<(webrtc_root)/modules/modules.gyp:media_file', 131 '<(webrtc_root)/modules/modules.gyp:media_file',
167 '<(webrtc_root)/modules/modules.gyp:rtp_rtcp', 132 '<(webrtc_root)/modules/modules.gyp:rtp_rtcp',
168 '<(webrtc_root)/modules/modules.gyp:webrtc_utility', 133 '<(webrtc_root)/modules/modules.gyp:webrtc_utility',
169 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers' , 134 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers' ,
170 '<(webrtc_root)/test/test.gyp:test_support_main', 135 '<(webrtc_root)/test/test.gyp:test_support_main',
171 ], 136 ],
172 'sources': [ 137 'sources': [
173 'channel_unittest.cc', 138 'channel_unittest.cc',
174 'file_player_unittests.cc',
175 'network_predictor_unittest.cc', 139 'network_predictor_unittest.cc',
176 'transmit_mixer_unittest.cc', 140 'transmit_mixer_unittest.cc',
177 'utility_unittest.cc', 141 'utility_unittest.cc',
178 'voe_audio_processing_unittest.cc', 142 'voe_audio_processing_unittest.cc',
179 'voe_base_unittest.cc', 143 'voe_base_unittest.cc',
180 'voe_codec_unittest.cc', 144 'voe_codec_unittest.cc',
181 'voe_network_unittest.cc', 145 'voe_network_unittest.cc',
182 'voice_engine_fixture.cc', 146 'voice_engine_fixture.cc',
183 'voice_engine_fixture.h', 147 'voice_engine_fixture.h',
184 ], 148 ],
185 'conditions': [ 149 'conditions': [
186 ['OS=="android"', { 150 ['OS=="android"', {
187 'dependencies': [ 151 'dependencies': [
188 '<(DEPTH)/testing/android/native_test.gyp:native_test_native_cod e', 152 '<(DEPTH)/testing/android/native_test.gyp:native_test_native_cod e',
189 ], 153 ],
190 }], 154 }],
191 ['OS=="ios"', {
192 'mac_bundle_resources': [
193 '<(DEPTH)/resources/utility/encapsulated_pcm16b_8khz.wav',
194 '<(DEPTH)/resources/utility/encapsulated_pcmu_8khz.wav',
195 ],
196 }],
197 ], 155 ],
198 }, 156 },
199 { 157 {
200 # command line test that should work on linux/mac/win 158 # command line test that should work on linux/mac/win
201 'target_name': 'voe_cmd_test', 159 'target_name': 'voe_cmd_test',
202 'type': 'executable', 160 'type': 'executable',
203 'dependencies': [ 161 'dependencies': [
204 'voice_engine', 162 'voice_engine',
205 '<(DEPTH)/testing/gtest.gyp:gtest', 163 '<(DEPTH)/testing/gtest.gyp:gtest',
206 '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', 164 '<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
358 'sources': [ 316 'sources': [
359 'voe_auto_test.isolate', 317 'voe_auto_test.isolate',
360 ], 318 ],
361 }, 319 },
362 ], 320 ],
363 }], 321 }],
364 ], # conditions 322 ], # conditions
365 }], # include_tests==1 323 }], # include_tests==1
366 ], # conditions 324 ], # conditions
367 } 325 }
OLDNEW
« no previous file with comments | « webrtc/voice_engine/transmit_mixer.h ('k') | webrtc/voice_engine/voice_engine_unittests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698