| 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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   84   rtc::scoped_refptr<StreamCollectionInterface> local_streams() override; |   84   rtc::scoped_refptr<StreamCollectionInterface> local_streams() override; | 
|   85   rtc::scoped_refptr<StreamCollectionInterface> remote_streams() override; |   85   rtc::scoped_refptr<StreamCollectionInterface> remote_streams() override; | 
|   86   bool AddStream(MediaStreamInterface* local_stream) override; |   86   bool AddStream(MediaStreamInterface* local_stream) override; | 
|   87   void RemoveStream(MediaStreamInterface* local_stream) override; |   87   void RemoveStream(MediaStreamInterface* local_stream) override; | 
|   88  |   88  | 
|   89   virtual WebRtcSession* session() { return session_.get(); } |   89   virtual WebRtcSession* session() { return session_.get(); } | 
|   90  |   90  | 
|   91   rtc::scoped_refptr<DtmfSenderInterface> CreateDtmfSender( |   91   rtc::scoped_refptr<DtmfSenderInterface> CreateDtmfSender( | 
|   92       AudioTrackInterface* track) override; |   92       AudioTrackInterface* track) override; | 
|   93  |   93  | 
|   94   rtc::scoped_refptr<RtpSenderInterface> CreateSender( |  | 
|   95       const std::string& kind) override; |  | 
|   96  |  | 
|   97   std::vector<rtc::scoped_refptr<RtpSenderInterface>> GetSenders() |   94   std::vector<rtc::scoped_refptr<RtpSenderInterface>> GetSenders() | 
|   98       const override; |   95       const override; | 
|   99   std::vector<rtc::scoped_refptr<RtpReceiverInterface>> GetReceivers() |   96   std::vector<rtc::scoped_refptr<RtpReceiverInterface>> GetReceivers() | 
|  100       const override; |   97       const override; | 
|  101  |   98  | 
|  102   rtc::scoped_refptr<DataChannelInterface> CreateDataChannel( |   99   rtc::scoped_refptr<DataChannelInterface> CreateDataChannel( | 
|  103       const std::string& label, |  100       const std::string& label, | 
|  104       const DataChannelInit* config) override; |  101       const DataChannelInit* config) override; | 
|  105   bool GetStats(StatsObserver* observer, |  102   bool GetStats(StatsObserver* observer, | 
|  106                 webrtc::MediaStreamTrackInterface* track, |  103                 webrtc::MediaStreamTrackInterface* track, | 
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  183   void CreateAudioReceiver(MediaStreamInterface* stream, |  180   void CreateAudioReceiver(MediaStreamInterface* stream, | 
|  184                            AudioTrackInterface* audio_track, |  181                            AudioTrackInterface* audio_track, | 
|  185                            uint32_t ssrc); |  182                            uint32_t ssrc); | 
|  186   void CreateVideoReceiver(MediaStreamInterface* stream, |  183   void CreateVideoReceiver(MediaStreamInterface* stream, | 
|  187                            VideoTrackInterface* video_track, |  184                            VideoTrackInterface* video_track, | 
|  188                            uint32_t ssrc); |  185                            uint32_t ssrc); | 
|  189   void DestroyAudioReceiver(MediaStreamInterface* stream, |  186   void DestroyAudioReceiver(MediaStreamInterface* stream, | 
|  190                             AudioTrackInterface* audio_track); |  187                             AudioTrackInterface* audio_track); | 
|  191   void DestroyVideoReceiver(MediaStreamInterface* stream, |  188   void DestroyVideoReceiver(MediaStreamInterface* stream, | 
|  192                             VideoTrackInterface* video_track); |  189                             VideoTrackInterface* video_track); | 
 |  190   void CreateAudioSender(MediaStreamInterface* stream, | 
 |  191                          AudioTrackInterface* audio_track, | 
 |  192                          uint32_t ssrc); | 
 |  193   void CreateVideoSender(MediaStreamInterface* stream, | 
 |  194                          VideoTrackInterface* video_track, | 
 |  195                          uint32_t ssrc); | 
|  193   void DestroyAudioSender(MediaStreamInterface* stream, |  196   void DestroyAudioSender(MediaStreamInterface* stream, | 
|  194                           AudioTrackInterface* audio_track, |  197                           AudioTrackInterface* audio_track, | 
|  195                           uint32_t ssrc); |  198                           uint32_t ssrc); | 
|  196   void DestroyVideoSender(MediaStreamInterface* stream, |  199   void DestroyVideoSender(MediaStreamInterface* stream, | 
|  197                           VideoTrackInterface* video_track); |  200                           VideoTrackInterface* video_track); | 
|  198  |  201  | 
|  199   // Implements IceObserver |  202   // Implements IceObserver | 
|  200   void OnIceConnectionChange(IceConnectionState new_state) override; |  203   void OnIceConnectionChange(IceConnectionState new_state) override; | 
|  201   void OnIceGatheringChange(IceGatheringState new_state) override; |  204   void OnIceGatheringChange(IceGatheringState new_state) override; | 
|  202   void OnIceCandidate(const IceCandidateInterface* candidate) override; |  205   void OnIceCandidate(const IceCandidateInterface* candidate) override; | 
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  318   // Notifications from WebRtcSession relating to BaseChannels. |  321   // Notifications from WebRtcSession relating to BaseChannels. | 
|  319   void OnVoiceChannelDestroyed(); |  322   void OnVoiceChannelDestroyed(); | 
|  320   void OnVideoChannelDestroyed(); |  323   void OnVideoChannelDestroyed(); | 
|  321   void OnDataChannelCreated(); |  324   void OnDataChannelCreated(); | 
|  322   void OnDataChannelDestroyed(); |  325   void OnDataChannelDestroyed(); | 
|  323   // Called when the cricket::DataChannel receives a message indicating that a |  326   // Called when the cricket::DataChannel receives a message indicating that a | 
|  324   // webrtc::DataChannel should be opened. |  327   // webrtc::DataChannel should be opened. | 
|  325   void OnDataChannelOpenMessage(const std::string& label, |  328   void OnDataChannelOpenMessage(const std::string& label, | 
|  326                                 const InternalDataChannelInit& config); |  329                                 const InternalDataChannelInit& config); | 
|  327  |  330  | 
|  328   RtpSenderInterface* FindSenderById(const std::string& id); |  | 
|  329  |  | 
|  330   std::vector<rtc::scoped_refptr<RtpSenderInterface>>::iterator |  331   std::vector<rtc::scoped_refptr<RtpSenderInterface>>::iterator | 
|  331   FindSenderForTrack(MediaStreamTrackInterface* track); |  332   FindSenderForTrack(MediaStreamTrackInterface* track); | 
|  332   std::vector<rtc::scoped_refptr<RtpReceiverInterface>>::iterator |  333   std::vector<rtc::scoped_refptr<RtpReceiverInterface>>::iterator | 
|  333   FindReceiverForTrack(MediaStreamTrackInterface* track); |  334   FindReceiverForTrack(MediaStreamTrackInterface* track); | 
|  334  |  335  | 
|  335   TrackInfos* GetRemoteTracks(cricket::MediaType media_type); |  336   TrackInfos* GetRemoteTracks(cricket::MediaType media_type); | 
|  336   TrackInfos* GetLocalTracks(cricket::MediaType media_type); |  337   TrackInfos* GetLocalTracks(cricket::MediaType media_type); | 
|  337   const TrackInfo* FindTrackInfo(const TrackInfos& infos, |  338   const TrackInfo* FindTrackInfo(const TrackInfos& infos, | 
|  338                                  const std::string& stream_label, |  339                                  const std::string& stream_label, | 
|  339                                  const std::string track_id) const; |  340                                  const std::string track_id) const; | 
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  386   // because its destruction fires signals (such as VoiceChannelDestroyed) |  387   // because its destruction fires signals (such as VoiceChannelDestroyed) | 
|  387   // which will trigger some final actions in PeerConnection... |  388   // which will trigger some final actions in PeerConnection... | 
|  388   rtc::scoped_ptr<WebRtcSession> session_; |  389   rtc::scoped_ptr<WebRtcSession> session_; | 
|  389   // ... But stats_ depends on session_ so it should be destroyed even earlier. |  390   // ... But stats_ depends on session_ so it should be destroyed even earlier. | 
|  390   rtc::scoped_ptr<StatsCollector> stats_; |  391   rtc::scoped_ptr<StatsCollector> stats_; | 
|  391 }; |  392 }; | 
|  392  |  393  | 
|  393 }  // namespace webrtc |  394 }  // namespace webrtc | 
|  394  |  395  | 
|  395 #endif  // TALK_APP_WEBRTC_PEERCONNECTION_H_ |  396 #endif  // TALK_APP_WEBRTC_PEERCONNECTION_H_ | 
| OLD | NEW |