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

Side by Side Diff: talk/app/webrtc/peerconnection.h

Issue 1391013007: Adding the ability to change ICE servers through SetConfiguration. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 2 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 * 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,
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 // It uses MediaStreamSignaling and WebRtcSession to implement 58 // It uses MediaStreamSignaling and WebRtcSession to implement
59 // the PeerConnection functionality. 59 // the PeerConnection functionality.
60 class PeerConnection : public PeerConnectionInterface, 60 class PeerConnection : public PeerConnectionInterface,
61 public MediaStreamSignalingObserver, 61 public MediaStreamSignalingObserver,
62 public IceObserver, 62 public IceObserver,
63 public rtc::MessageHandler, 63 public rtc::MessageHandler,
64 public sigslot::has_slots<> { 64 public sigslot::has_slots<> {
65 public: 65 public:
66 explicit PeerConnection(PeerConnectionFactory* factory); 66 explicit PeerConnection(PeerConnectionFactory* factory);
67 67
68 // TODO(deadbeef): Remove this overload of Initialize once everyone is moved
69 // to the new version.
68 bool Initialize( 70 bool Initialize(
69 const PeerConnectionInterface::RTCConfiguration& configuration, 71 const PeerConnectionInterface::RTCConfiguration& configuration,
70 const MediaConstraintsInterface* constraints, 72 const MediaConstraintsInterface* constraints,
71 PortAllocatorFactoryInterface* allocator_factory, 73 PortAllocatorFactoryInterface* allocator_factory,
72 rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store, 74 rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store,
73 PeerConnectionObserver* observer); 75 PeerConnectionObserver* observer);
76
77 bool Initialize(
78 const PeerConnectionInterface::RTCConfiguration& configuration,
79 const MediaConstraintsInterface* constraints,
80 rtc::scoped_ptr<cricket::PortAllocator> allocator,
81 rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store,
82 PeerConnectionObserver* observer);
83
74 rtc::scoped_refptr<StreamCollectionInterface> local_streams() override; 84 rtc::scoped_refptr<StreamCollectionInterface> local_streams() override;
75 rtc::scoped_refptr<StreamCollectionInterface> remote_streams() override; 85 rtc::scoped_refptr<StreamCollectionInterface> remote_streams() override;
76 bool AddStream(MediaStreamInterface* local_stream) override; 86 bool AddStream(MediaStreamInterface* local_stream) override;
77 void RemoveStream(MediaStreamInterface* local_stream) override; 87 void RemoveStream(MediaStreamInterface* local_stream) override;
78 88
79 rtc::scoped_refptr<DtmfSenderInterface> CreateDtmfSender( 89 rtc::scoped_refptr<DtmfSenderInterface> CreateDtmfSender(
80 AudioTrackInterface* track) override; 90 AudioTrackInterface* track) override;
81 91
82 std::vector<rtc::scoped_refptr<RtpSenderInterface>> GetSenders() 92 std::vector<rtc::scoped_refptr<RtpSenderInterface>> GetSenders()
83 const override; 93 const override;
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 rtc::scoped_ptr<MediaStreamSignaling> mediastream_signaling_; 212 rtc::scoped_ptr<MediaStreamSignaling> mediastream_signaling_;
203 rtc::scoped_ptr<StatsCollector> stats_; 213 rtc::scoped_ptr<StatsCollector> stats_;
204 214
205 std::vector<rtc::scoped_refptr<RtpSenderInterface>> senders_; 215 std::vector<rtc::scoped_refptr<RtpSenderInterface>> senders_;
206 std::vector<rtc::scoped_refptr<RtpReceiverInterface>> receivers_; 216 std::vector<rtc::scoped_refptr<RtpReceiverInterface>> receivers_;
207 }; 217 };
208 218
209 } // namespace webrtc 219 } // namespace webrtc
210 220
211 #endif // TALK_APP_WEBRTC_PEERCONNECTION_H_ 221 #endif // TALK_APP_WEBRTC_PEERCONNECTION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698