| OLD | NEW | 
|    1 /* |    1 /* | 
|    2  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. |    2  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 
|    3  * |    3  * | 
|    4  *  Use of this source code is governed by a BSD-style license |    4  *  Use of this source code is governed by a BSD-style license | 
|    5  *  that can be found in the LICENSE file in the root of the source |    5  *  that can be found in the LICENSE file in the root of the source | 
|    6  *  tree. An additional intellectual property rights grant can be found |    6  *  tree. An additional intellectual property rights grant can be found | 
|    7  *  in the file PATENTS.  All contributing project authors may |    7  *  in the file PATENTS.  All contributing project authors may | 
|    8  *  be found in the AUTHORS file in the root of the source tree. |    8  *  be found in the AUTHORS file in the root of the source tree. | 
|    9  */ |    9  */ | 
|   10  |   10  | 
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   66    uint32_t last_rr_ntp_frac; |   66    uint32_t last_rr_ntp_frac; | 
|   67    uint32_t remote_sr; |   67    uint32_t remote_sr; | 
|   68  |   68  | 
|   69    bool has_last_xr_rr; |   69    bool has_last_xr_rr; | 
|   70    RtcpReceiveTimeInfo last_xr_rr; |   70    RtcpReceiveTimeInfo last_xr_rr; | 
|   71  |   71  | 
|   72    // Used when generating TMMBR. |   72    // Used when generating TMMBR. | 
|   73    ModuleRtpRtcpImpl* module; |   73    ModuleRtpRtcpImpl* module; | 
|   74  }; |   74  }; | 
|   75  |   75  | 
|   76  RTCPSender(int32_t id, |   76  RTCPSender(bool audio, | 
|   77             bool audio, |  | 
|   78             Clock* clock, |   77             Clock* clock, | 
|   79             ReceiveStatistics* receive_statistics, |   78             ReceiveStatistics* receive_statistics, | 
|   80             RtcpPacketTypeCounterObserver* packet_type_counter_observer); |   79             RtcpPacketTypeCounterObserver* packet_type_counter_observer); | 
|   81  virtual ~RTCPSender(); |   80  virtual ~RTCPSender(); | 
|   82  |   81  | 
|   83  int32_t RegisterSendTransport(Transport* outgoingTransport); |   82  int32_t RegisterSendTransport(Transport* outgoingTransport); | 
|   84  |   83  | 
|   85  RTCPMethod Status() const; |   84  RTCPMethod Status() const; | 
|   86  void SetRTCPStatus(RTCPMethod method); |   85  void SetRTCPStatus(RTCPMethod method); | 
|   87  |   86  | 
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  220  BuildResult BuildRPSI(RtcpContext* context) |  219  BuildResult BuildRPSI(RtcpContext* context) | 
|  221      EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_); |  220      EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_); | 
|  222  BuildResult BuildNACK(RtcpContext* context) |  221  BuildResult BuildNACK(RtcpContext* context) | 
|  223      EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_); |  222      EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_); | 
|  224  BuildResult BuildReceiverReferenceTime(RtcpContext* context) |  223  BuildResult BuildReceiverReferenceTime(RtcpContext* context) | 
|  225      EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_); |  224      EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_); | 
|  226  BuildResult BuildDlrr(RtcpContext* context) |  225  BuildResult BuildDlrr(RtcpContext* context) | 
|  227      EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_); |  226      EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_); | 
|  228  |  227  | 
|  229 private: |  228 private: | 
|  230  const int32_t id_; |  | 
|  231  const bool audio_; |  229  const bool audio_; | 
|  232  Clock* const clock_; |  230  Clock* const clock_; | 
|  233  RTCPMethod method_ GUARDED_BY(critical_section_rtcp_sender_); |  231  RTCPMethod method_ GUARDED_BY(critical_section_rtcp_sender_); | 
|  234  |  232  | 
|  235  rtc::scoped_ptr<CriticalSectionWrapper> critical_section_transport_; |  233  rtc::scoped_ptr<CriticalSectionWrapper> critical_section_transport_; | 
|  236  Transport* cbTransport_ GUARDED_BY(critical_section_transport_); |  234  Transport* cbTransport_ GUARDED_BY(critical_section_transport_); | 
|  237  |  235  | 
|  238  rtc::scoped_ptr<CriticalSectionWrapper> critical_section_rtcp_sender_; |  236  rtc::scoped_ptr<CriticalSectionWrapper> critical_section_rtcp_sender_; | 
|  239  bool using_nack_ GUARDED_BY(critical_section_rtcp_sender_); |  237  bool using_nack_ GUARDED_BY(critical_section_rtcp_sender_); | 
|  240  bool sending_ GUARDED_BY(critical_section_rtcp_sender_); |  238  bool sending_ GUARDED_BY(critical_section_rtcp_sender_); | 
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  323  std::set<ReportFlag> report_flags_ GUARDED_BY(critical_section_rtcp_sender_); |  321  std::set<ReportFlag> report_flags_ GUARDED_BY(critical_section_rtcp_sender_); | 
|  324  |  322  | 
|  325  typedef BuildResult (RTCPSender::*Builder)(RtcpContext*); |  323  typedef BuildResult (RTCPSender::*Builder)(RtcpContext*); | 
|  326  std::map<RTCPPacketType, Builder> builders_; |  324  std::map<RTCPPacketType, Builder> builders_; | 
|  327  |  325  | 
|  328  class PacketBuiltCallback; |  326  class PacketBuiltCallback; | 
|  329 }; |  327 }; | 
|  330 }  // namespace webrtc |  328 }  // namespace webrtc | 
|  331  |  329  | 
|  332 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_SENDER_H_ |  330 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_SENDER_H_ | 
| OLD | NEW |