| 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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 94   rtc::scoped_refptr<StreamCollectionInterface> local_streams() override; | 94   rtc::scoped_refptr<StreamCollectionInterface> local_streams() override; | 
| 95   rtc::scoped_refptr<StreamCollectionInterface> remote_streams() override; | 95   rtc::scoped_refptr<StreamCollectionInterface> remote_streams() override; | 
| 96   bool AddStream(MediaStreamInterface* local_stream) override; | 96   bool AddStream(MediaStreamInterface* local_stream) override; | 
| 97   void RemoveStream(MediaStreamInterface* local_stream) override; | 97   void RemoveStream(MediaStreamInterface* local_stream) override; | 
| 98 | 98 | 
| 99   virtual WebRtcSession* session() { return session_.get(); } | 99   virtual WebRtcSession* session() { return session_.get(); } | 
| 100 | 100 | 
| 101   rtc::scoped_refptr<DtmfSenderInterface> CreateDtmfSender( | 101   rtc::scoped_refptr<DtmfSenderInterface> CreateDtmfSender( | 
| 102       AudioTrackInterface* track) override; | 102       AudioTrackInterface* track) override; | 
| 103 | 103 | 
|  | 104   rtc::scoped_refptr<RtpSenderInterface> CreateSender( | 
|  | 105       const std::string& kind) override; | 
|  | 106 | 
| 104   std::vector<rtc::scoped_refptr<RtpSenderInterface>> GetSenders() | 107   std::vector<rtc::scoped_refptr<RtpSenderInterface>> GetSenders() | 
| 105       const override; | 108       const override; | 
| 106   std::vector<rtc::scoped_refptr<RtpReceiverInterface>> GetReceivers() | 109   std::vector<rtc::scoped_refptr<RtpReceiverInterface>> GetReceivers() | 
| 107       const override; | 110       const override; | 
| 108 | 111 | 
| 109   rtc::scoped_refptr<DataChannelInterface> CreateDataChannel( | 112   rtc::scoped_refptr<DataChannelInterface> CreateDataChannel( | 
| 110       const std::string& label, | 113       const std::string& label, | 
| 111       const DataChannelInit* config) override; | 114       const DataChannelInit* config) override; | 
| 112   bool GetStats(StatsObserver* observer, | 115   bool GetStats(StatsObserver* observer, | 
| 113                 webrtc::MediaStreamTrackInterface* track, | 116                 webrtc::MediaStreamTrackInterface* track, | 
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 190   void CreateAudioReceiver(MediaStreamInterface* stream, | 193   void CreateAudioReceiver(MediaStreamInterface* stream, | 
| 191                            AudioTrackInterface* audio_track, | 194                            AudioTrackInterface* audio_track, | 
| 192                            uint32_t ssrc); | 195                            uint32_t ssrc); | 
| 193   void CreateVideoReceiver(MediaStreamInterface* stream, | 196   void CreateVideoReceiver(MediaStreamInterface* stream, | 
| 194                            VideoTrackInterface* video_track, | 197                            VideoTrackInterface* video_track, | 
| 195                            uint32_t ssrc); | 198                            uint32_t ssrc); | 
| 196   void DestroyAudioReceiver(MediaStreamInterface* stream, | 199   void DestroyAudioReceiver(MediaStreamInterface* stream, | 
| 197                             AudioTrackInterface* audio_track); | 200                             AudioTrackInterface* audio_track); | 
| 198   void DestroyVideoReceiver(MediaStreamInterface* stream, | 201   void DestroyVideoReceiver(MediaStreamInterface* stream, | 
| 199                             VideoTrackInterface* video_track); | 202                             VideoTrackInterface* video_track); | 
| 200   void CreateAudioSender(MediaStreamInterface* stream, |  | 
| 201                          AudioTrackInterface* audio_track, |  | 
| 202                          uint32_t ssrc); |  | 
| 203   void CreateVideoSender(MediaStreamInterface* stream, |  | 
| 204                          VideoTrackInterface* video_track, |  | 
| 205                          uint32_t ssrc); |  | 
| 206   void DestroyAudioSender(MediaStreamInterface* stream, | 203   void DestroyAudioSender(MediaStreamInterface* stream, | 
| 207                           AudioTrackInterface* audio_track, | 204                           AudioTrackInterface* audio_track, | 
| 208                           uint32_t ssrc); | 205                           uint32_t ssrc); | 
| 209   void DestroyVideoSender(MediaStreamInterface* stream, | 206   void DestroyVideoSender(MediaStreamInterface* stream, | 
| 210                           VideoTrackInterface* video_track); | 207                           VideoTrackInterface* video_track); | 
| 211 | 208 | 
| 212   // Implements IceObserver | 209   // Implements IceObserver | 
| 213   void OnIceConnectionChange(IceConnectionState new_state) override; | 210   void OnIceConnectionChange(IceConnectionState new_state) override; | 
| 214   void OnIceGatheringChange(IceGatheringState new_state) override; | 211   void OnIceGatheringChange(IceGatheringState new_state) override; | 
| 215   void OnIceCandidate(const IceCandidateInterface* candidate) override; | 212   void OnIceCandidate(const IceCandidateInterface* candidate) override; | 
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 335   // Notifications from WebRtcSession relating to BaseChannels. | 332   // Notifications from WebRtcSession relating to BaseChannels. | 
| 336   void OnVoiceChannelDestroyed(); | 333   void OnVoiceChannelDestroyed(); | 
| 337   void OnVideoChannelDestroyed(); | 334   void OnVideoChannelDestroyed(); | 
| 338   void OnDataChannelCreated(); | 335   void OnDataChannelCreated(); | 
| 339   void OnDataChannelDestroyed(); | 336   void OnDataChannelDestroyed(); | 
| 340   // Called when the cricket::DataChannel receives a message indicating that a | 337   // Called when the cricket::DataChannel receives a message indicating that a | 
| 341   // webrtc::DataChannel should be opened. | 338   // webrtc::DataChannel should be opened. | 
| 342   void OnDataChannelOpenMessage(const std::string& label, | 339   void OnDataChannelOpenMessage(const std::string& label, | 
| 343                                 const InternalDataChannelInit& config); | 340                                 const InternalDataChannelInit& config); | 
| 344 | 341 | 
|  | 342   RtpSenderInterface* FindSenderById(const std::string& id); | 
|  | 343 | 
| 345   std::vector<rtc::scoped_refptr<RtpSenderInterface>>::iterator | 344   std::vector<rtc::scoped_refptr<RtpSenderInterface>>::iterator | 
| 346   FindSenderForTrack(MediaStreamTrackInterface* track); | 345   FindSenderForTrack(MediaStreamTrackInterface* track); | 
| 347   std::vector<rtc::scoped_refptr<RtpReceiverInterface>>::iterator | 346   std::vector<rtc::scoped_refptr<RtpReceiverInterface>>::iterator | 
| 348   FindReceiverForTrack(MediaStreamTrackInterface* track); | 347   FindReceiverForTrack(MediaStreamTrackInterface* track); | 
| 349 | 348 | 
| 350   TrackInfos* GetRemoteTracks(cricket::MediaType media_type); | 349   TrackInfos* GetRemoteTracks(cricket::MediaType media_type); | 
| 351   TrackInfos* GetLocalTracks(cricket::MediaType media_type); | 350   TrackInfos* GetLocalTracks(cricket::MediaType media_type); | 
| 352   const TrackInfo* FindTrackInfo(const TrackInfos& infos, | 351   const TrackInfo* FindTrackInfo(const TrackInfos& infos, | 
| 353                                  const std::string& stream_label, | 352                                  const std::string& stream_label, | 
| 354                                  const std::string track_id) const; | 353                                  const std::string track_id) const; | 
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 401   // because its destruction fires signals (such as VoiceChannelDestroyed) | 400   // because its destruction fires signals (such as VoiceChannelDestroyed) | 
| 402   // which will trigger some final actions in PeerConnection... | 401   // which will trigger some final actions in PeerConnection... | 
| 403   rtc::scoped_ptr<WebRtcSession> session_; | 402   rtc::scoped_ptr<WebRtcSession> session_; | 
| 404   // ... But stats_ depends on session_ so it should be destroyed even earlier. | 403   // ... But stats_ depends on session_ so it should be destroyed even earlier. | 
| 405   rtc::scoped_ptr<StatsCollector> stats_; | 404   rtc::scoped_ptr<StatsCollector> stats_; | 
| 406 }; | 405 }; | 
| 407 | 406 | 
| 408 }  // namespace webrtc | 407 }  // namespace webrtc | 
| 409 | 408 | 
| 410 #endif  // TALK_APP_WEBRTC_PEERCONNECTION_H_ | 409 #endif  // TALK_APP_WEBRTC_PEERCONNECTION_H_ | 
| OLD | NEW | 
|---|