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

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: Updated location for peerconnection_unittests.isolate Created 4 years, 11 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
OLDNEW
1 /* 1 /*
2 * libjingle 2 * Copyright 2012 The WebRTC project authors. All Rights Reserved.
3 * Copyright 2012 Google Inc.
4 * 3 *
5 * Redistribution and use in source and binary forms, with or without 4 * Use of this source code is governed by a BSD-style license
6 * modification, are permitted provided that the following conditions are met: 5 * that can be found in the LICENSE file in the root of the source
7 * 6 * tree. An additional intellectual property rights grant can be found
8 * 1. Redistributions of source code must retain the above copyright notice, 7 * in the file PATENTS. All contributing project authors may
9 * this list of conditions and the following disclaimer. 8 * be found in the AUTHORS file in the root of the source tree.
10 * 2. Redistributions in binary form must reproduce the above copyright notice,
11 * this list of conditions and the following disclaimer in the documentation
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
14 * derived from this software without specific prior written permission.
15 *
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
18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
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,
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
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 9 */
27 10
28 #ifndef TALK_APP_WEBRTC_PEERCONNECTION_H_ 11 #ifndef WEBRTC_API_PEERCONNECTION_H_
29 #define TALK_APP_WEBRTC_PEERCONNECTION_H_ 12 #define WEBRTC_API_PEERCONNECTION_H_
30 13
31 #include <string> 14 #include <string>
32 15
33 #include "talk/app/webrtc/dtlsidentitystore.h" 16 #include "webrtc/api/dtlsidentitystore.h"
34 #include "talk/app/webrtc/peerconnectionfactory.h" 17 #include "webrtc/api/peerconnectionfactory.h"
35 #include "talk/app/webrtc/peerconnectioninterface.h" 18 #include "webrtc/api/peerconnectioninterface.h"
36 #include "talk/app/webrtc/rtpreceiverinterface.h" 19 #include "webrtc/api/rtpreceiverinterface.h"
37 #include "talk/app/webrtc/rtpsenderinterface.h" 20 #include "webrtc/api/rtpsenderinterface.h"
38 #include "talk/app/webrtc/statscollector.h" 21 #include "webrtc/api/statscollector.h"
39 #include "talk/app/webrtc/streamcollection.h" 22 #include "webrtc/api/streamcollection.h"
40 #include "talk/app/webrtc/webrtcsession.h" 23 #include "webrtc/api/webrtcsession.h"
41 #include "webrtc/base/scoped_ptr.h" 24 #include "webrtc/base/scoped_ptr.h"
42 25
43 namespace webrtc { 26 namespace webrtc {
44 27
45 class MediaStreamObserver; 28 class MediaStreamObserver;
46 class RemoteMediaStreamFactory; 29 class RemoteMediaStreamFactory;
47 30
48 // Populates |session_options| from |rtc_options|, and returns true if options 31 // Populates |session_options| from |rtc_options|, and returns true if options
49 // are valid. 32 // are valid.
50 bool ConvertRtcOptionsForOffer( 33 bool ConvertRtcOptionsForOffer(
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 // The session_ scoped_ptr is declared at the bottom of PeerConnection 373 // The session_ scoped_ptr is declared at the bottom of PeerConnection
391 // because its destruction fires signals (such as VoiceChannelDestroyed) 374 // because its destruction fires signals (such as VoiceChannelDestroyed)
392 // which will trigger some final actions in PeerConnection... 375 // which will trigger some final actions in PeerConnection...
393 rtc::scoped_ptr<WebRtcSession> session_; 376 rtc::scoped_ptr<WebRtcSession> session_;
394 // ... But stats_ depends on session_ so it should be destroyed even earlier. 377 // ... But stats_ depends on session_ so it should be destroyed even earlier.
395 rtc::scoped_ptr<StatsCollector> stats_; 378 rtc::scoped_ptr<StatsCollector> stats_;
396 }; 379 };
397 380
398 } // namespace webrtc 381 } // namespace webrtc
399 382
400 #endif // TALK_APP_WEBRTC_PEERCONNECTION_H_ 383 #endif // WEBRTC_API_PEERCONNECTION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698