OLD | NEW |
---|---|
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 305 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
316 cricket::MediaType media_type); | 316 cricket::MediaType media_type); |
317 | 317 |
318 // Triggered when a remote track has been removed from a remote session | 318 // Triggered when a remote track has been removed from a remote session |
319 // description. It removes the remote track with id |track_id| from a remote | 319 // description. It removes the remote track with id |track_id| from a remote |
320 // MediaStream and triggers MediaStreamSignaling::OnRemoveRemoteAudioTrack or | 320 // MediaStream and triggers MediaStreamSignaling::OnRemoveRemoteAudioTrack or |
321 // MediaStreamSignaling::OnRemoveRemoteVideoTrack. | 321 // MediaStreamSignaling::OnRemoveRemoteVideoTrack. |
322 void OnRemoteTrackRemoved(const std::string& stream_label, | 322 void OnRemoteTrackRemoved(const std::string& stream_label, |
323 const std::string& track_id, | 323 const std::string& track_id, |
324 cricket::MediaType media_type); | 324 cricket::MediaType media_type); |
325 | 325 |
326 // Set the MediaStreamTrackInterface::TrackState to |kEnded| on all remote | 326 // Set the MediaStreamTrackInterface::TrackState to |state| on all remote |
327 // tracks of type |media_type|. | 327 // tracks of type |media_type|. |
328 void RejectRemoteTracks(cricket::MediaType media_type); | 328 void SetRemoteTracksState(cricket::MediaType media_type, |
329 MediaStreamTrackInterface::TrackState state); | |
330 | |
331 // Set the MediaStreamTrackInterface::TrackState to |kLive| on all remote | |
332 // tracks of type |media_type|. | |
333 void AcceptRemoteTracks(cricket::MediaType media_type); | |
pthatcher1
2015/07/16 22:56:02
Is this still used?
Taylor Brandstetter
2015/07/17 16:28:26
Nope; good catch
| |
329 | 334 |
330 // Finds remote MediaStreams without any tracks and removes them from | 335 // Finds remote MediaStreams without any tracks and removes them from |
331 // |remote_streams_| and notifies the observer that the MediaStream no longer | 336 // |remote_streams_| and notifies the observer that the MediaStream no longer |
332 // exist. | 337 // exist. |
333 void UpdateEndedRemoteMediaStreams(); | 338 void UpdateEndedRemoteMediaStreams(); |
334 void MaybeCreateDefaultStream(); | 339 void MaybeCreateDefaultStream(); |
335 TrackInfos* GetRemoteTracks(cricket::MediaType type); | 340 TrackInfos* GetRemoteTracks(cricket::MediaType type); |
336 | 341 |
337 // Returns a map of currently negotiated LocalTrackInfo of type |type|. | 342 // Returns a map of currently negotiated LocalTrackInfo of type |type|. |
338 TrackInfos* GetLocalTracks(cricket::MediaType type); | 343 TrackInfos* GetLocalTracks(cricket::MediaType type); |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
397 int last_allocated_sctp_even_sid_; | 402 int last_allocated_sctp_even_sid_; |
398 int last_allocated_sctp_odd_sid_; | 403 int last_allocated_sctp_odd_sid_; |
399 | 404 |
400 RtpDataChannels rtp_data_channels_; | 405 RtpDataChannels rtp_data_channels_; |
401 SctpDataChannels sctp_data_channels_; | 406 SctpDataChannels sctp_data_channels_; |
402 }; | 407 }; |
403 | 408 |
404 } // namespace webrtc | 409 } // namespace webrtc |
405 | 410 |
406 #endif // TALK_APP_WEBRTC_MEDIASTREAMSIGNALING_H_ | 411 #endif // TALK_APP_WEBRTC_MEDIASTREAMSIGNALING_H_ |
OLD | NEW |