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

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

Issue 1818033002: Embed a cricket::MediaConfig in RTCConfiguration. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 9 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 * 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
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 // PeerConnection implements the PeerConnectionInterface interface. 60 // PeerConnection implements the PeerConnectionInterface interface.
61 // It uses WebRtcSession to implement the PeerConnection functionality. 61 // It uses WebRtcSession to implement the PeerConnection functionality.
62 class PeerConnection : public PeerConnectionInterface, 62 class PeerConnection : public PeerConnectionInterface,
63 public IceObserver, 63 public IceObserver,
64 public rtc::MessageHandler, 64 public rtc::MessageHandler,
65 public sigslot::has_slots<> { 65 public sigslot::has_slots<> {
66 public: 66 public:
67 explicit PeerConnection(PeerConnectionFactory* factory); 67 explicit PeerConnection(PeerConnectionFactory* factory);
68 68
69 bool Initialize( 69 bool Initialize(
70 const cricket::MediaConfig& media_config,
71 const PeerConnectionInterface::RTCConfiguration& configuration, 70 const PeerConnectionInterface::RTCConfiguration& configuration,
72 rtc::scoped_ptr<cricket::PortAllocator> allocator, 71 rtc::scoped_ptr<cricket::PortAllocator> allocator,
73 rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store, 72 rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store,
74 PeerConnectionObserver* observer); 73 PeerConnectionObserver* observer);
75 74
76 rtc::scoped_refptr<StreamCollectionInterface> local_streams() override; 75 rtc::scoped_refptr<StreamCollectionInterface> local_streams() override;
77 rtc::scoped_refptr<StreamCollectionInterface> remote_streams() override; 76 rtc::scoped_refptr<StreamCollectionInterface> remote_streams() override;
78 bool AddStream(MediaStreamInterface* local_stream) override; 77 bool AddStream(MediaStreamInterface* local_stream) override;
79 void RemoveStream(MediaStreamInterface* local_stream) override; 78 void RemoveStream(MediaStreamInterface* local_stream) override;
80 79
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 // because its destruction fires signals (such as VoiceChannelDestroyed) 402 // because its destruction fires signals (such as VoiceChannelDestroyed)
404 // which will trigger some final actions in PeerConnection... 403 // which will trigger some final actions in PeerConnection...
405 rtc::scoped_ptr<WebRtcSession> session_; 404 rtc::scoped_ptr<WebRtcSession> session_;
406 // ... But stats_ depends on session_ so it should be destroyed even earlier. 405 // ... But stats_ depends on session_ so it should be destroyed even earlier.
407 rtc::scoped_ptr<StatsCollector> stats_; 406 rtc::scoped_ptr<StatsCollector> stats_;
408 }; 407 };
409 408
410 } // namespace webrtc 409 } // namespace webrtc
411 410
412 #endif // WEBRTC_API_PEERCONNECTION_H_ 411 #endif // WEBRTC_API_PEERCONNECTION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698