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

Unified Diff: webrtc/pc/webrtcsession.h

Issue 2794943002: Delete MediaController class, move Call ownership to PeerConnection. (Closed)
Patch Set: Revert DCHECK addition. Created 3 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: webrtc/pc/webrtcsession.h
diff --git a/webrtc/pc/webrtcsession.h b/webrtc/pc/webrtcsession.h
index a1339cbd61dd5e452404f6c386df59815109f652..dd8398e933cc6727f29dc88036b77d66f19d989a 100644
--- a/webrtc/pc/webrtcsession.h
+++ b/webrtc/pc/webrtcsession.h
@@ -27,7 +27,6 @@
#include "webrtc/p2p/base/candidate.h"
#include "webrtc/p2p/base/transportcontroller.h"
#include "webrtc/pc/datachannel.h"
-#include "webrtc/pc/mediacontroller.h"
#include "webrtc/pc/mediasession.h"
#ifdef HAVE_QUIC
@@ -55,6 +54,7 @@ namespace webrtc {
class IceRestartAnswerLatch;
class JsepIceCandidate;
class MediaStreamSignaling;
+class RtcEventLog;
class WebRtcSessionDescriptionFactory;
extern const char kBundleWithoutRtcpMux[];
@@ -159,7 +159,10 @@ class WebRtcSession :
// |sctp_factory| may be null, in which case SCTP is treated as unsupported.
WebRtcSession(
- webrtc::MediaControllerInterface* media_controller,
+ Call* call,
+ cricket::ChannelManager* channel_manager,
+ const cricket::MediaConfig& media_config,
+ RtcEventLog* event_log,
rtc::Thread* network_thread,
rtc::Thread* worker_thread,
rtc::Thread* signaling_thread,
@@ -559,7 +562,9 @@ class WebRtcSession :
const std::unique_ptr<cricket::TransportController> transport_controller_;
const std::unique_ptr<cricket::SctpTransportInternalFactory> sctp_factory_;
- MediaControllerInterface* media_controller_;
+ const cricket::MediaConfig media_config_;
+ RtcEventLog* event_log_;
+ Call* call_;
std::unique_ptr<cricket::VoiceChannel> voice_channel_;
std::unique_ptr<cricket::VideoChannel> video_channel_;
// |rtp_data_channel_| is used if in RTP data channel mode, |sctp_transport_|

Powered by Google App Engine
This is Rietveld 408576698