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 309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 |kEnded| on all remote |
327 // tracks of type |media_type|. | 327 // tracks of type |media_type|. |
328 void RejectRemoteTracks(cricket::MediaType media_type); | 328 void RejectRemoteTracks(cricket::MediaType media_type); |
329 | 329 |
| 330 // Set the MediaStreamTrackInterface::TrackState to |kLive| on all remote |
| 331 // tracks of type |media_type|. |
| 332 // Needed in case the local description caused the track to be rejected, |
| 333 // then later accepted, without being destroyed. |
| 334 void AcceptRemoteTracks(cricket::MediaType media_type); |
| 335 |
330 // Finds remote MediaStreams without any tracks and removes them from | 336 // Finds remote MediaStreams without any tracks and removes them from |
331 // |remote_streams_| and notifies the observer that the MediaStream no longer | 337 // |remote_streams_| and notifies the observer that the MediaStream no longer |
332 // exist. | 338 // exist. |
333 void UpdateEndedRemoteMediaStreams(); | 339 void UpdateEndedRemoteMediaStreams(); |
334 void MaybeCreateDefaultStream(); | 340 void MaybeCreateDefaultStream(); |
335 TrackInfos* GetRemoteTracks(cricket::MediaType type); | 341 TrackInfos* GetRemoteTracks(cricket::MediaType type); |
336 | 342 |
337 // Returns a map of currently negotiated LocalTrackInfo of type |type|. | 343 // Returns a map of currently negotiated LocalTrackInfo of type |type|. |
338 TrackInfos* GetLocalTracks(cricket::MediaType type); | 344 TrackInfos* GetLocalTracks(cricket::MediaType type); |
339 bool FindLocalTrack(const std::string& track_id, cricket::MediaType type); | 345 bool FindLocalTrack(const std::string& track_id, cricket::MediaType type); |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
397 int last_allocated_sctp_even_sid_; | 403 int last_allocated_sctp_even_sid_; |
398 int last_allocated_sctp_odd_sid_; | 404 int last_allocated_sctp_odd_sid_; |
399 | 405 |
400 RtpDataChannels rtp_data_channels_; | 406 RtpDataChannels rtp_data_channels_; |
401 SctpDataChannels sctp_data_channels_; | 407 SctpDataChannels sctp_data_channels_; |
402 }; | 408 }; |
403 | 409 |
404 } // namespace webrtc | 410 } // namespace webrtc |
405 | 411 |
406 #endif // TALK_APP_WEBRTC_MEDIASTREAMSIGNALING_H_ | 412 #endif // TALK_APP_WEBRTC_MEDIASTREAMSIGNALING_H_ |
OLD | NEW |