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

Side by Side Diff: talk/app/webrtc/peerconnection.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: Add missing updated_options 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 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 rtc::scoped_refptr<PeerConnectionFactory> factory_; 354 rtc::scoped_refptr<PeerConnectionFactory> factory_;
355 PeerConnectionObserver* observer_; 355 PeerConnectionObserver* observer_;
356 UMAObserver* uma_observer_; 356 UMAObserver* uma_observer_;
357 SignalingState signaling_state_; 357 SignalingState signaling_state_;
358 // TODO(bemasc): Remove ice_state_. 358 // TODO(bemasc): Remove ice_state_.
359 IceState ice_state_; 359 IceState ice_state_;
360 IceConnectionState ice_connection_state_; 360 IceConnectionState ice_connection_state_;
361 IceGatheringState ice_gathering_state_; 361 IceGatheringState ice_gathering_state_;
362 362
363 rtc::scoped_ptr<cricket::PortAllocator> port_allocator_; 363 rtc::scoped_ptr<cricket::PortAllocator> port_allocator_;
364 rtc::scoped_ptr<MediaControllerInterface> media_controller_;
364 365
365 // Streams added via AddStream. 366 // Streams added via AddStream.
366 rtc::scoped_refptr<StreamCollection> local_streams_; 367 rtc::scoped_refptr<StreamCollection> local_streams_;
367 // Streams created as a result of SetRemoteDescription. 368 // Streams created as a result of SetRemoteDescription.
368 rtc::scoped_refptr<StreamCollection> remote_streams_; 369 rtc::scoped_refptr<StreamCollection> remote_streams_;
369 370
370 // These lists store track info seen in local/remote descriptions. 371 // These lists store track info seen in local/remote descriptions.
371 TrackInfos remote_audio_tracks_; 372 TrackInfos remote_audio_tracks_;
372 TrackInfos remote_video_tracks_; 373 TrackInfos remote_video_tracks_;
373 TrackInfos local_audio_tracks_; 374 TrackInfos local_audio_tracks_;
(...skipping 14 matching lines...) Expand all
388 // because its destruction fires signals (such as VoiceChannelDestroyed) 389 // because its destruction fires signals (such as VoiceChannelDestroyed)
389 // which will trigger some final actions in PeerConnection... 390 // which will trigger some final actions in PeerConnection...
390 rtc::scoped_ptr<WebRtcSession> session_; 391 rtc::scoped_ptr<WebRtcSession> session_;
391 // ... But stats_ depends on session_ so it should be destroyed even earlier. 392 // ... But stats_ depends on session_ so it should be destroyed even earlier.
392 rtc::scoped_ptr<StatsCollector> stats_; 393 rtc::scoped_ptr<StatsCollector> stats_;
393 }; 394 };
394 395
395 } // namespace webrtc 396 } // namespace webrtc
396 397
397 #endif // TALK_APP_WEBRTC_PEERCONNECTION_H_ 398 #endif // TALK_APP_WEBRTC_PEERCONNECTION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698