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

Side by Side Diff: webrtc/api/webrtcsession.cc

Issue 1691463002: Move talk/session/media -> webrtc/pc (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Last rebase Created 4 years, 10 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/api/webrtcsession.h ('k') | webrtc/api/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/api/webrtcsession.h" 11 #include "webrtc/api/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 "talk/session/media/channel.h"
21 #include "talk/session/media/channelmanager.h"
22 #include "talk/session/media/mediasession.h"
23 #include "webrtc/api/jsepicecandidate.h" 20 #include "webrtc/api/jsepicecandidate.h"
24 #include "webrtc/api/jsepsessiondescription.h" 21 #include "webrtc/api/jsepsessiondescription.h"
25 #include "webrtc/api/mediaconstraintsinterface.h" 22 #include "webrtc/api/mediaconstraintsinterface.h"
26 #include "webrtc/api/peerconnectioninterface.h" 23 #include "webrtc/api/peerconnectioninterface.h"
27 #include "webrtc/api/sctputils.h" 24 #include "webrtc/api/sctputils.h"
28 #include "webrtc/api/webrtcsessiondescriptionfactory.h" 25 #include "webrtc/api/webrtcsessiondescriptionfactory.h"
29 #include "webrtc/audio/audio_sink.h" 26 #include "webrtc/audio/audio_sink.h"
30 #include "webrtc/base/basictypes.h" 27 #include "webrtc/base/basictypes.h"
31 #include "webrtc/base/checks.h" 28 #include "webrtc/base/checks.h"
32 #include "webrtc/base/helpers.h" 29 #include "webrtc/base/helpers.h"
33 #include "webrtc/base/logging.h" 30 #include "webrtc/base/logging.h"
34 #include "webrtc/base/stringencode.h" 31 #include "webrtc/base/stringencode.h"
35 #include "webrtc/base/stringutils.h" 32 #include "webrtc/base/stringutils.h"
36 #include "webrtc/call.h" 33 #include "webrtc/call.h"
37 #include "webrtc/media/base/constants.h" 34 #include "webrtc/media/base/constants.h"
38 #include "webrtc/media/base/videocapturer.h" 35 #include "webrtc/media/base/videocapturer.h"
39 #include "webrtc/p2p/base/portallocator.h" 36 #include "webrtc/p2p/base/portallocator.h"
40 #include "webrtc/p2p/base/transportchannel.h" 37 #include "webrtc/p2p/base/transportchannel.h"
38 #include "webrtc/pc/channel.h"
39 #include "webrtc/pc/channelmanager.h"
40 #include "webrtc/pc/mediasession.h"
41 41
42 using cricket::ContentInfo; 42 using cricket::ContentInfo;
43 using cricket::ContentInfos; 43 using cricket::ContentInfos;
44 using cricket::MediaContentDescription; 44 using cricket::MediaContentDescription;
45 using cricket::SessionDescription; 45 using cricket::SessionDescription;
46 using cricket::TransportInfo; 46 using cricket::TransportInfo;
47 47
48 using cricket::LOCAL_PORT_TYPE; 48 using cricket::LOCAL_PORT_TYPE;
49 using cricket::STUN_PORT_TYPE; 49 using cricket::STUN_PORT_TYPE;
50 using cricket::RELAY_PORT_TYPE; 50 using cricket::RELAY_PORT_TYPE;
(...skipping 2108 matching lines...) Expand 10 before | Expand all | Expand 10 after
2159 } 2159 }
2160 } 2160 }
2161 2161
2162 void WebRtcSession::OnSentPacket_w(cricket::TransportChannel* channel, 2162 void WebRtcSession::OnSentPacket_w(cricket::TransportChannel* channel,
2163 const rtc::SentPacket& sent_packet) { 2163 const rtc::SentPacket& sent_packet) {
2164 RTC_DCHECK(worker_thread()->IsCurrent()); 2164 RTC_DCHECK(worker_thread()->IsCurrent());
2165 media_controller_->call_w()->OnSentPacket(sent_packet); 2165 media_controller_->call_w()->OnSentPacket(sent_packet);
2166 } 2166 }
2167 2167
2168 } // namespace webrtc 2168 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/api/webrtcsession.h ('k') | webrtc/api/webrtcsession_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698