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

Side by Side Diff: webrtc/pc/channelmanager.cc

Issue 2514883002: Create //webrtc/api:libjingle_peerconnection_api + refactorings. (Closed)
Patch Set: Rebase Created 4 years 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 2004 The WebRTC project authors. All Rights Reserved. 2 * Copyright 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 #include "webrtc/pc/channelmanager.h" 11 #include "webrtc/pc/channelmanager.h"
12 12
13 #include <algorithm> 13 #include <algorithm>
14 14
15 #include "webrtc/api/mediacontroller.h"
16 #include "webrtc/base/bind.h" 15 #include "webrtc/base/bind.h"
17 #include "webrtc/base/common.h" 16 #include "webrtc/base/common.h"
18 #include "webrtc/base/logging.h" 17 #include "webrtc/base/logging.h"
19 #include "webrtc/base/stringencode.h" 18 #include "webrtc/base/stringencode.h"
20 #include "webrtc/base/stringutils.h" 19 #include "webrtc/base/stringutils.h"
21 #include "webrtc/base/trace_event.h" 20 #include "webrtc/base/trace_event.h"
22 #include "webrtc/media/base/device.h" 21 #include "webrtc/media/base/device.h"
23 #include "webrtc/media/base/hybriddataengine.h" 22 #include "webrtc/media/base/hybriddataengine.h"
24 #include "webrtc/media/base/rtpdataengine.h" 23 #include "webrtc/media/base/rtpdataengine.h"
25 #ifdef HAVE_SCTP 24 #ifdef HAVE_SCTP
26 #include "webrtc/media/sctp/sctpdataengine.h" 25 #include "webrtc/media/sctp/sctpdataengine.h"
27 #endif 26 #endif
28 #include "webrtc/pc/srtpfilter.h" 27 #include "webrtc/pc/srtpfilter.h"
28 #include "webrtc/pc/mediacontroller.h"
29 29
30 namespace cricket { 30 namespace cricket {
31 31
32 32
33 using rtc::Bind; 33 using rtc::Bind;
34 34
35 static DataEngineInterface* ConstructDataEngine() { 35 static DataEngineInterface* ConstructDataEngine() {
36 #ifdef HAVE_SCTP 36 #ifdef HAVE_SCTP
37 return new HybridDataEngine(new RtpDataEngine(), new SctpDataEngine()); 37 return new HybridDataEngine(new RtpDataEngine(), new SctpDataEngine());
38 #else 38 #else
(...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after
426 media_engine_.get(), file, max_size_bytes)); 426 media_engine_.get(), file, max_size_bytes));
427 } 427 }
428 428
429 void ChannelManager::StopAecDump() { 429 void ChannelManager::StopAecDump() {
430 worker_thread_->Invoke<void>( 430 worker_thread_->Invoke<void>(
431 RTC_FROM_HERE, 431 RTC_FROM_HERE,
432 Bind(&MediaEngineInterface::StopAecDump, media_engine_.get())); 432 Bind(&MediaEngineInterface::StopAecDump, media_engine_.get()));
433 } 433 }
434 434
435 } // namespace cricket 435 } // namespace cricket
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698