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

Side by Side Diff: webrtc/pc/webrtcsession.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
« no previous file with comments | « webrtc/pc/webrtcsession.h ('k') | webrtc/pc/webrtcsession_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2012 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/webrtcsession.h" 11 #include "webrtc/pc/webrtcsession.h"
12 12
13 #include <limits.h> 13 #include <limits.h>
14 14
15 #include <algorithm> 15 #include <algorithm>
16 #include <set> 16 #include <set>
17 #include <utility> 17 #include <utility>
18 #include <vector> 18 #include <vector>
19 19
20 #include "webrtc/api/call/audio_sink.h" 20 #include "webrtc/api/call/audio_sink.h"
21 #include "webrtc/api/jsepicecandidate.h" 21 #include "webrtc/api/jsepicecandidate.h"
22 #include "webrtc/api/jsepsessiondescription.h" 22 #include "webrtc/api/jsepsessiondescription.h"
23 #include "webrtc/api/peerconnectioninterface.h" 23 #include "webrtc/api/peerconnectioninterface.h"
24 #include "webrtc/base/basictypes.h"
25 #include "webrtc/base/bind.h"
26 #include "webrtc/base/checks.h"
27 #include "webrtc/base/helpers.h"
28 #include "webrtc/base/logging.h"
29 #include "webrtc/base/stringencode.h"
30 #include "webrtc/base/stringutils.h"
31 #include "webrtc/call/call.h" 24 #include "webrtc/call/call.h"
32 #include "webrtc/media/base/mediaconstants.h" 25 #include "webrtc/media/base/mediaconstants.h"
33 #include "webrtc/media/base/videocapturer.h" 26 #include "webrtc/media/base/videocapturer.h"
34 #include "webrtc/media/sctp/sctptransportinternal.h" 27 #include "webrtc/media/sctp/sctptransportinternal.h"
35 #include "webrtc/p2p/base/portallocator.h" 28 #include "webrtc/p2p/base/portallocator.h"
36 #include "webrtc/pc/channel.h" 29 #include "webrtc/pc/channel.h"
37 #include "webrtc/pc/channelmanager.h" 30 #include "webrtc/pc/channelmanager.h"
38 #include "webrtc/pc/mediasession.h" 31 #include "webrtc/pc/mediasession.h"
39 #include "webrtc/pc/sctputils.h" 32 #include "webrtc/pc/sctputils.h"
40 #include "webrtc/pc/webrtcsessiondescriptionfactory.h" 33 #include "webrtc/pc/webrtcsessiondescriptionfactory.h"
34 #include "webrtc/rtc_base/basictypes.h"
35 #include "webrtc/rtc_base/bind.h"
36 #include "webrtc/rtc_base/checks.h"
37 #include "webrtc/rtc_base/helpers.h"
38 #include "webrtc/rtc_base/logging.h"
39 #include "webrtc/rtc_base/stringencode.h"
40 #include "webrtc/rtc_base/stringutils.h"
41 41
42 #ifdef HAVE_QUIC 42 #ifdef HAVE_QUIC
43 #include "webrtc/p2p/quic/quictransportchannel.h" 43 #include "webrtc/p2p/quic/quictransportchannel.h"
44 #endif // HAVE_QUIC 44 #endif // HAVE_QUIC
45 45
46 using cricket::ContentInfo; 46 using cricket::ContentInfo;
47 using cricket::ContentInfos; 47 using cricket::ContentInfos;
48 using cricket::MediaContentDescription; 48 using cricket::MediaContentDescription;
49 using cricket::SessionDescription; 49 using cricket::SessionDescription;
50 using cricket::TransportInfo; 50 using cricket::TransportInfo;
(...skipping 2352 matching lines...) Expand 10 before | Expand all | Expand 10 after
2403 (rtp_data_channel_->rtcp_dtls_transport() != nullptr); 2403 (rtp_data_channel_->rtcp_dtls_transport() != nullptr);
2404 channel_manager_->DestroyRtpDataChannel(rtp_data_channel_.release()); 2404 channel_manager_->DestroyRtpDataChannel(rtp_data_channel_.release());
2405 transport_controller_->DestroyDtlsTransport( 2405 transport_controller_->DestroyDtlsTransport(
2406 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP); 2406 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP);
2407 if (need_to_delete_rtcp) { 2407 if (need_to_delete_rtcp) {
2408 transport_controller_->DestroyDtlsTransport( 2408 transport_controller_->DestroyDtlsTransport(
2409 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTCP); 2409 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTCP);
2410 } 2410 }
2411 } 2411 }
2412 } // namespace webrtc 2412 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/pc/webrtcsession.h ('k') | webrtc/pc/webrtcsession_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698