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

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

Issue 1269863005: MediaController/Call instantiation. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Remove redundant reset(nullptr) Created 5 years, 3 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 | « talk/app/webrtc/mediacontroller.cc ('k') | talk/app/webrtc/webrtcsession.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,
(...skipping 14 matching lines...) Expand all
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_WEBRTCSESSION_H_ 28 #ifndef TALK_APP_WEBRTC_WEBRTCSESSION_H_
29 #define TALK_APP_WEBRTC_WEBRTCSESSION_H_ 29 #define TALK_APP_WEBRTC_WEBRTCSESSION_H_
30 30
31 #include <string> 31 #include <string>
32 32
33 #include "talk/app/webrtc/datachannel.h" 33 #include "talk/app/webrtc/datachannel.h"
34 #include "talk/app/webrtc/dtmfsender.h" 34 #include "talk/app/webrtc/dtmfsender.h"
35 #include "talk/app/webrtc/mediacontroller.h"
35 #include "talk/app/webrtc/mediastreamprovider.h" 36 #include "talk/app/webrtc/mediastreamprovider.h"
36 #include "talk/app/webrtc/peerconnectioninterface.h" 37 #include "talk/app/webrtc/peerconnectioninterface.h"
37 #include "talk/app/webrtc/statstypes.h" 38 #include "talk/app/webrtc/statstypes.h"
38 #include "talk/media/base/mediachannel.h" 39 #include "talk/media/base/mediachannel.h"
39 #include "webrtc/p2p/base/session.h" 40 #include "webrtc/p2p/base/session.h"
40 #include "talk/session/media/mediasession.h" 41 #include "talk/session/media/mediasession.h"
41 #include "webrtc/base/sigslot.h" 42 #include "webrtc/base/sigslot.h"
42 #include "webrtc/base/sslidentity.h" 43 #include "webrtc/base/sslidentity.h"
43 #include "webrtc/base/thread.h" 44 #include "webrtc/base/thread.h"
44 45
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 return BaseSession::local_description(); 189 return BaseSession::local_description();
189 } 190 }
190 const cricket::SessionDescription* base_remote_description() const { 191 const cricket::SessionDescription* base_remote_description() const {
191 return BaseSession::remote_description(); 192 return BaseSession::remote_description();
192 } 193 }
193 194
194 // Get the id used as a media stream track's "id" field from ssrc. 195 // Get the id used as a media stream track's "id" field from ssrc.
195 virtual bool GetLocalTrackIdBySsrc(uint32 ssrc, std::string* track_id); 196 virtual bool GetLocalTrackIdBySsrc(uint32 ssrc, std::string* track_id);
196 virtual bool GetRemoteTrackIdBySsrc(uint32 ssrc, std::string* track_id); 197 virtual bool GetRemoteTrackIdBySsrc(uint32 ssrc, std::string* track_id);
197 198
198
199 // AudioMediaProviderInterface implementation. 199 // AudioMediaProviderInterface implementation.
200 void SetAudioPlayout(uint32 ssrc, 200 void SetAudioPlayout(uint32 ssrc,
201 bool enable, 201 bool enable,
202 cricket::AudioRenderer* renderer) override; 202 cricket::AudioRenderer* renderer) override;
203 void SetAudioSend(uint32 ssrc, 203 void SetAudioSend(uint32 ssrc,
204 bool enable, 204 bool enable,
205 const cricket::AudioOptions& options, 205 const cricket::AudioOptions& options,
206 cricket::AudioRenderer* renderer) override; 206 cricket::AudioRenderer* renderer) override;
207 void SetAudioPlayoutVolume(uint32 ssrc, double volume) override; 207 void SetAudioPlayoutVolume(uint32 ssrc, double volume) override;
208 208
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
363 bool* valid); 363 bool* valid);
364 364
365 std::string GetSessionErrorMsg(); 365 std::string GetSessionErrorMsg();
366 366
367 // Invoked when OnTransportCompleted is signaled to gather the usage 367 // Invoked when OnTransportCompleted is signaled to gather the usage
368 // of IPv4/IPv6 as best connection. 368 // of IPv4/IPv6 as best connection.
369 void ReportBestConnectionState(const cricket::TransportStats& stats); 369 void ReportBestConnectionState(const cricket::TransportStats& stats);
370 370
371 void ReportNegotiatedCiphers(const cricket::TransportStats& stats); 371 void ReportNegotiatedCiphers(const cricket::TransportStats& stats);
372 372
373 rtc::scoped_ptr<MediaControllerInterface> media_controller_;
373 rtc::scoped_ptr<cricket::VoiceChannel> voice_channel_; 374 rtc::scoped_ptr<cricket::VoiceChannel> voice_channel_;
374 rtc::scoped_ptr<cricket::VideoChannel> video_channel_; 375 rtc::scoped_ptr<cricket::VideoChannel> video_channel_;
375 rtc::scoped_ptr<cricket::DataChannel> data_channel_; 376 rtc::scoped_ptr<cricket::DataChannel> data_channel_;
376 cricket::ChannelManager* channel_manager_; 377 cricket::ChannelManager* channel_manager_;
377 MediaStreamSignaling* mediastream_signaling_; 378 MediaStreamSignaling* mediastream_signaling_;
378 IceObserver* ice_observer_; 379 IceObserver* ice_observer_;
379 PeerConnectionInterface::IceConnectionState ice_connection_state_; 380 PeerConnectionInterface::IceConnectionState ice_connection_state_;
380 bool ice_connection_receiving_; 381 bool ice_connection_receiving_;
381 rtc::scoped_ptr<SessionDescriptionInterface> local_desc_; 382 rtc::scoped_ptr<SessionDescriptionInterface> local_desc_;
382 rtc::scoped_ptr<SessionDescriptionInterface> remote_desc_; 383 rtc::scoped_ptr<SessionDescriptionInterface> remote_desc_;
(...skipping 28 matching lines...) Expand all
411 PeerConnectionInterface::BundlePolicy bundle_policy_; 412 PeerConnectionInterface::BundlePolicy bundle_policy_;
412 413
413 // Declares the RTCP mux policy for the WebRTCSession. 414 // Declares the RTCP mux policy for the WebRTCSession.
414 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_; 415 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_;
415 416
416 DISALLOW_COPY_AND_ASSIGN(WebRtcSession); 417 DISALLOW_COPY_AND_ASSIGN(WebRtcSession);
417 }; 418 };
418 } // namespace webrtc 419 } // namespace webrtc
419 420
420 #endif // TALK_APP_WEBRTC_WEBRTCSESSION_H_ 421 #endif // TALK_APP_WEBRTC_WEBRTCSESSION_H_
OLDNEW
« no previous file with comments | « talk/app/webrtc/mediacontroller.cc ('k') | talk/app/webrtc/webrtcsession.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698