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

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

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/objctests/RTCSessionDescriptionTest.mm ('k') | webrtc/api/peerconnection.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 #ifndef TALK_APP_WEBRTC_PEERCONNECTION_H_ 28 #ifndef WEBRTC_API_PEERCONNECTION_H_
29 #define TALK_APP_WEBRTC_PEERCONNECTION_H_ 29 #define WEBRTC_API_PEERCONNECTION_H_
30 30
31 #include <string> 31 #include <string>
32 32
33 #include "talk/app/webrtc/dtlsidentitystore.h" 33 #include "webrtc/api/dtlsidentitystore.h"
34 #include "talk/app/webrtc/peerconnectionfactory.h" 34 #include "webrtc/api/peerconnectionfactory.h"
35 #include "talk/app/webrtc/peerconnectioninterface.h" 35 #include "webrtc/api/peerconnectioninterface.h"
36 #include "talk/app/webrtc/rtpreceiverinterface.h" 36 #include "webrtc/api/rtpreceiverinterface.h"
37 #include "talk/app/webrtc/rtpsenderinterface.h" 37 #include "webrtc/api/rtpsenderinterface.h"
38 #include "talk/app/webrtc/statscollector.h" 38 #include "webrtc/api/statscollector.h"
39 #include "talk/app/webrtc/streamcollection.h" 39 #include "webrtc/api/streamcollection.h"
40 #include "talk/app/webrtc/webrtcsession.h" 40 #include "webrtc/api/webrtcsession.h"
41 #include "webrtc/base/scoped_ptr.h" 41 #include "webrtc/base/scoped_ptr.h"
42 42
43 namespace webrtc { 43 namespace webrtc {
44 44
45 class MediaStreamObserver; 45 class MediaStreamObserver;
46 class RemoteMediaStreamFactory; 46 class RemoteMediaStreamFactory;
47 47
48 // Populates |session_options| from |rtc_options|, and returns true if options 48 // Populates |session_options| from |rtc_options|, and returns true if options
49 // are valid. 49 // are valid.
50 bool ConvertRtcOptionsForOffer( 50 bool ConvertRtcOptionsForOffer(
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 // The session_ scoped_ptr is declared at the bottom of PeerConnection 389 // The session_ scoped_ptr is declared at the bottom of PeerConnection
390 // because its destruction fires signals (such as VoiceChannelDestroyed) 390 // because its destruction fires signals (such as VoiceChannelDestroyed)
391 // which will trigger some final actions in PeerConnection... 391 // which will trigger some final actions in PeerConnection...
392 rtc::scoped_ptr<WebRtcSession> session_; 392 rtc::scoped_ptr<WebRtcSession> session_;
393 // ... But stats_ depends on session_ so it should be destroyed even earlier. 393 // ... But stats_ depends on session_ so it should be destroyed even earlier.
394 rtc::scoped_ptr<StatsCollector> stats_; 394 rtc::scoped_ptr<StatsCollector> stats_;
395 }; 395 };
396 396
397 } // namespace webrtc 397 } // namespace webrtc
398 398
399 #endif // TALK_APP_WEBRTC_PEERCONNECTION_H_ 399 #endif // WEBRTC_API_PEERCONNECTION_H_
OLDNEW
« no previous file with comments | « webrtc/api/objctests/RTCSessionDescriptionTest.mm ('k') | webrtc/api/peerconnection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698