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

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

Issue 1363573002: Wire up transport sequence number / send time callbacks to webrtc via libjingle. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Cleanup 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 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 RTC_DISALLOW_COPY_AND_ASSIGN(IceObserver); 112 RTC_DISALLOW_COPY_AND_ASSIGN(IceObserver);
113 }; 113 };
114 114
115 class WebRtcSession : public cricket::BaseSession, 115 class WebRtcSession : public cricket::BaseSession,
116 public AudioProviderInterface, 116 public AudioProviderInterface,
117 public DataChannelFactory, 117 public DataChannelFactory,
118 public VideoProviderInterface, 118 public VideoProviderInterface,
119 public DtmfProviderInterface, 119 public DtmfProviderInterface,
120 public DataChannelProviderInterface { 120 public DataChannelProviderInterface {
121 public: 121 public:
122 WebRtcSession(cricket::ChannelManager* channel_manager, 122 WebRtcSession(webrtc::MediaControllerInterface* media_controller,
123 rtc::Thread* signaling_thread, 123 rtc::Thread* signaling_thread,
124 rtc::Thread* worker_thread, 124 rtc::Thread* worker_thread,
125 cricket::PortAllocator* port_allocator, 125 cricket::PortAllocator* port_allocator,
126 MediaStreamSignaling* mediastream_signaling); 126 MediaStreamSignaling* mediastream_signaling);
127 virtual ~WebRtcSession(); 127 virtual ~WebRtcSession();
128 128
129 bool Initialize( 129 bool Initialize(
130 const PeerConnectionFactoryInterface::Options& options, 130 const PeerConnectionFactoryInterface::Options& options,
131 const MediaConstraintsInterface* constraints, 131 const MediaConstraintsInterface* constraints,
132 rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store, 132 rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store,
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
376 376
377 // Invoked when TransportController connection completion is signaled. 377 // Invoked when TransportController connection completion is signaled.
378 // Reports stats for all transports in use. 378 // Reports stats for all transports in use.
379 void ReportTransportStats(); 379 void ReportTransportStats();
380 380
381 // Gather the usage of IPv4/IPv6 as best connection. 381 // Gather the usage of IPv4/IPv6 as best connection.
382 void ReportBestConnectionState(const cricket::TransportStats& stats); 382 void ReportBestConnectionState(const cricket::TransportStats& stats);
383 383
384 void ReportNegotiatedCiphers(const cricket::TransportStats& stats); 384 void ReportNegotiatedCiphers(const cricket::TransportStats& stats);
385 385
386 rtc::scoped_ptr<MediaControllerInterface> media_controller_; 386 void OnSentPacket(cricket::TransportChannel* channel,
387 const rtc::SentPacket& sent_packet);
388 void OnSentPacket_w(const rtc::SentPacket& sent_packet);
389
390 MediaControllerInterface* media_controller_;
387 rtc::scoped_ptr<cricket::VoiceChannel> voice_channel_; 391 rtc::scoped_ptr<cricket::VoiceChannel> voice_channel_;
388 rtc::scoped_ptr<cricket::VideoChannel> video_channel_; 392 rtc::scoped_ptr<cricket::VideoChannel> video_channel_;
389 rtc::scoped_ptr<cricket::DataChannel> data_channel_; 393 rtc::scoped_ptr<cricket::DataChannel> data_channel_;
390 cricket::ChannelManager* channel_manager_; 394 cricket::ChannelManager* channel_manager_;
391 MediaStreamSignaling* mediastream_signaling_; 395 MediaStreamSignaling* mediastream_signaling_;
392 IceObserver* ice_observer_; 396 IceObserver* ice_observer_;
393 PeerConnectionInterface::IceConnectionState ice_connection_state_; 397 PeerConnectionInterface::IceConnectionState ice_connection_state_;
394 bool ice_connection_receiving_; 398 bool ice_connection_receiving_;
395 rtc::scoped_ptr<SessionDescriptionInterface> local_desc_; 399 rtc::scoped_ptr<SessionDescriptionInterface> local_desc_;
396 rtc::scoped_ptr<SessionDescriptionInterface> remote_desc_; 400 rtc::scoped_ptr<SessionDescriptionInterface> remote_desc_;
(...skipping 28 matching lines...) Expand all
425 PeerConnectionInterface::BundlePolicy bundle_policy_; 429 PeerConnectionInterface::BundlePolicy bundle_policy_;
426 430
427 // Declares the RTCP mux policy for the WebRTCSession. 431 // Declares the RTCP mux policy for the WebRTCSession.
428 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_; 432 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_;
429 433
430 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession); 434 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession);
431 }; 435 };
432 } // namespace webrtc 436 } // namespace webrtc
433 437
434 #endif // TALK_APP_WEBRTC_WEBRTCSESSION_H_ 438 #endif // TALK_APP_WEBRTC_WEBRTCSESSION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698