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

Side by Side Diff: webrtc/media/engine/webrtcvoiceengine.cc

Issue 2969623003: Update includes for webrtc/{base => rtc_base} rename (2/3) (Closed)
Patch Set: Rebased onto 224e65939af87443addfc5bb500fbf434728bd1c and restored sorting in clock.cc Created 3 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2004 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2004 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifdef HAVE_WEBRTC_VOICE 11 #ifdef HAVE_WEBRTC_VOICE
12 12
13 #include "webrtc/media/engine/webrtcvoiceengine.h" 13 #include "webrtc/media/engine/webrtcvoiceengine.h"
14 14
15 #include <algorithm> 15 #include <algorithm>
16 #include <cstdio> 16 #include <cstdio>
17 #include <functional> 17 #include <functional>
18 #include <string> 18 #include <string>
19 #include <vector> 19 #include <vector>
20 20
21 #include "webrtc/api/call/audio_sink.h" 21 #include "webrtc/api/call/audio_sink.h"
22 #include "webrtc/base/arraysize.h"
23 #include "webrtc/base/base64.h"
24 #include "webrtc/base/byteorder.h"
25 #include "webrtc/base/constructormagic.h"
26 #include "webrtc/base/helpers.h"
27 #include "webrtc/base/logging.h"
28 #include "webrtc/base/race_checker.h"
29 #include "webrtc/base/stringencode.h"
30 #include "webrtc/base/stringutils.h"
31 #include "webrtc/base/trace_event.h"
32 #include "webrtc/media/base/audiosource.h" 22 #include "webrtc/media/base/audiosource.h"
33 #include "webrtc/media/base/mediaconstants.h" 23 #include "webrtc/media/base/mediaconstants.h"
34 #include "webrtc/media/base/streamparams.h" 24 #include "webrtc/media/base/streamparams.h"
35 #include "webrtc/media/engine/adm_helpers.h" 25 #include "webrtc/media/engine/adm_helpers.h"
36 #include "webrtc/media/engine/apm_helpers.h" 26 #include "webrtc/media/engine/apm_helpers.h"
37 #include "webrtc/media/engine/payload_type_mapper.h" 27 #include "webrtc/media/engine/payload_type_mapper.h"
38 #include "webrtc/media/engine/webrtcmediaengine.h" 28 #include "webrtc/media/engine/webrtcmediaengine.h"
39 #include "webrtc/media/engine/webrtcvoe.h" 29 #include "webrtc/media/engine/webrtcvoe.h"
40 #include "webrtc/modules/audio_mixer/audio_mixer_impl.h" 30 #include "webrtc/modules/audio_mixer/audio_mixer_impl.h"
41 #include "webrtc/modules/audio_processing/aec_dump/aec_dump_factory.h" 31 #include "webrtc/modules/audio_processing/aec_dump/aec_dump_factory.h"
42 #include "webrtc/modules/audio_processing/include/audio_processing.h" 32 #include "webrtc/modules/audio_processing/include/audio_processing.h"
33 #include "webrtc/rtc_base/arraysize.h"
34 #include "webrtc/rtc_base/base64.h"
35 #include "webrtc/rtc_base/byteorder.h"
36 #include "webrtc/rtc_base/constructormagic.h"
37 #include "webrtc/rtc_base/helpers.h"
38 #include "webrtc/rtc_base/logging.h"
39 #include "webrtc/rtc_base/race_checker.h"
40 #include "webrtc/rtc_base/stringencode.h"
41 #include "webrtc/rtc_base/stringutils.h"
42 #include "webrtc/rtc_base/trace_event.h"
43 #include "webrtc/system_wrappers/include/field_trial.h" 43 #include "webrtc/system_wrappers/include/field_trial.h"
44 #include "webrtc/system_wrappers/include/metrics.h" 44 #include "webrtc/system_wrappers/include/metrics.h"
45 #include "webrtc/system_wrappers/include/trace.h" 45 #include "webrtc/system_wrappers/include/trace.h"
46 #include "webrtc/voice_engine/transmit_mixer.h" 46 #include "webrtc/voice_engine/transmit_mixer.h"
47 47
48 namespace cricket { 48 namespace cricket {
49 namespace { 49 namespace {
50 50
51 constexpr size_t kMaxUnsignaledRecvStreams = 4; 51 constexpr size_t kMaxUnsignaledRecvStreams = 4;
52 52
(...skipping 2315 matching lines...) Expand 10 before | Expand all | Expand 10 after
2368 ssrc); 2368 ssrc);
2369 if (it != unsignaled_recv_ssrcs_.end()) { 2369 if (it != unsignaled_recv_ssrcs_.end()) {
2370 unsignaled_recv_ssrcs_.erase(it); 2370 unsignaled_recv_ssrcs_.erase(it);
2371 return true; 2371 return true;
2372 } 2372 }
2373 return false; 2373 return false;
2374 } 2374 }
2375 } // namespace cricket 2375 } // namespace cricket
2376 2376
2377 #endif // HAVE_WEBRTC_VOICE 2377 #endif // HAVE_WEBRTC_VOICE
OLDNEW
« no previous file with comments | « webrtc/media/engine/webrtcvoiceengine.h ('k') | webrtc/media/engine/webrtcvoiceengine_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698