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

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

Issue 1428243005: Fix for scenario where m-line is revived after being set to port 0. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fixing typo. Created 5 years, 1 month 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 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 virtual bool GetOptionsForOffer( 229 virtual bool GetOptionsForOffer(
230 const PeerConnectionInterface::RTCOfferAnswerOptions& rtc_options, 230 const PeerConnectionInterface::RTCOfferAnswerOptions& rtc_options,
231 cricket::MediaSessionOptions* session_options); 231 cricket::MediaSessionOptions* session_options);
232 232
233 // Returns a MediaSessionOptions struct with options decided by 233 // Returns a MediaSessionOptions struct with options decided by
234 // |constraints|, the local MediaStreams and DataChannels. 234 // |constraints|, the local MediaStreams and DataChannels.
235 virtual bool GetOptionsForAnswer( 235 virtual bool GetOptionsForAnswer(
236 const MediaConstraintsInterface* constraints, 236 const MediaConstraintsInterface* constraints,
237 cricket::MediaSessionOptions* session_options); 237 cricket::MediaSessionOptions* session_options);
238 238
239 // Remove all local and remote tracks of type |media_type|.
240 // Called when a media type is rejected (m-line set to port 0).
241 void RemoveTracks(cricket::MediaType media_type);
242
239 // Makes sure a MediaStream Track is created for each StreamParam in 243 // Makes sure a MediaStream Track is created for each StreamParam in
240 // |streams|. |media_type| is the type of the |streams| and can be either 244 // |streams|. |media_type| is the type of the |streams| and can be either
241 // audio or video. 245 // audio or video.
242 // If a new MediaStream is created it is added to |new_streams|. 246 // If a new MediaStream is created it is added to |new_streams|.
243 void UpdateRemoteStreamsList( 247 void UpdateRemoteStreamsList(
244 const std::vector<cricket::StreamParams>& streams, 248 const std::vector<cricket::StreamParams>& streams,
245 cricket::MediaType media_type, 249 cricket::MediaType media_type,
246 StreamCollection* new_streams); 250 StreamCollection* new_streams);
247 251
248 // Triggered when a remote track has been seen for the first time in a remote 252 // Triggered when a remote track has been seen for the first time in a remote
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
387 // because its destruction fires signals (such as VoiceChannelDestroyed) 391 // because its destruction fires signals (such as VoiceChannelDestroyed)
388 // which will trigger some final actions in PeerConnection... 392 // which will trigger some final actions in PeerConnection...
389 rtc::scoped_ptr<WebRtcSession> session_; 393 rtc::scoped_ptr<WebRtcSession> session_;
390 // ... But stats_ depends on session_ so it should be destroyed even earlier. 394 // ... But stats_ depends on session_ so it should be destroyed even earlier.
391 rtc::scoped_ptr<StatsCollector> stats_; 395 rtc::scoped_ptr<StatsCollector> stats_;
392 }; 396 };
393 397
394 } // namespace webrtc 398 } // namespace webrtc
395 399
396 #endif // TALK_APP_WEBRTC_PEERCONNECTION_H_ 400 #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