| 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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 bool has_last_xr_rr; | 67 bool has_last_xr_rr; |
| 68 RtcpReceiveTimeInfo last_xr_rr; | 68 RtcpReceiveTimeInfo last_xr_rr; |
| 69 | 69 |
| 70 // Used when generating TMMBR. | 70 // Used when generating TMMBR. |
| 71 ModuleRtpRtcpImpl* module; | 71 ModuleRtpRtcpImpl* module; |
| 72 }; | 72 }; |
| 73 | 73 |
| 74 RTCPSender(bool audio, | 74 RTCPSender(bool audio, |
| 75 Clock* clock, | 75 Clock* clock, |
| 76 ReceiveStatistics* receive_statistics, | 76 ReceiveStatistics* receive_statistics, |
| 77 RtcpPacketTypeCounterObserver* packet_type_counter_observer); | 77 RtcpPacketTypeCounterObserver* packet_type_counter_observer, |
| 78 Transport* outgoing_transport); |
| 78 virtual ~RTCPSender(); | 79 virtual ~RTCPSender(); |
| 79 | 80 |
| 80 int32_t RegisterSendTransport(Transport* outgoingTransport); | |
| 81 | |
| 82 RTCPMethod Status() const; | 81 RTCPMethod Status() const; |
| 83 void SetRTCPStatus(RTCPMethod method); | 82 void SetRTCPStatus(RTCPMethod method); |
| 84 | 83 |
| 85 bool Sending() const; | 84 bool Sending() const; |
| 86 int32_t SetSendingStatus(const FeedbackState& feedback_state, | 85 int32_t SetSendingStatus(const FeedbackState& feedback_state, |
| 87 bool enabled); // combine the functions | 86 bool enabled); // combine the functions |
| 88 | 87 |
| 89 int32_t SetNackStatus(bool enable); | 88 int32_t SetNackStatus(bool enable); |
| 90 | 89 |
| 91 void SetStartTimestamp(uint32_t start_timestamp); | 90 void SetStartTimestamp(uint32_t start_timestamp); |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 221 BuildResult BuildReceiverReferenceTime(RtcpContext* context) | 220 BuildResult BuildReceiverReferenceTime(RtcpContext* context) |
| 222 EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_); | 221 EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_); |
| 223 BuildResult BuildDlrr(RtcpContext* context) | 222 BuildResult BuildDlrr(RtcpContext* context) |
| 224 EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_); | 223 EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_); |
| 225 | 224 |
| 226 private: | 225 private: |
| 227 const bool audio_; | 226 const bool audio_; |
| 228 Clock* const clock_; | 227 Clock* const clock_; |
| 229 RTCPMethod method_ GUARDED_BY(critical_section_rtcp_sender_); | 228 RTCPMethod method_ GUARDED_BY(critical_section_rtcp_sender_); |
| 230 | 229 |
| 231 rtc::scoped_ptr<CriticalSectionWrapper> critical_section_transport_; | 230 Transport* const transport_; |
| 232 Transport* cbTransport_ GUARDED_BY(critical_section_transport_); | |
| 233 | 231 |
| 234 rtc::scoped_ptr<CriticalSectionWrapper> critical_section_rtcp_sender_; | 232 rtc::scoped_ptr<CriticalSectionWrapper> critical_section_rtcp_sender_; |
| 235 bool using_nack_ GUARDED_BY(critical_section_rtcp_sender_); | 233 bool using_nack_ GUARDED_BY(critical_section_rtcp_sender_); |
| 236 bool sending_ GUARDED_BY(critical_section_rtcp_sender_); | 234 bool sending_ GUARDED_BY(critical_section_rtcp_sender_); |
| 237 bool remb_enabled_ GUARDED_BY(critical_section_rtcp_sender_); | 235 bool remb_enabled_ GUARDED_BY(critical_section_rtcp_sender_); |
| 238 | 236 |
| 239 int64_t next_time_to_send_rtcp_ GUARDED_BY(critical_section_rtcp_sender_); | 237 int64_t next_time_to_send_rtcp_ GUARDED_BY(critical_section_rtcp_sender_); |
| 240 | 238 |
| 241 uint32_t start_timestamp_ GUARDED_BY(critical_section_rtcp_sender_); | 239 uint32_t start_timestamp_ GUARDED_BY(critical_section_rtcp_sender_); |
| 242 uint32_t last_rtp_timestamp_ GUARDED_BY(critical_section_rtcp_sender_); | 240 uint32_t last_rtp_timestamp_ GUARDED_BY(critical_section_rtcp_sender_); |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 319 std::set<ReportFlag> report_flags_ GUARDED_BY(critical_section_rtcp_sender_); | 317 std::set<ReportFlag> report_flags_ GUARDED_BY(critical_section_rtcp_sender_); |
| 320 | 318 |
| 321 typedef BuildResult (RTCPSender::*Builder)(RtcpContext*); | 319 typedef BuildResult (RTCPSender::*Builder)(RtcpContext*); |
| 322 std::map<RTCPPacketType, Builder> builders_; | 320 std::map<RTCPPacketType, Builder> builders_; |
| 323 | 321 |
| 324 class PacketBuiltCallback; | 322 class PacketBuiltCallback; |
| 325 }; | 323 }; |
| 326 } // namespace webrtc | 324 } // namespace webrtc |
| 327 | 325 |
| 328 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_SENDER_H_ | 326 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_SENDER_H_ |
| OLD | NEW |