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

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

Issue 2104363003: A simple copy of the old mixer to a new directory. I also plan to run 'git cl format'. In another C… (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fixed cpplint complaints in old code. Created 4 years, 5 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 | « webrtc/modules/audio_mixer/source/new_audio_conference_mixer_impl.cc ('k') | no next file » | 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) 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': [
11 '../build/common.gypi', 11 '../build/common.gypi',
12 'audio_coding/audio_coding.gypi', 12 'audio_coding/audio_coding.gypi',
13 'audio_conference_mixer/audio_conference_mixer.gypi', 13 'audio_conference_mixer/audio_conference_mixer.gypi',
14 'audio_device/audio_device.gypi', 14 'audio_device/audio_device.gypi',
15 'audio_mixer/audio_mixer.gypi',
15 'audio_processing/audio_processing.gypi', 16 'audio_processing/audio_processing.gypi',
16 'bitrate_controller/bitrate_controller.gypi', 17 'bitrate_controller/bitrate_controller.gypi',
17 'congestion_controller/congestion_controller.gypi', 18 'congestion_controller/congestion_controller.gypi',
18 'desktop_capture/desktop_capture.gypi', 19 'desktop_capture/desktop_capture.gypi',
19 'media_file/media_file.gypi', 20 'media_file/media_file.gypi',
20 'pacing/pacing.gypi', 21 'pacing/pacing.gypi',
21 'remote_bitrate_estimator/remote_bitrate_estimator.gypi', 22 'remote_bitrate_estimator/remote_bitrate_estimator.gypi',
22 'rtp_rtcp/rtp_rtcp.gypi', 23 'rtp_rtcp/rtp_rtcp.gypi',
23 'utility/utility.gypi', 24 'utility/utility.gypi',
24 'video_coding/codecs/h264/h264.gypi', 25 'video_coding/codecs/h264/h264.gypi',
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 'type': '<(gtest_target_type)', 120 'type': '<(gtest_target_type)',
120 'defines': [ 121 'defines': [
121 '<@(audio_coding_defines)', 122 '<@(audio_coding_defines)',
122 ], 123 ],
123 'dependencies': [ 124 'dependencies': [
124 'acm_receive_test', 125 'acm_receive_test',
125 'acm_send_test', 126 'acm_send_test',
126 'audio_coding_module', 127 'audio_coding_module',
127 'audio_conference_mixer', 128 'audio_conference_mixer',
128 'audio_device' , 129 'audio_device' ,
130 'audio_mixer',
129 'audio_processing', 131 'audio_processing',
130 'audioproc_test_utils', 132 'audioproc_test_utils',
131 'bitrate_controller', 133 'bitrate_controller',
132 'builtin_audio_decoder_factory', 134 'builtin_audio_decoder_factory',
133 'bwe_simulator', 135 'bwe_simulator',
134 'cng', 136 'cng',
135 'isac_fix', 137 'isac_fix',
136 'media_file', 138 'media_file',
137 'neteq', 139 'neteq',
138 'neteq_test_support', 140 'neteq_test_support',
(...skipping 632 matching lines...) Expand 10 before | Expand all | Expand 10 after
771 'sources': [ 773 'sources': [
772 'modules_unittests.isolate', 774 'modules_unittests.isolate',
773 ], 775 ],
774 }, 776 },
775 ], 777 ],
776 }], 778 }],
777 ], 779 ],
778 }], # include_tests 780 }], # include_tests
779 ], # conditions 781 ], # conditions
780 } 782 }
OLDNEW
« no previous file with comments | « webrtc/modules/audio_mixer/source/new_audio_conference_mixer_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698