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

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

Issue 1610243002: Move talk/app/webrtc to webrtc/api (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Removed processing of api.gyp for Chromium builds 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/peerconnection.h ('k') | webrtc/api/peerconnection_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 * libjingle 2 * libjingle
3 * Copyright 2012 Google Inc. 3 * Copyright 2012 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
11 * this list of conditions and the following disclaimer in the documentation 11 * this list of conditions and the following disclaimer in the documentation
12 * and/or other materials provided with the distribution. 12 * and/or other materials provided with the distribution.
13 * 3. The name of the author may not be used to endorse or promote products 13 * 3. The name of the author may not be used to endorse or promote products
14 * derived from this software without specific prior written permission. 14 * derived from this software without specific prior written permission.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28 #include "talk/app/webrtc/peerconnection.h" 28 #include "webrtc/api/peerconnection.h"
29 29
30 #include <algorithm> 30 #include <algorithm>
31 #include <cctype> // for isdigit 31 #include <cctype> // for isdigit
32 #include <utility> 32 #include <utility>
33 #include <vector> 33 #include <vector>
34 34
35 #include "talk/app/webrtc/audiotrack.h"
36 #include "talk/app/webrtc/dtmfsender.h"
37 #include "talk/app/webrtc/jsepicecandidate.h"
38 #include "talk/app/webrtc/jsepsessiondescription.h"
39 #include "talk/app/webrtc/mediaconstraintsinterface.h"
40 #include "talk/app/webrtc/mediastream.h"
41 #include "talk/app/webrtc/mediastreamobserver.h"
42 #include "talk/app/webrtc/mediastreamproxy.h"
43 #include "talk/app/webrtc/mediastreamtrackproxy.h"
44 #include "talk/app/webrtc/remoteaudiosource.h"
45 #include "talk/app/webrtc/remotevideocapturer.h"
46 #include "talk/app/webrtc/rtpreceiver.h"
47 #include "talk/app/webrtc/rtpsender.h"
48 #include "talk/app/webrtc/streamcollection.h"
49 #include "talk/app/webrtc/videosource.h"
50 #include "talk/app/webrtc/videotrack.h"
51 #include "talk/session/media/channelmanager.h" 35 #include "talk/session/media/channelmanager.h"
36 #include "webrtc/api/audiotrack.h"
37 #include "webrtc/api/dtmfsender.h"
38 #include "webrtc/api/jsepicecandidate.h"
39 #include "webrtc/api/jsepsessiondescription.h"
40 #include "webrtc/api/mediaconstraintsinterface.h"
41 #include "webrtc/api/mediastream.h"
42 #include "webrtc/api/mediastreamobserver.h"
43 #include "webrtc/api/mediastreamproxy.h"
44 #include "webrtc/api/mediastreamtrackproxy.h"
45 #include "webrtc/api/remoteaudiosource.h"
46 #include "webrtc/api/remotevideocapturer.h"
47 #include "webrtc/api/rtpreceiver.h"
48 #include "webrtc/api/rtpsender.h"
49 #include "webrtc/api/streamcollection.h"
50 #include "webrtc/api/videosource.h"
51 #include "webrtc/api/videotrack.h"
52 #include "webrtc/base/arraysize.h" 52 #include "webrtc/base/arraysize.h"
53 #include "webrtc/base/logging.h" 53 #include "webrtc/base/logging.h"
54 #include "webrtc/base/stringencode.h" 54 #include "webrtc/base/stringencode.h"
55 #include "webrtc/base/stringutils.h" 55 #include "webrtc/base/stringutils.h"
56 #include "webrtc/base/trace_event.h" 56 #include "webrtc/base/trace_event.h"
57 #include "webrtc/media/sctp/sctpdataengine.h" 57 #include "webrtc/media/sctp/sctpdataengine.h"
58 #include "webrtc/p2p/client/basicportallocator.h" 58 #include "webrtc/p2p/client/basicportallocator.h"
59 #include "webrtc/system_wrappers/include/field_trial.h" 59 #include "webrtc/system_wrappers/include/field_trial.h"
60 60
61 namespace { 61 namespace {
(...skipping 2020 matching lines...) Expand 10 before | Expand all | Expand 10 after
2082 DataChannel* PeerConnection::FindDataChannelBySid(int sid) const { 2082 DataChannel* PeerConnection::FindDataChannelBySid(int sid) const {
2083 for (const auto& channel : sctp_data_channels_) { 2083 for (const auto& channel : sctp_data_channels_) {
2084 if (channel->id() == sid) { 2084 if (channel->id() == sid) {
2085 return channel; 2085 return channel;
2086 } 2086 }
2087 } 2087 }
2088 return nullptr; 2088 return nullptr;
2089 } 2089 }
2090 2090
2091 } // namespace webrtc 2091 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/api/peerconnection.h ('k') | webrtc/api/peerconnection_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698