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

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

Issue 1516943002: Reland of Free SCTP data channels asynchronously in PeerConnection. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Adding RTC_DCHECK as suggested. Created 5 years 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 | « no previous file | talk/app/webrtc/peerconnection.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 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 // These lists store track info seen in local/remote descriptions. 367 // These lists store track info seen in local/remote descriptions.
368 TrackInfos remote_audio_tracks_; 368 TrackInfos remote_audio_tracks_;
369 TrackInfos remote_video_tracks_; 369 TrackInfos remote_video_tracks_;
370 TrackInfos local_audio_tracks_; 370 TrackInfos local_audio_tracks_;
371 TrackInfos local_video_tracks_; 371 TrackInfos local_video_tracks_;
372 372
373 SctpSidAllocator sid_allocator_; 373 SctpSidAllocator sid_allocator_;
374 // label -> DataChannel 374 // label -> DataChannel
375 std::map<std::string, rtc::scoped_refptr<DataChannel>> rtp_data_channels_; 375 std::map<std::string, rtc::scoped_refptr<DataChannel>> rtp_data_channels_;
376 std::vector<rtc::scoped_refptr<DataChannel>> sctp_data_channels_; 376 std::vector<rtc::scoped_refptr<DataChannel>> sctp_data_channels_;
377 std::vector<rtc::scoped_refptr<DataChannel>> sctp_data_channels_to_free_;
377 378
378 bool remote_peer_supports_msid_ = false; 379 bool remote_peer_supports_msid_ = false;
379 rtc::scoped_ptr<RemoteMediaStreamFactory> remote_stream_factory_; 380 rtc::scoped_ptr<RemoteMediaStreamFactory> remote_stream_factory_;
380 381
381 std::vector<rtc::scoped_refptr<RtpSenderInterface>> senders_; 382 std::vector<rtc::scoped_refptr<RtpSenderInterface>> senders_;
382 std::vector<rtc::scoped_refptr<RtpReceiverInterface>> receivers_; 383 std::vector<rtc::scoped_refptr<RtpReceiverInterface>> receivers_;
383 384
384 // The session_ scoped_ptr is declared at the bottom of PeerConnection 385 // The session_ scoped_ptr is declared at the bottom of PeerConnection
385 // because its destruction fires signals (such as VoiceChannelDestroyed) 386 // because its destruction fires signals (such as VoiceChannelDestroyed)
386 // which will trigger some final actions in PeerConnection... 387 // which will trigger some final actions in PeerConnection...
387 rtc::scoped_ptr<WebRtcSession> session_; 388 rtc::scoped_ptr<WebRtcSession> session_;
388 // ... But stats_ depends on session_ so it should be destroyed even earlier. 389 // ... But stats_ depends on session_ so it should be destroyed even earlier.
389 rtc::scoped_ptr<StatsCollector> stats_; 390 rtc::scoped_ptr<StatsCollector> stats_;
390 }; 391 };
391 392
392 } // namespace webrtc 393 } // namespace webrtc
393 394
394 #endif // TALK_APP_WEBRTC_PEERCONNECTION_H_ 395 #endif // TALK_APP_WEBRTC_PEERCONNECTION_H_
OLDNEW
« no previous file with comments | « no previous file | talk/app/webrtc/peerconnection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698